summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -198,34 +198,35 @@ void PasswordDialogImpl::slotToggleEcho( bool b ) {
bool PasswordDialogImpl::needDialog() {
/*
* This can cope with no password and shadow passwords
* Let us go through the user database until we find 'root' and then
* see if it is 'shadow' and see if shadow is empty or see if the password is empty
*/
bool need = false;
struct passwd *pwd;
::setpwent();
while((pwd = ::getpwent() ) ) {
/* found root */
if( pwd->pw_uid == 0 ) {
QString str = QString::fromLatin1(pwd->pw_passwd );
/*
- * If str is really empty it is passwordless anyway...
+ * If str is really empty it is passwordless anyway... or '*' is a hint to set one
+ * on OE/Familiar
* else it is shadow based
*/
- if(str.isEmpty() )
+ if(str.isEmpty() || str == '*' )
need = true;
- else if ( str == '*' || str == 'x' )
+ else if ( str == 'x' )
#ifdef OPIE_LOGIN_SHADOW_PW
need = QString::fromLatin1( ::getspnam( pwd->pw_name )->sp_pwdp ).isEmpty();
#else
;
#endif
break;
}
}
::endpwent();
return need;
}