Merge in all the low-risk changes from the Windows branch.

[bacula/bacula] / bacula / src / lib / idcache.c

diff --git a/bacula/src/lib/idcache.c b/bacula/src/lib/idcache.c
index 8343df5d0df033e7151bac2b98bd1d540a52529c..99c7362b05186fdb96f83a2e76774dceefc11bf9 100644 (file)
--- a/bacula/src/lib/idcache.c
+++ b/bacula/src/lib/idcache.c
@@ -35,7 +35,7 @@ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 /* Translate UID to a login name or a stringified number,
    with cache. */
 
-char *getuser(uid_t uid)
+char *getuser(uid_t uid, char *name, int len)
 {
   register struct userid *tail;
   struct passwd *pwent;
@@ -44,26 +44,33 @@ char *getuser(uid_t uid)
   P(mutex);
   for (tail = user_alist; tail; tail = tail->next) {
     if (tail->id.u == uid) {
-      V(mutex);
-      return tail->name;
+      goto uid_done;
     }
   }
 
   pwent = getpwuid(uid);
   tail = (struct userid *)malloc(sizeof (struct userid));
   tail->id.u = uid;
-  if (pwent == 0 || strcmp(pwent->pw_name, "????????") == 0) {
+#ifndef HAVE_WIN32
+  if (pwent == NULL || strcmp(pwent->pw_name, "????????") == 0) {
       sprintf(usernum_string, "%u", (uint32_t)uid);
       tail->name = bstrdup(usernum_string);
   } else {
       tail->name = bstrdup(pwent->pw_name);
   }
+#else
+      sprintf(usernum_string, "%u", (uint32_t)uid);
+      tail->name = bstrdup(usernum_string);
+#endif
 
   /* Add to the head of the list, so most recently used is first.  */
   tail->next = user_alist;
   user_alist = tail;
+
+uid_done:
+  bstrncpy(name, tail->name, len);
   V(mutex);
-  return tail->name;
+  return name;
 }
 
 void free_getuser_cache()
@@ -85,7 +92,7 @@ void free_getuser_cache()
 
 /* Translate GID to a group name or a stringified number,
    with cache. */
-char *getgroup(gid_t gid)
+char *getgroup(gid_t gid, char *name, int len)
 {
   register struct userid *tail;
   struct group *grent;
@@ -94,26 +101,32 @@ char *getgroup(gid_t gid)
   P(mutex);
   for (tail = group_alist; tail; tail = tail->next) {
     if (tail->id.g == gid) {
-      V(mutex);
-      return tail->name;
+      goto gid_done;
     }
   }
 
   grent = getgrgid(gid);
   tail = (struct userid *)malloc(sizeof (struct userid));
   tail->id.g = gid;
-  if (grent == 0 || strcmp(grent->gr_name, "????????") == 0) {
+#ifndef HAVE_WIN32
+  if (grent == NULL || strcmp(grent->gr_name, "????????") == 0) {
       sprintf (groupnum_string, "%u", (uint32_t)gid);
       tail->name = bstrdup(groupnum_string);
   } else {
       tail->name = bstrdup(grent->gr_name);
   }
-
+#else
+      sprintf (groupnum_string, "%u", (uint32_t)gid);
+      tail->name = bstrdup(groupnum_string);
+#endif
   /* Add to the head of the list, so most recently used is first.  */
   tail->next = group_alist;
   group_alist = tail;
+
+gid_done:
+  bstrncpy(name, tail->name, len);
   V(mutex);
-  return tail->name;
+  return name;
 }
 
 void free_getgroup_cache()