emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Avoid implicit brackets.

Browse Source
This commit is contained in:
nekral-guest 2007-12-31 15:27:23 +00:00
parent 3709183127
commit ce4e74c1b9
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@
out of main().
* src/chsh.c: Before pam_end(), the return value of the previous
pam API was already checked. No need to validate it again.
* src/chsh.c: Avoid implicit brackets.
2007-12-31 Nicolas François <nicolas.francois@centraliens.net>

13
src/chsh.c
View File

@ -142,8 +142,9 @@ static int check_shell (const char *sh)
#ifdef HAVE_GETUSERSHELL
setusershell ();
while ((cp = getusershell ())) {
if (*cp == '#')
if (*cp == '#') {
continue;
}
if (strcmp (cp, sh) == 0) {
found = 1;
@ -156,11 +157,13 @@ static int check_shell (const char *sh)
return 0;
while (fgets (buf, sizeof (buf), fp)) {
if ((cp = strrchr (buf, '\n')))
if ((cp = strrchr (buf, '\n'))) {
*cp = '\0';
}
if (buf[0] == '#')
if (buf[0] == '#') {
continue;
}
if (strcmp (buf, sh) == 0) {
found = 1;
@ -499,8 +502,9 @@ int main (int argc, char **argv)
* Now get the login shell. Either get it from the password
* file, or use the value from the command line.
*/
if (!sflg)
if (!sflg) {
STRFCPY (loginsh, pw->pw_shell);
}
/*
* If the login shell was not set on the command line, let the user
@ -541,3 +545,4 @@ int main (int argc, char **argv)
closelog ();
exit (E_SUCCESS);
}