Merge tag '1_26_2' into w32_1_26_2w32_1_26_2

6 files changed, 70 insertions, 21 deletions

diff --git a/libbb/Config.src b/libbb/Config.src
index 00804e31e..172fbcc0e 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -152,7 +152,7 @@ config FEATURE_TAB_COMPLETION
 
 config FEATURE_USERNAME_COMPLETION
         bool "Username completion"
-        default n
+        default y
         depends on FEATURE_TAB_COMPLETION
         help
           Enable username completion.
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 39d9d907d..fc9371db1 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -135,6 +135,7 @@ lib-$(CONFIG_TFTPD) += udp_io.o
 lib-$(CONFIG_TCPSVD) += udp_io.o
 lib-$(CONFIG_UDPSVD) += udp_io.o
 lib-$(CONFIG_TRACEROUTE) += udp_io.o
+lib-$(CONFIG_TRACEROUTE6) += udp_io.o
 
 lib-$(CONFIG_LOSETUP) += loop.o
 lib-$(CONFIG_FEATURE_MOUNT_LOOP) += loop.o
@@ -144,7 +145,7 @@ lib-$(CONFIG_ADDUSER) += update_passwd.o
 lib-$(CONFIG_DELGROUP) += update_passwd.o
 lib-$(CONFIG_DELUSER) += update_passwd.o
 
-lib-$(CONFIG_FTPD) += correct_password.o
+lib-$(CONFIG_FTPD) += pw_encrypt.o correct_password.o
 lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o
 lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o
 lib-$(CONFIG_CRYPTPW) += pw_encrypt.o
@@ -159,6 +160,7 @@ lib-$(CONFIG_FEATURE_FTP_AUTHENTICATION) += pw_encrypt.o
 lib-$(CONFIG_DF) += find_mount_point.o
 lib-$(CONFIG_MKFS_MINIX) += find_mount_point.o
 lib-$(CONFIG_MKFS_EXT2) += find_mount_point.o
+lib-$(CONFIG_MKE2FS) += find_mount_point.o
 lib-$(CONFIG_MKFS_REISER) += find_mount_point.o
 lib-$(CONFIG_FSCK_MINIX) += find_mount_point.o
 lib-$(CONFIG_MOUNT) += find_mount_point.o
@@ -171,11 +173,13 @@ lib-$(CONFIG_MPSTAT) += get_cpu_count.o
 lib-$(CONFIG_POWERTOP) += get_cpu_count.o
 
 lib-$(CONFIG_PING) += inet_cksum.o
+lib-$(CONFIG_PING6) += inet_cksum.o
 lib-$(CONFIG_TRACEROUTE) += inet_cksum.o
 lib-$(CONFIG_TRACEROUTE6) += inet_cksum.o
 lib-$(CONFIG_UDHCPC) += inet_cksum.o
 lib-$(CONFIG_UDHCPC6) += inet_cksum.o
 lib-$(CONFIG_UDHCPD) += inet_cksum.o
+lib-$(CONFIG_DHCPRELAY) += inet_cksum.o
 
 # We shouldn't build xregcomp.c if we don't need it - this ensures we don't
 # require regex.h to be in the include dir even if we don't need it thereby
@@ -184,6 +188,8 @@ lib-$(CONFIG_UDHCPD) += inet_cksum.o
 lib-$(CONFIG_AWK) += xregcomp.o
 lib-$(CONFIG_SED) += xregcomp.o
 lib-$(CONFIG_GREP) += xregcomp.o
