author | zecke <zecke> | 2004-07-10 11:46:17 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-10 11:46:17 (UTC) |
commit | acc8a75e0d04757aa1d6f76942c04781f221a97f (patch) (unidiff) | |
tree | 0fb6fb4f5cdff00b76efa3080dbc6affe0af96c5 | |
parent | c2b6d8dfff0aa3eab76b823e5be76cebb23097cf (diff) | |
download | opie-acc8a75e0d04757aa1d6f76942c04781f221a97f.zip opie-acc8a75e0d04757aa1d6f76942c04781f221a97f.tar.gz opie-acc8a75e0d04757aa1d6f76942c04781f221a97f.tar.bz2 |
Unlink is not needed in this case
-rw-r--r-- | core/opie-login/passworddialogimpl.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/opie-login/passworddialogimpl.cpp b/core/opie-login/passworddialogimpl.cpp index aeb7516..951c4e1 100644 --- a/core/opie-login/passworddialogimpl.cpp +++ b/core/opie-login/passworddialogimpl.cpp | |||
@@ -138,49 +138,48 @@ void PasswordDialogImpl::writePassword() { | |||
138 | * Now crypt the password so we can write it later | 138 | * Now crypt the password so we can write it later |
139 | */ | 139 | */ |
140 | char* password = ::crypt( m_pass->text().latin1(), crypt_make_salt() ); | 140 | char* password = ::crypt( m_pass->text().latin1(), crypt_make_salt() ); |
141 | 141 | ||
142 | if ( !password ) | 142 | if ( !password ) |
143 | return error( tr("Password not legal" ), | 143 | return error( tr("Password not legal" ), |
144 | tr("<qt>The entered password is not a valid password." | 144 | tr("<qt>The entered password is not a valid password." |
145 | "Please try entering a valid password.</qt>" ) ); | 145 | "Please try entering a valid password.</qt>" ) ); |
146 | 146 | ||
147 | /* rewind and rewrite the password file */ | 147 | /* rewind and rewrite the password file */ |
148 | ::setpwent(); | 148 | ::setpwent(); |
149 | 149 | ||
150 | FILE* file = ::fopen( "/etc/passwd.new", "w" ); | 150 | FILE* file = ::fopen( "/etc/passwd.new", "w" ); |
151 | struct passwd* pass; | 151 | struct passwd* pass; |
152 | while ( (pass = ::getpwent()) != 0l ) { | 152 | while ( (pass = ::getpwent()) != 0l ) { |
153 | /* no shadow password support */ | 153 | /* no shadow password support */ |
154 | if ( pass->pw_uid == 0 ) | 154 | if ( pass->pw_uid == 0 ) |
155 | pass->pw_passwd = password; | 155 | pass->pw_passwd = password; |
156 | 156 | ||
157 | ::putpwent( pass, file ); | 157 | ::putpwent( pass, file ); |
158 | } | 158 | } |
159 | 159 | ||
160 | ::fclose( file ); | 160 | ::fclose( file ); |
161 | ::endpwent(); | 161 | ::endpwent(); |
162 | ::unlink("/etc/passwd"); | ||
163 | ::rename("/etc/passwd.new","/etc/passwd" ); | 162 | ::rename("/etc/passwd.new","/etc/passwd" ); |
164 | 163 | ||
165 | /* should be done now */ | 164 | /* should be done now */ |
166 | #ifdef OPIE_LOGIN_SHADOW_PW | 165 | #ifdef OPIE_LOGIN_SHADOW_PW |
167 | #error "Can't write Shadow Passwords fixme" | 166 | #error "Can't write Shadow Passwords fixme" |
168 | #endif | 167 | #endif |
169 | } | 168 | } |
170 | 169 | ||
171 | /** | 170 | /** |
172 | * Raise an error. Delete input and set the focus after showing | 171 | * Raise an error. Delete input and set the focus after showing |
173 | * the error to the user | 172 | * the error to the user |
174 | */ | 173 | */ |
175 | void PasswordDialogImpl::error( const QString& caption, const QString& text ) { | 174 | void PasswordDialogImpl::error( const QString& caption, const QString& text ) { |
176 | m_isSet = false; | 175 | m_isSet = false; |
177 | QMessageBox::critical(this,caption, text, | 176 | QMessageBox::critical(this,caption, text, |
178 | QMessageBox::Ok, QMessageBox::NoButton ); | 177 | QMessageBox::Ok, QMessageBox::NoButton ); |
179 | 178 | ||
180 | m_pass->setText(""); | 179 | m_pass->setText(""); |
181 | m_pass->setFocus(); | 180 | m_pass->setFocus(); |
182 | 181 | ||
183 | m_confirm->setText(""); | 182 | m_confirm->setText(""); |
184 | } | 183 | } |
185 | 184 | ||
186 | void PasswordDialogImpl::slotToggleEcho( bool b ) { | 185 | void PasswordDialogImpl::slotToggleEcho( bool b ) { |