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

Avoid assignments in conditionals.

Browse Source
This commit is contained in:
nekral-guest 2008-01-01 23:07:55 +00:00
parent 1d76eb6ef7
commit 94b3b98196
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-01-01 Nicolas François <nicolas.francois@centraliens.net>
* src/newgrp.c: Avoid assignments in conditionals.
2008-01-01 Nicolas François <nicolas.francois@centraliens.net> 2008-01-01 Nicolas François <nicolas.francois@centraliens.net>
* lib/shadow.c: Avoid assignments in conditionals. * lib/shadow.c: Avoid assignments in conditionals.

15
src/newgrp.c
View File

@ -240,7 +240,8 @@ int main (int argc, char **argv)
* Perhaps in the past, but the default behavior now depends on the * Perhaps in the past, but the default behavior now depends on the
* group entry, so it had better exist. -- JWP * group entry, so it had better exist. -- JWP
*/ */
if (!(grp = xgetgrgid (pwd->pw_gid))) { grp = xgetgrgid (pwd->pw_gid);
if (NULL == grp) {
fprintf (stderr, _("unknown GID: %lu\n"), fprintf (stderr, _("unknown GID: %lu\n"),
(unsigned long) pwd->pw_gid); (unsigned long) pwd->pw_gid);
SYSLOG ((LOG_CRIT, "unknown GID: %lu", SYSLOG ((LOG_CRIT, "unknown GID: %lu",
@ -319,7 +320,8 @@ int main (int argc, char **argv)
* including the user's name in the member list of the user's login * including the user's name in the member list of the user's login
* group. -- JWP * group. -- JWP
*/ */
if (!(grp = getgrnam (group))) { /* local, no need for xgetgrnam */ grp = getgrnam (group); /* local, no need for xgetgrnam */
if (NULL == grp) {
fprintf (stderr, _("unknown group: %s\n"), group); fprintf (stderr, _("unknown group: %s\n"), group);
goto failure; goto failure;
} }
@ -341,7 +343,8 @@ int main (int argc, char **argv)
grp = xgetgrnam (group); grp = xgetgrnam (group);
} }
#ifdef SHADOWGRP #ifdef SHADOWGRP
if ((sgrp = getsgnam (group))) { sgrp = getsgnam (group);
if (NULL != sgrp) {
grp->gr_passwd = sgrp->sg_passwd; grp->gr_passwd = sgrp->sg_passwd;
grp->gr_mem = sgrp->sg_mem; grp->gr_mem = sgrp->sg_mem;
} }
@ -364,7 +367,8 @@ int main (int argc, char **argv)
* password, and the group has a password, she needs to give the * password, and the group has a password, she needs to give the
* group password. * group password.
*/ */
if ((spwd = xgetspnam (name))) spwd = xgetspnam (name);
if (NULL != spwd)
pwd->pw_passwd = spwd->sp_pwdp; pwd->pw_passwd = spwd->sp_pwdp;
if (pwd->pw_passwd[0] == '\0' && grp->gr_passwd[0]) if (pwd->pw_passwd[0] == '\0' && grp->gr_passwd[0])
@ -381,7 +385,8 @@ int main (int argc, char **argv)
* get the password from her, and set the salt for * get the password from her, and set the salt for
* the decryption from the group file. * the decryption from the group file.
*/ */
if (!(cp = getpass (_("Password: ")))) cp = getpass (_("Password: "));
if (NULL == cp)
goto failure; goto failure;
/* /*