Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/update_passwd.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/libbb/update_passwd.c (modified) (4 diffs)

branches/3.3/mindi-busybox/libbb/update_passwd.c

@@ -63 +63 @@
     or if CONFIG_CHPASSWD=y and applet_name[0] == 'c' like in chpasswd
 
+ 8) delete a user from all groups: update_passwd(FILE, NULL, NULL, MEMBER)
+
  This function does not validate the arguments fed to it
  so the calling program should take care of that.
@@ -83 +85 @@
     char *sfx_char;
     char *name_colon;
-    unsigned user_len;
     int old_fd;
     int new_fd;
@@ -100 +101 @@
         return ret;
 
-    check_selinux_update_passwd(name);
+    if (name)
+        check_selinux_update_passwd(name);
 
     /* New passwd file, "/etc/passwd+" for now */
     fnamesfx = xasprintf("%s+", filename);
     sfx_char = &fnamesfx[strlen(fnamesfx)-1];
-    name_colon = xasprintf("%s:", name);
-    user_len = strlen(name_colon);
+    name_colon = xasprintf("%s:", name ? name : "");
 
     if (shadow)
@@ -168 +169 @@
         if (!line) /* EOF/error */
             break;
-        if (strncmp(name_colon, line, user_len) != 0) {
+
+        if (!name && member) {
+            /* Delete member from all groups */
+            /* line is "GROUP:PASSWD:[member1[,member2]...]" */
+            unsigned member_len = strlen(member);
+            char *list = strrchr(line, ':');
+            while (list) {
+                list++;
+ next_list_element:
+                if (is_prefixed_with(list, member)) {
+                    char c;
+                    changed_lines++;
+                    c = list[member_len];
+                    if (c == '\0') {
+                        if (list[-1] == ',')
+                            list--;
+                        *list = '\0';
+                        break;
+                    }
+                    if (c == ',') {
+                        overlapping_strcpy(list, list + member_len + 1);
+                        goto next_list_element;
+                    }
+                    changed_lines--;
+                }
+                list = strchr(list, ',');
+            }
             fprintf(new_fp, "%s\n", line);
             goto next;
         }
 
+        cp = is_prefixed_with(line, name_colon);
+        if (!cp) {
+            fprintf(new_fp, "%s\n", line);
+            goto next;
+        }
+
         /* We have a match with "name:"... */
-        cp = line + user_len; /* move past name: */
+        /* cp points past "name:" */
 
 #if ENABLE_FEATURE_ADDUSER_TO_GROUP || ENABLE_FEATURE_DEL_USER_FROM_GROUP