===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth.c,v
retrieving revision 1.49.2.2
retrieving revision 1.50
diff -u -r1.49.2.2 -r1.50
--- src/usr.bin/ssh/auth.c	2004/08/19 22:37:30	1.49.2.2
+++ src/usr.bin/ssh/auth.c	2003/09/23 20:17:11	1.50
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth.c,v 1.49.2.2 2004/08/19 22:37:30 brad Exp $");
+RCSID("$OpenBSD: auth.c,v 1.50 2003/09/23 20:17:11 markus Exp $");
 
 #include <libgen.h>
 
@@ -38,6 +38,7 @@
 #include "buffer.h"
 #include "bufaux.h"
 #include "uidswap.h"
+#include "tildexpand.h"
 #include "misc.h"
 #include "bufaux.h"
 #include "packet.h"
@@ -161,7 +162,7 @@
 	/* Raise logging level */
 	if (authenticated == 1 ||
 	    !authctxt->valid ||
-	    authctxt->failures >= options.max_authtries / 2 ||
+	    authctxt->failures >= AUTH_FAIL_LOG ||
 	    strcmp(method, "password") == 0)
 		authlog = logit;
 
@@ -173,7 +174,7 @@
 	authlog("%s %s for %s%.100s from %.200s port %d%s",
 	    authmsg,
 	    method,
-	    authctxt->valid ? "" : "invalid user ",
+	    authctxt->valid ? "" : "illegal user ",
 	    authctxt->user,
 	    get_remote_ipaddr(),
 	    get_remote_port(),
@@ -397,7 +398,7 @@
 
 	pw = getpwnam(user);
 	if (pw == NULL) {
-		logit("Invalid user %.100s from %.100s",
+		logit("Illegal user %.100s from %.100s",
 		    user, get_remote_ipaddr());
 		return (NULL);
 	}
@@ -471,10 +472,10 @@
 	memset(&fake, 0, sizeof(fake));
 	fake.pw_name = "NOUSER";
 	fake.pw_passwd =
-	    "$2a$06$r3.juUaHZDlIbQaO2dS9FuYxL1W9M81R1Tc92PoSNmzvpEqLkLGrK";
+	    "$2a$06$r3.juUaHZDlIbQaO2dS9FuYxL1W9M81R1Tc92PoSNmzvpEqLkLGrK";	
 	fake.pw_gecos = "NOUSER";
-	fake.pw_uid = (uid_t)-1;
-	fake.pw_gid = (gid_t)-1;
+	fake.pw_uid = -1;
+	fake.pw_gid = -1;
 	fake.pw_class = "";
 	fake.pw_dir = "/nonexist";
 	fake.pw_shell = "/nonexist";