blob: 5dd2b04160e96781f5cefe6c1bb9ce86c0f83db3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
From: Wayne Davison <wayned@samba.org>
Date: Sun, 30 Dec 2007 06:52:04 +0000 (-0800)
Subject: Some minor tweaking to name_to_uid() and name_to_gid().
X-Git-Url: http://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=7210dbfd2ab424d5beee7dd94975006e1fa35ed7
Some minor tweaking to name_to_uid() and name_to_gid().
---
diff --git a/util.c b/util.c
index 05748b1..477f5bc 100644
--- a/util.c
+++ b/util.c
@@ -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 */
|
