Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libpwdgrp/uidgid_get.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libpwdgrp/uidgid_get.c (modified) (6 diffs)

branches/3.3/mindi-busybox/libpwdgrp/uidgid_get.c

@@ -29 +29 @@
 
 /* Always sets uid and gid */
-int FAST_FUNC get_uidgid(struct bb_uidgid_t *u, const char *ug, int numeric_ok)
+int FAST_FUNC get_uidgid(struct bb_uidgid_t *u, const char *ug)
 {
     struct passwd *pwd;
@@ -44 +44 @@
         safe_strncpy(user, ug, sz);
     }
-    if (numeric_ok) {
-        n = bb_strtou(user, NULL, 10);
-        if (!errno) {
-            u->uid = n;
-            pwd = getpwuid(n);
-            /* If we have e.g. "500" string without user */
-            /* with uid 500 in /etc/passwd, we set gid == uid */
-            u->gid = pwd ? pwd->pw_gid : n;
-            goto skip;
-        }
+    n = bb_strtou(user, NULL, 10);
+    if (!errno) {
+        u->uid = n;
+        pwd = getpwuid(n);
+        /* If we have e.g. "500" string without user */
+        /* with uid 500 in /etc/passwd, we set gid == uid */
+        u->gid = pwd ? pwd->pw_gid : n;
+        goto skip;
     }
-    /* Either it is not numeric, or caller disallows numeric username */
+    /* it is not numeric */
     pwd = getpwnam(user);
     if (!pwd)
@@ -64 +62 @@
  skip:
     if (group) {
-        if (numeric_ok) {
-            n = bb_strtou(group, NULL, 10);
-            if (!errno) {
-                u->gid = n;
-                return 1;
-            }
+        n = bb_strtou(group, NULL, 10);
+        if (!errno) {
+            u->gid = n;
+            return 1;
         }
         gr = getgrnam(group);
@@ -80 +76 @@
 void FAST_FUNC xget_uidgid(struct bb_uidgid_t *u, const char *ug)
 {
-    if (!get_uidgid(u, ug, 1))
+    if (!get_uidgid(u, ug))
         bb_error_msg_and_die("unknown user/group %s", ug);
 }
@@ -94 +90 @@
 {
     char *group;
+
+    u->uid = u->gid = (gid_t)-1L;
 
     /* Check if there is a group name */
@@ -120 +118 @@
     unsigned u;
     struct bb_uidgid_t ug;
-    u = get_uidgid(&ug, "apache", 0);
+    u = get_uidgid(&ug, "apache");
     printf("%u = %u:%u\n", u, ug.uid, ug.gid);
     ug.uid = ug.gid = 1111;
-    u = get_uidgid(&ug, "apache", 0);
+    u = get_uidgid(&ug, "apache");
     printf("%u = %u:%u\n", u, ug.uid, ug.gid);
     ug.uid = ug.gid = 1111;
-    u = get_uidgid(&ug, "apache:users", 0);
+    u = get_uidgid(&ug, "apache:users");
     printf("%u = %u:%u\n", u, ug.uid, ug.gid);
     ug.uid = ug.gid = 1111;
-    u = get_uidgid(&ug, "apache:users", 0);
+    u = get_uidgid(&ug, "apache:users");
     printf("%u = %u:%u\n", u, ug.uid, ug.gid);
     return 0;