]> git.ipfire.org Git - thirdparty/shadow.git/commitdiff
*/: chgpasswd(8): -m,--md5: Remove option
authorAlejandro Colomar <alx@kernel.org>
Sat, 27 Dec 2025 11:52:14 +0000 (12:52 +0100)
committerSerge Hallyn <serge@hallyn.com>
Tue, 24 Feb 2026 14:55:18 +0000 (08:55 -0600)
Signed-off-by: Alejandro Colomar <alx@kernel.org>
37 files changed:
man/chgpasswd.8.xml
src/chgpasswd.c
tests/crypt/login.defs_DES/12_chgpasswd-m.test [deleted file]
tests/crypt/login.defs_DES/12_chgpasswd-m/group [deleted file]
tests/crypt/login.defs_DES/12_chgpasswd-m/gshadow [deleted file]
tests/crypt/login.defs_DES/12_chgpasswd-m/passwd [deleted file]
tests/crypt/login.defs_DES/12_chgpasswd-m/shadow [deleted file]
tests/grouptools/chgpasswd/06_chgpasswd_usage/data/usage.out
tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/data/usage.out
tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/chgpasswd.test [deleted file]
tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config.txt [deleted file]
tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/default/useradd [deleted file]
tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/group [deleted file]
tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/gshadow [deleted file]
tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/passwd [deleted file]
tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/shadow [deleted file]
tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/data/usage.out [deleted file]
tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/data/usage.out
tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/chgpasswd.test [deleted file]
tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config.txt [deleted file]
tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/default/useradd [deleted file]
tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/group [deleted file]
tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/gshadow [deleted file]
tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/passwd [deleted file]
tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/shadow [deleted file]
tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/data/usage.out [deleted file]
tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/data/usage.out
tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/data/usage.out
tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/data/usage.out
tests/grouptools/chgpasswd/15_chgpasswd_password_md5/chgpasswd.test [deleted file]
tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/group [deleted file]
tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/gshadow [deleted file]
tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/passwd [deleted file]
tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/shadow [deleted file]
tests/grouptools/chgpasswd/15_chgpasswd_password_md5/data/gshadow [deleted file]
tests/run_all
tests/run_all.coverage

index 7e83d8514d732515a806655b6f3571c3ca31d811..ce6e987a68ca020b0cde63e02c7e932f498ce3e7 100644 (file)
@@ -69,8 +69,8 @@
     <para>
       The default encryption algorithm can be defined for the system with
       the <option>ENCRYPT_METHOD</option> variable of <filename>/etc/login.defs</filename>,
-      and can be overwritten with the <option>-e</option>,
-      <option>-m</option>, or <option>-c</option> options.
+      and can be overwritten with the <option>-e</option>
+      or <option>-c</option> options.
     </para>
     <para>
       This command is intended to be used in a large system environment
          <para>Display help message and exit.</para>
        </listitem>
       </varlistentry>
-      <varlistentry>
-       <term><option>-m</option>, <option>--md5</option></term>
-       <listitem>
-         <para>
-           Use MD5 encryption instead of DES when the supplied passwords are
-           not encrypted.
-         </para>
-       </listitem>
-      </varlistentry>
       <varlistentry>
        <term>
          <option>-R</option>, <option>--root</option>&nbsp;<replaceable>CHROOT_DIR</replaceable>
index 48a6cfcedd4a02cb1637dbd19996e370f1b583c9..71829868edcb89fbfd8e04c96ca3fa90a7013ce3 100644 (file)
@@ -47,7 +47,6 @@ struct option_flags {
  */
 static const char Prog[] = "chgpasswd";
 static bool eflg   = false;
-static bool md5flg = false;
 static bool sflg   = false;
 
 static /*@null@*//*@observer@*/const char *crypt_method = NULL;
@@ -126,9 +125,6 @@ usage (int status)
                       );
        (void) fputs (_("  -e, --encrypted               supplied passwords are encrypted\n"), usageout);
        (void) fputs (_("  -h, --help                    display this help message and exit\n"), usageout);
