===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth-passwd.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- src/usr.bin/ssh/auth-passwd.c	1999/11/24 00:26:00	1.11
+++ src/usr.bin/ssh/auth-passwd.c	1999/11/24 19:53:43	1.12
@@ -8,7 +8,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: auth-passwd.c,v 1.11 1999/11/24 00:26:00 deraadt Exp $");
+RCSID("$Id: auth-passwd.c,v 1.12 1999/11/24 19:53:43 markus Exp $");
 
 #include "packet.h"
 #include "ssh.h"
@@ -25,14 +25,10 @@
 	extern ServerOptions options;
 	char *encrypted_password;
 
-	if (pw->pw_uid == 0 && options.permit_root_login == 2) {
-		/* Server does not permit root login with password */
+	if (pw->pw_uid == 0 && options.permit_root_login == 2)
 		return 0;
-	}
-	if (*password == '\0' && options.permit_empty_passwd == 0) {
-		/* Server does not permit empty password login */
+	if (*password == '\0' && options.permit_empty_passwd == 0)
 		return 0;
-	}
 	/* deny if no user. */
 	if (pw == NULL)
 		return 0;
@@ -60,8 +56,10 @@
 #endif
 
 #if defined(KRB4)
-	/* Support for Kerberos v4 authentication - Dug Song
-	   <dugsong@UMICH.EDU> */
+	/*
+	 * Support for Kerberos v4 authentication
+	 * - Dug Song <dugsong@UMICH.EDU>
+	 */
 	if (options.kerberos_authentication) {
 		AUTH_DAT adata;
 		KTEXT_ST tkt;
@@ -72,8 +70,10 @@
 		char realm[REALM_SZ];
 		int r;
 
-		/* Try Kerberos password authentication only for non-root
-		   users and only if Kerberos is installed. */
+		/*
+		 * Try Kerberos password authentication only for non-root
+		 * users and only if Kerberos is installed.
+		 */
 		if (pw->pw_uid != 0 && krb_get_lrealm(realm, 1) == KSUCCESS) {
 
 			/* Set up our ticket file. */
@@ -130,14 +130,17 @@
 					goto kerberos_auth_failure;
 				}
 			} else if (r == KDC_PR_UNKNOWN) {
-				/* Allow login if no rcmd service exists,
-				   but log the error. */
+				/*
+				 * Allow login if no rcmd service exists, but
+				 * log the error.
+				 */
 				log("Kerberos V4 TGT for %s unverifiable: %s; %s.%s "
 				    "not registered, or srvtab is wrong?", pw->pw_name,
 				krb_err_txt[r], KRB4_SERVICE_NAME, phost);
 			} else {
-				/* TGT is bad, forget it. Possibly
-				   spoofed! */
+				/*
+				 * TGT is bad, forget it. Possibly spoofed!
+				 */
 				packet_send_debug("WARNING: Kerberos V4 TGT "
 				    "possibly spoofed for %s: %s",
 				    pw->pw_name, krb_err_txt[r]);
@@ -161,11 +164,8 @@
 #endif				/* KRB4 */
 
 	/* Check for users with no password. */
-	if (strcmp(password, "") == 0 && strcmp(pw->pw_passwd, "") == 0) {
-		packet_send_debug("Login permitted without a password "
-		    "because the account has no password.");
+	if (strcmp(password, "") == 0 && strcmp(pw->pw_passwd, "") == 0)
 		return 1;
-	}
 	/* Encrypt the candidate password using the proper salt. */
 	encrypted_password = crypt(password,
 	    (pw->pw_passwd[0] && pw->pw_passwd[1]) ? pw->pw_passwd : "xx");