summaryrefslogtreecommitdiff
authorzecke <zecke>2004-07-10 12:40:06 (UTC)
committer zecke <zecke>2004-07-10 12:40:06 (UTC)
commite18cb7bddb3461a40ae1e8810ef408ceef101d38 (patch) (unidiff)
treedd5a6b1607f3d2a331c484f07b7dd367ee00f24d
parent38152afc18715fefc238040ff806d1e3a93e021e (diff)
downloadopie-e18cb7bddb3461a40ae1e8810ef408ceef101d38.zip
opie-e18cb7bddb3461a40ae1e8810ef408ceef101d38.tar.gz
opie-e18cb7bddb3461a40ae1e8810ef408ceef101d38.tar.bz2
On OE '*' is not for shadow passwords but is a hint that we
could set the password. So use this hint
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/opie-login/passworddialogimpl.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/opie-login/passworddialogimpl.cpp b/core/opie-login/passworddialogimpl.cpp
index 951c4e1..852708e 100644
--- a/core/opie-login/passworddialogimpl.cpp
+++ b/core/opie-login/passworddialogimpl.cpp
@@ -211,12 +211,13 @@ bool PasswordDialogImpl::needDialog() {
211 QString str = QString::fromLatin1(pwd->pw_passwd ); 211 QString str = QString::fromLatin1(pwd->pw_passwd );
212 212
213 /* 213 /*
214 * If str is really empty it is passwordless anyway... 214 * If str is really empty it is passwordless anyway... or '*' is a hint to set one
215 * on OE/Familiar
215 * else it is shadow based 216 * else it is shadow based
216 */ 217 */
217 if(str.isEmpty() ) 218 if(str.isEmpty() || str == '*' )
218 need = true; 219 need = true;
219 else if ( str == '*' || str == 'x' ) 220 else if ( str == 'x' )
220#ifdef OPIE_LOGIN_SHADOW_PW 221#ifdef OPIE_LOGIN_SHADOW_PW
221 need = QString::fromLatin1( ::getspnam( pwd->pw_name )->sp_pwdp ).isEmpty(); 222 need = QString::fromLatin1( ::getspnam( pwd->pw_name )->sp_pwdp ).isEmpty();
222#else 223#else