summaryrefslogtreecommitdiffstats
path: root/uidswap.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-06-02 00:07:31 +0200
committerDarren Tucker <dtucker@zip.com.au>2013-06-02 00:07:31 +0200
commitf60845fde29cead9d75e812db1c04916b4c58ffd (patch)
treea69fe76f6dd73057e46625867d1b4282e8a5a040 /uidswap.c
parentRemove stray '+' accidentally introduced in sync (diff)
downloadopenssh-f60845fde29cead9d75e812db1c04916b4c58ffd.tar.xz
openssh-f60845fde29cead9d75e812db1c04916b4c58ffd.zip
- (dtucker) [M auth-chall.c auth-krb5.c auth-pam.c cipher-aes.c cipher-ctr.c
groupaccess.c loginrec.c monitor.c monitor_wrap.c session.c sshd.c sshlogin.c uidswap.c openbsd-compat/bsd-cygwin_util.c openbsd-compat/getrrsetbyname-ldns.c openbsd-compat/port-aix.c openbsd-compat/port-linux.c] Replace portable-specific instances of xfree with the equivalent calls to free.
Diffstat (limited to 'uidswap.c')
-rw-r--r--uidswap.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/uidswap.c b/uidswap.c
index cdd7309e3..26d17f93a 100644
--- a/uidswap.c
+++ b/uidswap.c
@@ -90,8 +90,7 @@ temporarily_use_uid(struct passwd *pw)
if (getgroups(saved_egroupslen, saved_egroups) < 0)
fatal("getgroups: %.100s", strerror(errno));
} else { /* saved_egroupslen == 0 */
- if (saved_egroups != NULL)
- xfree(saved_egroups);
+ free(saved_egroups);
}
/* set and save the user's groups */
@@ -109,8 +108,7 @@ temporarily_use_uid(struct passwd *pw)
if (getgroups(user_groupslen, user_groups) < 0)
fatal("getgroups: %.100s", strerror(errno));
} else { /* user_groupslen == 0 */
- if (user_groups)
- xfree(user_groups);
+ free(user_groups);
}
}
/* Set the effective uid to the given (unprivileged) uid. */