Mercurial > hg > toybox

comparison toys/passwd.c @ 637:9aeea680acc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use "_password" instead of "_passwd" for names in lib/password.c.
author Rob Landley <rob@landley.net>
date Sat, 21 Jul 2012 18:38:36 -0500
parents 77d94b36aff0
children
comparison
equal deleted inserted replaced
636:42ae383499c5 637:9aeea680acc7
142 142
143 static char *new_password(char *oldp, char *user) 143 static char *new_password(char *oldp, char *user)
144 { 144 {
145 char *newp = NULL; 145 char *newp = NULL;
146 146
147 if(read_passwd(toybuf, sizeof(toybuf), "New password:")) 147 if(read_password(toybuf, sizeof(toybuf), "New password:"))
148 return NULL; //may be due to Ctrl-C 148 return NULL; //may be due to Ctrl-C
149 149
150 newp = xstrdup(toybuf); 150 newp = xstrdup(toybuf);
151 strength_check(newp, oldp, user); 151 strength_check(newp, oldp, user);
152 if(read_passwd(toybuf, sizeof(toybuf), "Retype password:")) { 152 if(read_password(toybuf, sizeof(toybuf), "Retype password:")) {
153 free(newp); 153 free(newp);
154 return NULL; //may be due to Ctrl-C 154 return NULL; //may be due to Ctrl-C
155 } 155 }
156 156
157 if(strcmp(newp, toybuf) == 0) 157 if(strcmp(newp, toybuf) == 0)
208 if(pass[0] == '!') 208 if(pass[0] == '!')
209 error_exit("Can't change, password is locked for %s",name); 209 error_exit("Can't change, password is locked for %s",name);
210 if(myuid != 0) { 210 if(myuid != 0) {
211 /*Validate user */ 211 /*Validate user */
212 212
213 if(read_passwd(toybuf, sizeof(toybuf), "Origial password:")) { 213 if(read_password(toybuf, sizeof(toybuf), "Origial password:")) {
214 if(!toys.optargs[0]) free(name); 214 if(!toys.optargs[0]) free(name);
215 return; 215 return;
216 } 216 }
217 orig = toybuf; 217 orig = toybuf;
218 if(verify_passwd(pass)) 218 if(verify_passwd(pass))
257 encrypted = (char*)xzalloc(sizeof(char)*2); //1 = "", 2 = '\0' 257 encrypted = (char*)xzalloc(sizeof(char)*2); //1 = "", 2 = '\0'
258 } 258 }
259 259
260 /*Update the passwd */ 260 /*Update the passwd */
261 if(pw->pw_passwd[0] == 'x') 261 if(pw->pw_passwd[0] == 'x')
262 ret = update_passwd("/etc/shadow", name, encrypted); 262 ret = update_password("/etc/shadow", name, encrypted);
263 else 263 else
264 ret = update_passwd("/etc/passwd", name, encrypted); 264 ret = update_password("/etc/passwd", name, encrypted);
265 265
266 if((toys.optflags & (FLAG_l | FLAG_u | FLAG_d))) 266 if((toys.optflags & (FLAG_l | FLAG_u | FLAG_d)))
267 free(encrypted); 267 free(encrypted);
268 268
269 if(!toys.optargs[0]) free(name); 269 if(!toys.optargs[0]) free(name);