author | erik <erik> | 2007-01-23 21:39:59 (UTC) |
---|---|---|
committer | erik <erik> | 2007-01-23 21:39:59 (UTC) |
commit | 8644340455a433f4d6e3b31b329479f1e7983f78 (patch) (side-by-side diff) | |
tree | 8429c11d6634f4d8a7ad83fd59aaf03989d027a3 /core | |
parent | adcf6075db477909dd8170a74862a6ef91a5127f (diff) | |
download | opie-8644340455a433f4d6e3b31b329479f1e7983f78.zip opie-8644340455a433f4d6e3b31b329479f1e7983f78.tar.gz opie-8644340455a433f4d6e3b31b329479f1e7983f78.tar.bz2 |
A couple more return values that need to be checked.
-rw-r--r-- | core/opie-login/passworddialogimpl.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/opie-login/passworddialogimpl.cpp b/core/opie-login/passworddialogimpl.cpp index d9132e2..3c1b474 100644 --- a/core/opie-login/passworddialogimpl.cpp +++ b/core/opie-login/passworddialogimpl.cpp @@ -119,97 +119,101 @@ void PasswordDialogImpl::done(int res) { } if(m_isSet) PasswordDialog::done( res ); } /* * Lets see if we can write either shadow * */ /** * CRYPT the password and then tries to write it either to the shadow password * or to the plain /etc/passwd */ void PasswordDialogImpl::writePassword() { /* * Check if both texts are the same */ if ( m_pass->text() != m_confirm->text() ) return error( tr("Passwords don't match"), tr("<qt>The two passwords don't match. Please try again.</qt>") ); /* * Now crypt the password so we can write it later */ char* password = ::crypt( m_pass->text().latin1(), crypt_make_salt() ); if ( !password ) return error( tr("Password not legal" ), tr("<qt>The entered password is not a valid password." "Please try entering a valid password.</qt>" ) ); /* rewind and rewrite the password file */ ::setpwent(); FILE* file = ::fopen( "/etc/passwd.new", "w" ); struct passwd* pass; while ( (pass = ::getpwent()) != 0l ) { /* no shadow password support */ if ( pass->pw_uid == 0 ) pass->pw_passwd = password; ::putpwent( pass, file ); } ::fclose( file ); ::endpwent(); - ::rename("/etc/passwd.new","/etc/passwd" ); + if (::rename("/etc/passwd.new","/etc/passwd" ) == -1) + return error( tr("Rename /etc/passwd failed"), + tr("<qt>Renaming /etc/passwd.new to /etc/passwd failed." + "Please check your /etc/passed file, your /etc directory " + "or your filesystem.</qt>") ); /* should be done now */ #ifdef OPIE_LOGIN_SHADOW_PW #error "Can't write Shadow Passwords fixme" #endif } /** * Raise an error. Delete input and set the focus after showing * the error to the user */ void PasswordDialogImpl::error( const QString& caption, const QString& text ) { m_isSet = false; QMessageBox::critical(this,caption, text, QMessageBox::Ok, QMessageBox::NoButton ); m_pass->setText(""); m_pass->setFocus(); m_confirm->setText(""); } void PasswordDialogImpl::slotToggleEcho( bool b ) { m_pass-> setEchoMode( b ? QLineEdit::Normal : QLineEdit::Password ); m_confirm->setEchoMode( b ? QLineEdit::Normal : QLineEdit::Password ); } ///////////////////////// /// static functions /// /** * Ask whether or not we need to show the dialog. It returns true if * no root password is set so that the user will be able to set one. */ 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 ) { |