[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdebase/kdm/backend
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2007-09-07 11:37:29
Message-ID: 1189165049.593522.10225.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 709384 by ossi:

backport: passwd/shadow (non-pam, non-aix) auth: explicitly detect
disabled accounts for better debug.


 M  +7 -4      client.c  


--- branches/KDE/3.5/kdebase/kdm/backend/client.c #709383:709384
@@ -589,18 +589,21 @@
 		gconv( GCONV_PASS, 0 );
 		V_RET_AUTH;
 	}
-# ifdef __linux__ /* only Linux? */
 	if (p->pw_passwd[0] == '!' || p->pw_passwd[0] == '*') {
 		Debug( "account is locked\n" );
 		gconv( GCONV_PASS, 0 );
 		V_RET_AUTH;
 	}
-# endif
 
 # ifdef USESHADOW
-	if ((sp = getspnam( curuser )))
+	if ((sp = getspnam( curuser ))) {
 		p->pw_passwd = sp->sp_pwdp;
-	else
+		if (p->pw_passwd[0] == '!' || p->pw_passwd[0] == '*') {
+			Debug( "account is locked\n" );
+			gconv( GCONV_PASS, 0 );
+			V_RET_AUTH;
+		}
+	} else
 		Debug( "getspnam() failed: %m. Are you root?\n" );
 # endif
 
[prev in list] [next in list] [prev in thread] [next in thread]