syslog support in rsync daemon has been broken since I added the "log

[rsync/rsync.git] / uidlist.c

diff --git a/uidlist.c b/uidlist.c
index 962bb8c..eff8749 100644 (file)
--- a/uidlist.c
+++ b/uidlist.c
@@ -67,38 +67,19 @@ static char *gid_to_name(gid_t gid)
        return NULL;
 }
 
-
-/* turn a user name into a uid */
-static uid_t name_to_uid(char *name)
-{
-       struct passwd *pass;
-       if (!name || !*name) return 0;
-       pass = getpwnam(name);
-       if (pass) return(pass->pw_uid);
-       return 0;
-}
-
-/* turn a group name into a gid */
-static gid_t name_to_gid(char *name)
-{
-       struct group *grp;
-       if (!name || !*name) return 0;
-       grp = getgrnam(name);
-       if (grp) return(grp->gr_gid);
-       return 0;
-}
-
 static int map_uid(int id, char *name)
 {
-       uid_t uid = name_to_uid(name);
-       if (uid != 0) return uid;
+       uid_t uid;
+       if (name_to_uid(name, &uid) && uid != 0)
+               return uid;
        return id;
 }
 
 static int map_gid(int id, char *name)
 {
-       gid_t gid = name_to_gid(name);
-       if (gid != 0) return gid;
+       gid_t gid;
+       if (name_to_gid(name, &gid) && gid != 0)
+               return gid;
        return id;
 }
 
@@ -256,9 +237,9 @@ void recv_uid_list(int f, struct file_list *flist)
                id = read_int(f);
                while (id != 0) {
                        int len = read_byte(f);
-                       name = (char *)malloc(len);
+                       name = (char *)malloc(len+1);
                        if (!name) out_of_memory("recv_uid_list");
-                       read_buf(f, name, len);
+                       read_sbuf(f, name, len);
                        if (!list) {
                                uidlist = add_list(id, name);
                                list = uidlist;
@@ -279,9 +260,9 @@ void recv_uid_list(int f, struct file_list *flist)
                id = read_int(f);
                while (id != 0) {
                        int len = read_byte(f);
-                       name = (char *)malloc(len);
+                       name = (char *)malloc(len+1);
                        if (!name) out_of_memory("recv_uid_list");
-                       read_buf(f, name, len);
+                       read_sbuf(f, name, len);
                        if (!list) {
                                gidlist = add_list(id, name);
                                list = gidlist;