+lib-$(CONFIG_EGREP) += xregcomp.o
+lib-$(CONFIG_FGREP) += xregcomp.o
 lib-$(CONFIG_EXPR) += xregcomp.o
 lib-$(CONFIG_MDEV) += xregcomp.o
 lib-$(CONFIG_LESS) += xregcomp.o
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 1fe0eb44f..ac3e414f5 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -334,21 +334,6 @@ static struct suid_config_t {
 
 static bool suid_cfg_readable;
 
-/* check if u is member of group g */
-static int ingroup(uid_t u, gid_t g)
-{
-        struct group *grp = getgrgid(g);
-        if (grp) {
-                char **mem;
-                for (mem = grp->gr_mem; *mem; mem++) {
-                        struct passwd *pwd = getpwnam(*mem);
-                        if (pwd && (pwd->pw_uid == u))
-                                return 1;
-                }
-        }
-        return 0;
-}
-
 /* libbb candidate */
 static char *get_trimmed_slice(char *s, char *e)
 {
@@ -573,7 +558,22 @@ static inline void parse_config_file(void)
 # endif /* FEATURE_SUID_CONFIG */
 
 
-# if ENABLE_FEATURE_SUID
+# if ENABLE_FEATURE_SUID && NUM_APPLETS > 0
+/* check if u is member of group g */
+static int ingroup(uid_t u, gid_t g)
+{
+        struct group *grp = getgrgid(g);
+        if (grp) {
+                char **mem;
+                for (mem = grp->gr_mem; *mem; mem++) {
+                        struct passwd *pwd = getpwnam(*mem);
+                        if (pwd && (pwd->pw_uid == u))
+                                return 1;
+                }
+        }
+        return 0;
+}
+
 static void check_suid(int applet_no)
 {
         gid_t rgid;  /* real gid */
diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index 3980376ec..840c525b0 100644
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
@@ -35,9 +35,20 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
         char c;
         struct stat st;
 
-        /* Happens on bb_make_directory(dirname("no_slashes"),...) */
-        if (LONE_CHAR(path, '.'))
+        /* "path" can be a result of dirname().
+         * dirname("no_slashes") returns ".", possibly read-only.
+         * musl dirname() can return read-only "/" too.
+         * We need writable string. And for "/", "." (and ".."?)
+         * nothing needs to be created anyway.
+         */
+        if (LONE_CHAR(path, '/'))
                 return 0;
+        if (path[0] == '.') {
+                if (path[1] == '\0')
+                        return 0; /* "." */
+//              if (path[1] == '.' && path[2] == '\0')
+//                      return 0; /* ".." */
+        }
 
         org_mask = cur_mask = (mode_t)-1L;
         s = path;
diff --git a/libbb/update_passwd.c b/libbb/update_passwd.c
index a2004f480..95423d19b 100644
--- a/libbb/update_passwd.c
+++ b/libbb/update_passwd.c
@@ -30,7 +30,18 @@ static void check_selinux_update_passwd(const char *username)
         if (!seuser)
                 bb_error_msg_and_die("invalid context '%s'", context);
         if (strcmp(seuser, username) != 0) {
-                if (checkPasswdAccess(PASSWD__PASSWD) != 0)
+                security_class_t tclass;
+                access_vector_t av;
+
+                tclass = string_to_security_class("passwd");
+                if (tclass == 0)
+                        goto die;
+                av = string_to_av_perm(tclass, "passwd");
+                if (av == 0)
+                        goto die;
+
+                if (selinux_check_passwd_access(av) != 0)
+ die:
                         bb_error_msg_and_die("SELinux: access denied");
         }
         if (ENABLE_FEATURE_CLEAN_UP)
@@ -169,6 +180,7 @@ int FAST_FUNC update_passwd(const char *filename,
                 if (!line) /* EOF/error */
                         break;
 
+#if ENABLE_FEATURE_ADDUSER_TO_GROUP || ENABLE_FEATURE_DEL_USER_FROM_GROUP
                 if (!name && member) {
                         /* Delete member from all groups */
                         /* line is "GROUP:PASSWD:[member1[,member2]...]" */
@@ -198,6 +210,7 @@ int FAST_FUNC update_passwd(const char *filename,
                         fprintf(new_fp, "%s\n", line);
                         goto next;
                 }
+#endif
 
                 cp = is_prefixed_with(line, name_colon);
                 if (!cp) {
diff --git a/libbb/xatonum.c b/libbb/xatonum.c
index 9dd5c3e7e..b63b7f54d 100644
--- a/libbb/xatonum.c
+++ b/libbb/xatonum.c
@@ -96,3 +96,22 @@ const struct suffix_mult cwbkMG_suffixes[] = {
         /* coreutils also understands TPEZY suffixes for tera- and so on, with B suffix for decimal */
         { "", 0 }
 };
+
+const struct suffix_mult kmg_i_suffixes[] = {
+        { "KiB", 1024 },
+        { "kiB", 1024 },
+        { "K", 1024 },
+        { "k", 1024 },
+        { "MiB", 1048576 },
+        { "miB", 1048576 },
+        { "M", 1048576 },
+        { "m", 1048576 },
+        { "GiB", 1073741824 },
+        { "giB", 1073741824 },
+        { "G", 1073741824 },
+        { "g", 1073741824 },
+        { "KB", 1000 },
+        { "MB", 1000000 },
+        { "GB", 1000000000 },
+        { "", 0 }
+};