Changeset 534 for trunk/src

Timestamp:

Sep 16, 2018, 8:56:38 PM (6 years ago)

Author:

katerina

Message:

Version 4.3.0, support for /etc/subuid, /etc/subgid

Location:

trunk/src

Files:

• sh_hash.c (modified) (1 diff)
• sh_subuid.c (added)
• sh_unix.c (modified) (6 diffs)

trunk/src/sh_hash.c

@@ -24 +24 @@
 #include <stdio.h>
 #include <sys/types.h>
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
 #include <sys/stat.h>
 #include <unistd.h>

trunk/src/sh_unix.c

@@ -2827 +2827 @@
 
 /* --------- end caching code --------- */
-  
+
+#include "sh_subuid.h"
+
 char *  sh_unix_getUIDname (int level, uid_t uid, char * out, size_t len)
 {
@@ -2863 +2865 @@
   status = errno;
 #endif
- 
-  if (tempres == NULL) 
-    {
-      sh_error_handle (level, FIL__, __LINE__, EINVAL, MSG_E_PWNULL,
-                       sh_error_message(status, errbuf, sizeof(errbuf)),
-                       _("getpwuid"), (long) uid, _("completely missing"));
-#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
-      SH_FREE(buffer);
-#endif
-      sh_userid_add(uid, NULL, CACHE_UID);
-      SL_RETURN( NULL, _("sh_unix_getUIDname"));
-    }
-
-
-  if (tempres->pw_name != NULL) 
+
+  /* case 1: we have it
+   */
+  if (tempres && tempres->pw_name != NULL) 
     {
 
@@ -2888 +2879 @@
 
       SL_RETURN( out, _("sh_unix_getUIDname"));
-    } 
-  else 
-    {
+    }
+
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
+  SH_FREE(buffer);
+#endif
+  
+  if (tempres == NULL) 
+    {
+      char * pwname = sh_get_subuid ((unsigned long) uid);
+
+      if (pwname)
+        {
+          sl_strlcpy(out, pwname, len);
+          sh_userid_add(uid, out, CACHE_UID);
+          SL_RETURN( out, _("sh_unix_getUIDname"));
+        }
+
       sh_error_handle (level, FIL__, __LINE__, EINVAL, MSG_E_PWNULL,
                        sh_error_message(status, errbuf, sizeof(errbuf)),
-                       _("getpwuid"), (long) uid, _("pw_user"));
-#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
-      SH_FREE(buffer);
-#endif
+                       _("getpwuid"), (long) uid, _("completely missing"));
+      sh_userid_add(uid, NULL, CACHE_UID);
       SL_RETURN( NULL, _("sh_unix_getUIDname"));
     }
-  /* notreached */
+
+
+  /* getwpuid returns struct, but no pw_name
+   */
+  sh_error_handle (level, FIL__, __LINE__, EINVAL, MSG_E_PWNULL,
+                   sh_error_message(status, errbuf, sizeof(errbuf)),
+                   _("getpwuid"), (long) uid, _("pw_user"));
+  SL_RETURN( NULL, _("sh_unix_getUIDname"));
 }
 
@@ -2959 +2969 @@
     }
 
-  if (tempres == NULL) 
-    {
-      sh_error_handle (level, FIL__, __LINE__, EINVAL, MSG_E_GRNULL,
-                       sh_error_message(status, errbuf, sizeof(errbuf)),
-                       _("getgrgid"), (long) gid, _("completely missing"));
-      
-#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
-      SH_FREE(buffer);
-#endif
-
-      sh_userid_add(gid, NULL, CACHE_GID);
-      SL_RETURN( NULL, _("sh_unix_getGIDname"));
-    }
-
-  if (tempres->gr_name != NULL) 
+  if (tempres && tempres->gr_name != NULL) 
     {
 
@@ -2985 +2981 @@
       SL_RETURN( out, _("sh_unix_getGIDname"));
     } 
-  else 
-    {
+
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
+  SH_FREE(buffer);
+#endif
+
+  if (tempres == NULL) 
+    {
+      char * grname = sh_get_subgid ((unsigned long) gid);
+
+      if (grname)
+        {
+          sl_strlcpy(out, grname, len);
+          sh_userid_add((uid_t)gid, out, CACHE_GID);
+          SL_RETURN( out, _("sh_unix_getGIDname"));
+        }
+
       sh_error_handle (level, FIL__, __LINE__, EINVAL, MSG_E_GRNULL,
                        sh_error_message(status, errbuf, sizeof(errbuf)),
-                       _("getgrgid"), (long) gid, _("gr_name"));
-
-#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
-      SH_FREE(buffer);
-#endif
-
+                       _("getgrgid"), (long) gid, _("completely missing"));
+      sh_userid_add(gid, NULL, CACHE_GID);
       SL_RETURN( NULL, _("sh_unix_getGIDname"));
     }
-  /* notreached */
+
+  sh_error_handle (level, FIL__, __LINE__, EINVAL, MSG_E_GRNULL,
+                   sh_error_message(status, errbuf, sizeof(errbuf)),
+                   _("getgrgid"), (long) gid, _("gr_name"));
+  SL_RETURN( NULL, _("sh_unix_getGIDname"));
 }
 
@@ -3066 +3076 @@
 }
 
-
+/* return >0 on success, -1 on EOF */
 int sh_unix_getline (SL_TICKET fd, char * line, int sizeofline)
 {