diff options
author | Wayne Davison <wayned@samba.org> | 2007-12-29 22:52:04 -0800 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2007-12-29 22:52:04 -0800 |
commit | 7210dbfd2ab424d5beee7dd94975006e1fa35ed7 (patch) | |
tree | 95087f3f980ef2621fbf45c3c6d9c30b7b1406df | |
parent | b6800a0b32d53cbb23129a3eea8fa832fb864b79 (diff) | |
download | rsync-7210dbfd2ab424d5beee7dd94975006e1fa35ed7.tar.gz |
Some minor tweaking to name_to_uid() and name_to_gid().
-rw-r--r-- | util.c | 24 |
1 files changed, 10 insertions, 14 deletions
@@ -466,31 +466,27 @@ void kill_all(int sig) } /** Turn a user name into a uid */ -int name_to_uid(const char *name, uid_t *uid) +int name_to_uid(const char *name, uid_t *uid_p) { struct passwd *pass; if (!name || !*name) return 0; - pass = getpwnam(name); - if (pass) { - *uid = pass->pw_uid; - return 1; - } - return 0; + if (!(pass = getpwnam(name))) + return 0; + *uid_p = pass->pw_uid; + return 1; } /** Turn a group name into a gid */ -int name_to_gid(const char *name, gid_t *gid) +int name_to_gid(const char *name, gid_t *gid_p) { struct group *grp; if (!name || !*name) return 0; - grp = getgrnam(name); - if (grp) { - *gid = grp->gr_gid; - return 1; - } - return 0; + if (!(grp = getgrnam(name))) + return 0; + *gid_p = grp->gr_gid; + return 1; } /** Lock a byte range in a open file */ |