* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#define RCSID "$Id: upap.c,v 1.20 1999/08/24 05:29:26 paulus Exp $"
+#define RCSID "$Id: upap.c,v 1.24 2001/03/08 05:11:16 paulus Exp $"
/*
* TODO:
static const char rcsid[] = RCSID;
-static bool hide_password;
+static bool hide_password = 1;
/*
* Command-line options.
*/
static option_t pap_option_list[] = {
{ "hide-password", o_bool, &hide_password,
- "Don't output passwords to log", 1 },
+ "Don't output passwords to log", OPT_PRIO | 1 },
+ { "show-password", o_bool, &hide_password,
+ "Show password string in debug log messages", OPT_PRIOSUB | 0 },
+
{ "pap-restart", o_int, &upap[0].us_timeouttime,
- "Set retransmit timeout for PAP" },
+ "Set retransmit timeout for PAP", OPT_PRIO },
{ "pap-max-authreq", o_int, &upap[0].us_maxtransmits,
- "Set max number of transmissions for auth-reqs" },
+ "Set max number of transmissions for auth-reqs", OPT_PRIO },
{ "pap-timeout", o_int, &upap[0].us_reqtimeout,
- "Set time limit for peer PAP authentication" },
+ "Set time limit for peer PAP authentication", OPT_PRIO },
+
{ NULL }
};
/*
* Parse user/passwd.
*/
- if (len < sizeof (u_char)) {
+ if (len < 1) {
UPAPDEBUG(("pap_rauth: rcvd short packet."));
return;
}
* Check the username and password given.
*/
retcode = check_passwd(u->us_unit, ruser, ruserlen, rpasswd,
- rpasswdlen, &msg, &msglen);
+ rpasswdlen, &msg);
BZERO(rpasswd, rpasswdlen);
+ msglen = strlen(msg);
+ if (msglen > 255)
+ msglen = 255;
upap_sresp(u, retcode, id, msg, msglen);
/*
* Parse message.
*/
- if (len < sizeof (u_char)) {
+ if (len < 1) {
UPAPDEBUG(("pap_rauthack: ignoring missing msg-length."));
} else {
GETCHAR(msglen, inp);
/*
* Parse message.
*/
- if (len < sizeof (u_char)) {
+ if (len < 1) {
UPAPDEBUG(("pap_rauthnak: ignoring missing msg-length."));
} else {
GETCHAR(msglen, inp);