-       (void) fputs (_("  -m, --md5                     encrypt the clear text password using\n"
-                       "                                the MD5 algorithm\n"),
-                     usageout);
        (void) fputs (_("  -R, --root CHROOT_DIR         directory to chroot into\n"), usageout);
        (void) fputs (_("  -s, --sha-rounds              number of rounds for the SHA, BCRYPT\n"
                        "                                or YESCRYPT crypt algorithms\n"),
@@ -151,12 +147,11 @@ static void process_flags (int argc, char **argv, struct option_flags *flags)
                {"crypt-method", required_argument, NULL, 'c'},
                {"encrypted",    no_argument,       NULL, 'e'},
                {"help",         no_argument,       NULL, 'h'},
-               {"md5",          no_argument,       NULL, 'm'},
                {"root",         required_argument, NULL, 'R'},
                {"sha-rounds",   required_argument, NULL, 's'},
                {NULL, 0, NULL, '\0'}
        };
-       while (-1 != (c = getopt_long(argc, argv, "c:ehmR:s:", long_options, NULL)))
+       while (-1 != (c = getopt_long(argc, argv, "c:ehR:s:", long_options, NULL)))
        {
                switch (c) {
                case 'c':
@@ -168,9 +163,6 @@ static void process_flags (int argc, char **argv, struct option_flags *flags)
                case 'h':
                        usage (E_SUCCESS);
                        /*@notreached@*/break;
-               case 'm':
-                       md5flg = true;
-                       break;
                case 'R': /* no-op, handled in process_root_flag () */
                        flags->chroot = true;
                        break;
@@ -231,10 +223,9 @@ static void check_flags (void)
                usage (E_USAGE);
        }
 
-       if ((eflg && (md5flg || cflg)) ||
-           (md5flg && cflg)) {
+       if (eflg && cflg) {
                fprintf (stderr,
-                        _("%s: the -c, -e, and -m flags are exclusive\n"),
+                        _("%s: the -c and -e flags are exclusive\n"),
                         Prog);
                usage (E_USAGE);
        }
@@ -425,9 +416,6 @@ int main (int argc, char **argv)
                        || !streq(crypt_method, "NONE"))) {
                        void *arg = NULL;
                        const char *salt;
-                       if (md5flg) {
-                               crypt_method = "MD5";
-                       }
                        if (sflg) {
                                if (   streq(crypt_method, "SHA256")
                                        || streq(crypt_method, "SHA512")) {
diff --git a/tests/crypt/login.defs_DES/12_chgpasswd-m.test b/tests/crypt/login.defs_DES/12_chgpasswd-m.test
deleted file mode 100755 (executable)
index f271cb0..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "Add a new user"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create user test1 (useradd test1)..."
-echo nogroup:test | chgpasswd -m
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl 12_chgpasswd-m/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl 12_chgpasswd-m/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl 12_chgpasswd-m/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl 12_chgpasswd-m/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/crypt/login.defs_DES/12_chgpasswd-m/group b/tests/crypt/login.defs_DES/12_chgpasswd-m/group
deleted file mode 100644 (file)
index 1012390..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
diff --git a/tests/crypt/login.defs_DES/12_chgpasswd-m/gshadow b/tests/crypt/login.defs_DES/12_chgpasswd-m/gshadow
deleted file mode 100644 (file)
index a709bcb..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:@PASS_MD5 test@::
-crontab:x::
-Debian-exim:x::
diff --git a/tests/crypt/login.defs_DES/12_chgpasswd-m/passwd b/tests/crypt/login.defs_DES/12_chgpasswd-m/passwd
deleted file mode 100644 (file)
index 43fc135..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
diff --git a/tests/crypt/login.defs_DES/12_chgpasswd-m/shadow b/tests/crypt/login.defs_DES/12_chgpasswd-m/shadow
deleted file mode 100644 (file)
index 5f50d18..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
index 46b49c3dc6664f2f269ce9d67e1bb06c8783e4ec..94fdba7cd9fc7eaaccc050cd31594388a9090726 100644 (file)
@@ -4,8 +4,6 @@ Options:
   -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
-  -m, --md5                     encrypt the clear text password using
-                                the MD5 algorithm
   -R, --root CHROOT_DIR         directory to chroot into
   -s, --sha-rounds              number of SHA rounds for the SHA*
                                 crypt algorithms
index e96d97c2f632351e2de2c9f6d57083e56484b0fa..5a1d3aea695ebfce0b4b1065af9c26bb927f2c19 100644 (file)
@@ -5,8 +5,6 @@ Options:
   -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
-  -m, --md5                     encrypt the clear text password using
-                                the MD5 algorithm
   -R, --root CHROOT_DIR         directory to chroot into
   -s, --sha-rounds              number of SHA rounds for the SHA*
                                 crypt algorithms
diff --git a/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/chgpasswd.test b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/chgpasswd.test
deleted file mode 100755 (executable)
index f6b96d5..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "chgpasswd checks that -e and -m are not provided at the same time"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Password are encrypted and must use md5 (chgpasswd -m -e)..."
-echo 'nobody:test' | chgpasswd -m -e 2>tmp/usage.out && exit 1 || {
-       status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "2"
-echo "OK"
-
-echo "chgpasswd reported:"
-echo "======================================================================="
-cat tmp/usage.out
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/usage.out tmp/usage.out
-echo "usage message OK."
-rm -f tmp/usage.out
-
-echo -n "Check the passwd file..."
-../../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config.txt b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config.txt
deleted file mode 100644 (file)
index 31f5635..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-# no testsuite password
-# root password: rootF00barbaz
-# myuser password: myuserF00barbaz
-
-user foo, in group users (only in /etc/group)
-user foo, in group tty (only in /etc/gshadow)
-user foo, in group floppy
-user foo, admin of group disk
-user foo, admin and member of group fax
-user foo, admin and member of group cdrom (only in /etc/gshadow)
diff --git a/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/default/useradd b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/default/useradd
deleted file mode 100644 (file)
index 31c44ab..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-# Default values for useradd(8)
-#
-# The SHELL variable specifies the default login shell on your
-# system.
-# Similar to DHSELL in adduser. However, we use "sh" here because
-# useradd is a low level utility and should be as general
-# as possible
-SHELL=/bin/foobar
-#
-# The default group for users
-# 100=users on Debian systems
-# Same as USERS_GID in adduser
-# This argument is used when the -n flag is specified.
-# The default behavior (when -n and -g are not specified) is to create a
-# primary user group with the same name as the user being added to the
-# system.
-GROUP=10
-#
-# The default home directory. Same as DHOME for adduser
-HOME=/tmp
-#
-# The number of days after a password expires until the account 
-# is permanently disabled
-INACTIVE=12
-#
-# The default expire date
-EXPIRE=2007-12-02
-#
-# The SKEL variable specifies the directory containing "skeletal" user
-# files; in other words, files such as a sample .profile that will be
-# copied to the new user's home directory when it is created.
-# SKEL=/etc/skel
-#
-# Defines whether the mail spool should be created while
-# creating the account
-# CREATE_MAIL_SPOOL=yes
diff --git a/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/group b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/group
deleted file mode 100644 (file)
index 1012390..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
diff --git a/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/gshadow b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/gshadow
deleted file mode 100644 (file)
index ae42486..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
diff --git a/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/passwd b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/passwd
deleted file mode 100644 (file)
index dbb06b8..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/nonexistent:/bin/sh
diff --git a/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/shadow b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/shadow
deleted file mode 100644 (file)
index 5f50d18..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
diff --git a/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/data/usage.out b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/data/usage.out
deleted file mode 100644 (file)
index d3a57b6..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-chgpasswd: the -c, -e, and -m flags are exclusive
-Usage: chgpasswd [options]
-
-Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
-  -e, --encrypted               supplied passwords are encrypted
-  -h, --help                    display this help message and exit
-  -m, --md5                     encrypt the clear text password using
-                                the MD5 algorithm
-  -R, --root CHROOT_DIR         directory to chroot into
-  -s, --sha-rounds              number of SHA rounds for the SHA*
-                                crypt algorithms
-
index d3a57b61ca1dc3959da25c7f4bcf15a0a99f8ed6..b9205b78e7817c0c9f34ed3cf52e3f146a8b8676 100644 (file)
@@ -1,12 +1,10 @@
-chgpasswd: the -c, -e, and -m flags are exclusive
+chgpasswd: the -c and -e flags are exclusive
 Usage: chgpasswd [options]
 
 Options:
   -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
-  -m, --md5                     encrypt the clear text password using
-                                the MD5 algorithm
   -R, --root CHROOT_DIR         directory to chroot into
   -s, --sha-rounds              number of SHA rounds for the SHA*
                                 crypt algorithms
diff --git a/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/chgpasswd.test b/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/chgpasswd.test
deleted file mode 100755 (executable)
index e83338f..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "chgpasswd checks that -c and -m are not provided at the same time"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Password must use md5 and another method (chgpasswd -m -c SHA256)..."
-echo 'nobody:test' | chgpasswd -m -c SHA256 2>tmp/usage.out && exit 1 || {
-       status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "2"
-echo "OK"
-
-echo "chgpasswd reported:"
-echo "======================================================================="
-cat tmp/usage.out
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/usage.out tmp/usage.out
-echo "usage message OK."
-rm -f tmp/usage.out
-
-echo -n "Check the passwd file..."
-../../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config.txt b/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config.txt
deleted file mode 100644 (file)
index 31f5635..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-# no testsuite password
-# root password: rootF00barbaz
-# myuser password: myuserF00barbaz
-
-user foo, in group users (only in /etc/group)
-user foo, in group tty (only in /etc/gshadow)
-user foo, in group floppy
-user foo, admin of group disk
-user foo, admin and member of group fax
-user foo, admin and member of group cdrom (only in /etc/gshadow)
diff --git a/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/default/useradd b/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/default/useradd
deleted file mode 100644 (file)
index 31c44ab..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-# Default values for useradd(8)
-#
-# The SHELL variable specifies the default login shell on your
-# system.
-# Similar to DHSELL in adduser. However, we use "sh" here because
-# useradd is a low level utility and should be as general
-# as possible
-SHELL=/bin/foobar
-#
-# The default group for users
-# 100=users on Debian systems
-# Same as USERS_GID in adduser
-# This argument is used when the -n flag is specified.
-# The default behavior (when -n and -g are not specified) is to create a
-# primary user group with the same name as the user being added to the
-# system.
-GROUP=10
-#
-# The default home directory. Same as DHOME for adduser
-HOME=/tmp
-#
-# The number of days after a password expires until the account 
-# is permanently disabled
-INACTIVE=12
-#
-# The default expire date
-EXPIRE=2007-12-02
-#
-# The SKEL variable specifies the directory containing "skeletal" user
-# files; in other words, files such as a sample .profile that will be
-# copied to the new user's home directory when it is created.
-# SKEL=/etc/skel
-#
-# Defines whether the mail spool should be created while
-# creating the account
-# CREATE_MAIL_SPOOL=yes
diff --git a/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/group b/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/group
deleted file mode 100644 (file)
index 1012390..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
diff --git a/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/gshadow b/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/gshadow
deleted file mode 100644 (file)
index ae42486..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
diff --git a/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/passwd b/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/passwd
deleted file mode 100644 (file)
index dbb06b8..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/nonexistent:/bin/sh
diff --git a/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/shadow b/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/shadow
deleted file mode 100644 (file)
index 5f50d18..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
diff --git a/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/data/usage.out b/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/data/usage.out
deleted file mode 100644 (file)
index d3a57b6..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-chgpasswd: the -c, -e, and -m flags are exclusive
-Usage: chgpasswd [options]
-
-Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
-  -e, --encrypted               supplied passwords are encrypted
-  -h, --help                    display this help message and exit
-  -m, --md5                     encrypt the clear text password using
-                                the MD5 algorithm
-  -R, --root CHROOT_DIR         directory to chroot into
-  -s, --sha-rounds              number of SHA rounds for the SHA*
-                                crypt algorithms
-
index 4bd98d4f2fef4ba2be849d049271adf7cfdde4ec..eac04c9d4d93da3251ebac7729c4a80e38fcfd50 100644 (file)
@@ -5,8 +5,6 @@ Options:
   -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
-  -m, --md5                     encrypt the clear text password using
-                                the MD5 algorithm
   -R, --root CHROOT_DIR         directory to chroot into
   -s, --sha-rounds              number of SHA rounds for the SHA*
                                 crypt algorithms
index 690a5025ae06af6cecfb05ef25b2e127eed3f9fc..4bc1e84d9693cd4b3ae5326570c3cc9b826b157a 100644 (file)
@@ -5,8 +5,6 @@ Options:
   -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
-  -m, --md5                     encrypt the clear text password using
-                                the MD5 algorithm
   -R, --root CHROOT_DIR         directory to chroot into
   -s, --sha-rounds              number of SHA rounds for the SHA*
                                 crypt algorithms
index a103cd59cd273560814ea021eb351fc0c4aa61b3..5d8aba385b4d552882bba0f56c83c97dcd480c91 100644 (file)
@@ -5,8 +5,6 @@ Options:
   -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
-  -m, --md5                     encrypt the clear text password using
-                                the MD5 algorithm
   -R, --root CHROOT_DIR         directory to chroot into
   -s, --sha-rounds              number of SHA rounds for the SHA*
                                 crypt algorithms
diff --git a/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/chgpasswd.test b/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/chgpasswd.test
deleted file mode 100755 (executable)
index 964d193..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "chgpasswd can use create md5 passwords"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Change nogroup and lp's password (chgpasswd --md5)..."
-echo 'nogroup:test
-lp:test2' | chgpasswd --md5
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../../common/compare_file.pl data/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/group b/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/group
deleted file mode 100644 (file)
index 1012390..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
diff --git a/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/gshadow b/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/gshadow
deleted file mode 100644 (file)
index ae42486..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
diff --git a/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/passwd b/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/passwd
deleted file mode 100644 (file)
index 43fc135..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
diff --git a/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/shadow b/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/shadow
deleted file mode 100644 (file)
index 5f50d18..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
diff --git a/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/data/gshadow b/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/data/gshadow
deleted file mode 100644 (file)
index eea258e..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:@PASS_MD5 test2@::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:@PASS_MD5 test@::
-crontab:x::
-Debian-exim:x::
index 5483a4de83eebe02cf64ce296368c33b15444521..7ab29d9fc294118358f78d8495d6c3282fb7e088 100755 (executable)
@@ -241,14 +241,11 @@ run_test ./grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/chgpasswd.test
 run_test ./grouptools/chgpasswd/05_chgpasswd_error_no_password/chgpasswd.test
 run_test ./grouptools/chgpasswd/06_chgpasswd_usage/chgpasswd.test
 run_test ./grouptools/chgpasswd/07_chgpasswd_usage_bad_option/chgpasswd.test
-run_test ./grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/chgpasswd.test
 run_test ./grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/chgpasswd.test
-run_test ./grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/chgpasswd.test
 run_test ./grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/chgpasswd.test
 run_test ./grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/chgpasswd.test
 run_test ./grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/chgpasswd.test
 run_test ./grouptools/chgpasswd/14_chgpasswd_password_encrypted/chgpasswd.test
-run_test ./grouptools/chgpasswd/15_chgpasswd_password_md5/chgpasswd.test
 run_test ./grouptools/chgpasswd/16_chgpasswd_password_NONE/chgpasswd.test
 run_test ./grouptools/chgpasswd/17_chgpasswd_password_MD5/chgpasswd.test
 run_test ./grouptools/chgpasswd/18_chgpasswd_password_DES/chgpasswd.test
@@ -914,7 +911,6 @@ run_test ./crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5.test
 run_test ./crypt/login.defs_DES/09_chgpasswd--crypt-method-DES.test
 run_test ./crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE.test
 run_test ./crypt/login.defs_DES/11_chgpasswd-e.test
-run_test ./crypt/login.defs_DES/12_chgpasswd-m.test
 if [ "$USE_PAM" != "yes" ]; then
        run_test ./crypt/login.defs_MD5/01_chpasswd.test
 fi
index 081e5049db559fdca12818b248568be425aa44e0..e5e9a6bcd2bc473614d30de7f2c2be9cdc276549 100755 (executable)
@@ -257,14 +257,11 @@ run_test ./grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/chgpasswd.test
 run_test ./grouptools/chgpasswd/05_chgpasswd_error_no_password/chgpasswd.test
 run_test ./grouptools/chgpasswd/06_chgpasswd_usage/chgpasswd.test
 run_test ./grouptools/chgpasswd/07_chgpasswd_usage_bad_option/chgpasswd.test
-run_test ./grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/chgpasswd.test
 run_test ./grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/chgpasswd.test
-run_test ./grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/chgpasswd.test
 run_test ./grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/chgpasswd.test
 run_test ./grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/chgpasswd.test
 run_test ./grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/chgpasswd.test
 run_test ./grouptools/chgpasswd/14_chgpasswd_password_encrypted/chgpasswd.test
-run_test ./grouptools/chgpasswd/15_chgpasswd_password_md5/chgpasswd.test
 run_test ./grouptools/chgpasswd/16_chgpasswd_password_NONE/chgpasswd.test
 run_test ./grouptools/chgpasswd/17_chgpasswd_password_MD5/chgpasswd.test
 run_test ./grouptools/chgpasswd/18_chgpasswd_password_DES/chgpasswd.test
@@ -930,7 +927,6 @@ run_test ./crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5.test
 run_test ./crypt/login.defs_DES/09_chgpasswd--crypt-method-DES.test
 run_test ./crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE.test
 run_test ./crypt/login.defs_DES/11_chgpasswd-e.test
-run_test ./crypt/login.defs_DES/12_chgpasswd-m.test
 if [ "$USE_PAM" != "yes" ]; then
        run_test ./crypt/login.defs_MD5/01_chpasswd.test
 fi