]> git.ipfire.org Git - thirdparty/shadow.git/commitdiff
*/: Remove support for MD5
authorAlejandro Colomar <alx@kernel.org>
Sat, 27 Dec 2025 13:25:29 +0000 (14:25 +0100)
committerSerge Hallyn <serge@hallyn.com>
Sun, 19 Jul 2026 14:35:56 +0000 (09:35 -0500)
Signed-off-by: Alejandro Colomar <alx@kernel.org>
147 files changed:
etc/login.defs
lib/chkhash.c
lib/obscure.c
lib/salt.c
man/chgpasswd.8.xml
man/chpasswd.8.xml
man/login.defs.d/ENCRYPT_METHOD.xml
man/newusers.8.xml
src/chgpasswd.c
src/chpasswd.c
src/newusers.c
tests/chroot/chage/01_chage--root/config_chroot/etc/login.defs
tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/login.defs
tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/login.defs
tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/login.defs
tests/chroot/chsh/01_chsh--root/config_chroot/etc/login.defs
tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/login.defs
tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/login.defs
tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/login.defs
tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/login.defs
tests/chroot/grpck/01_grpck--root/config_chroot/etc/login.defs
tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/login.defs
tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/login.defs
tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/login.defs
tests/chroot/pwck/01_pwck--root/config_chroot/etc/login.defs
tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/login.defs
tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/login.defs
tests/chroot/useradd/01_useradd--root/config_chroot/etc/login.defs
tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/login.defs
tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/login.defs
tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/login.defs
tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/login.defs
tests/chroot/userdel/01_userdel--root/config_chroot/etc/login.defs
tests/chroot/usermod/01_usermod--root/config_chroot/etc/login.defs
tests/crypt/login.defs_MD5/01_chpasswd.test [deleted file]
tests/crypt/login.defs_MD5/01_chpasswd/group [deleted file]
tests/crypt/login.defs_MD5/01_chpasswd/gshadow [deleted file]
tests/crypt/login.defs_MD5/01_chpasswd/passwd [deleted file]
tests/crypt/login.defs_MD5/01_chpasswd/shadow [deleted file]
tests/crypt/login.defs_MD5/02_chgpasswd.test [deleted file]
tests/crypt/login.defs_MD5/02_chgpasswd/group [deleted file]
tests/crypt/login.defs_MD5/02_chgpasswd/gshadow [deleted file]
tests/crypt/login.defs_MD5/02_chgpasswd/passwd [deleted file]
tests/crypt/login.defs_MD5/02_chgpasswd/shadow [deleted file]
tests/crypt/login.defs_MD5/config/etc/group [deleted file]
tests/crypt/login.defs_MD5/config/etc/gshadow [deleted file]
tests/crypt/login.defs_MD5/config/etc/login.defs [deleted file]
tests/crypt/login.defs_MD5/config/etc/passwd [deleted file]
tests/crypt/login.defs_MD5/config/etc/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/09_chgpasswd_usage-e-c_exclusive/data/usage.out
tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/chgpasswd.test
tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/data/usage.out
tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/chgpasswd.test
tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/data/usage.out
tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/chgpasswd.test
tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/data/usage.out
tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/chgpasswd.test [deleted file]
tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/group [deleted file]
tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/gshadow [deleted file]
tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/passwd [deleted file]
tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/shadow [deleted file]
tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/data/gshadow [deleted file]
tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/login.defs
tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/login.defs
tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/login.defs
tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/login.defs
tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/login.defs
tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/login.defs
tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/login.defs
tests/newgidmap/01_newgidmap/config/etc/login.defs
tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/login.defs
tests/newuidmap/01_newuidmap/config/etc/login.defs
tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/login.defs
tests/newusers/37_create_user_encrypt_MD5-PAM/config.txt [deleted file]
tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/group [deleted file]
tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/gshadow [deleted file]
tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/common-password [deleted file]
tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/newusers [deleted file]
tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/passwd [deleted file]
tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/shadow [deleted file]
tests/newusers/37_create_user_encrypt_MD5-PAM/data/group [deleted file]
tests/newusers/37_create_user_encrypt_MD5-PAM/data/gshadow [deleted file]
tests/newusers/37_create_user_encrypt_MD5-PAM/data/newusers.list [deleted file]
tests/newusers/37_create_user_encrypt_MD5-PAM/data/passwd [deleted file]
tests/newusers/37_create_user_encrypt_MD5-PAM/data/shadow [deleted file]
tests/newusers/37_create_user_encrypt_MD5-PAM/newusers.test [deleted file]
tests/newusers/37_create_user_encrypt_MD5/config.txt [deleted file]
tests/newusers/37_create_user_encrypt_MD5/config/etc/group [deleted file]
tests/newusers/37_create_user_encrypt_MD5/config/etc/gshadow [deleted file]
tests/newusers/37_create_user_encrypt_MD5/config/etc/passwd [deleted file]
tests/newusers/37_create_user_encrypt_MD5/config/etc/shadow [deleted file]
tests/newusers/37_create_user_encrypt_MD5/data/group [deleted file]
tests/newusers/37_create_user_encrypt_MD5/data/gshadow [deleted file]
tests/newusers/37_create_user_encrypt_MD5/data/newusers.list [deleted file]
tests/newusers/37_create_user_encrypt_MD5/data/passwd [deleted file]
tests/newusers/37_create_user_encrypt_MD5/data/shadow [deleted file]
tests/newusers/37_create_user_encrypt_MD5/newusers.test [deleted file]
tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.err
tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config.txt [deleted file]
tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/group [deleted file]
tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/gshadow [deleted file]
tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/passwd [deleted file]
tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/shadow [deleted file]
tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/group [deleted file]
tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/gshadow [deleted file]
tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/newusers.list [deleted file]
tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/passwd [deleted file]
tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/shadow [deleted file]
tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test [deleted file]
tests/newusers/62_create_user_no_aging/config/etc/login.defs
tests/run_all
tests/run_all.coverage
tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/login.defs
tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/login.defs
tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/login.defs
tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/login.defs
tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/login.defs
tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/login.defs
tests/subids/18_useradd_min=max/config/etc/login.defs
tests/system/etc/login.defs
tests/unit/test_chkhash.c
tests/usertools/chpasswd-PAM/06_chpasswd_usage/data/usage.out
tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/data/usage.out
tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/data/usage.out
tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/chpasswd.test
tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/data/usage.out
tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/chpasswd.test
tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/data/usage.out
tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/chpasswd.test
tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/data/usage.out
tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/chpasswd.test [deleted file]
tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/group [deleted file]
tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/gshadow [deleted file]
tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/chpasswd [deleted file]
tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/common-password [deleted file]
tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/passwd [deleted file]
tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/shadow [deleted file]
tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/data/shadow [deleted file]
tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/login.defs
tests/usertools/userdel/06_userdel_no_usergroup/config/etc/login.defs
tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/login.defs
tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/login.defs
tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/login.defs
tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/login.defs
tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/login.defs

index 9f9cf8aac9d4c8e19b73ba52cf0875714b151040..c052d5b7f0fc557fc055ca65b068b80bb5b7bdb3 100644 (file)
@@ -355,12 +355,10 @@ CHFN_RESTRICT             rwh
 
 #
 # Only works if compiled with ENCRYPTMETHOD_SELECT defined:
-# If set to MD5, MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 # If set to BCRYPT, BCRYPT-based algorithm will be used for encrypting password
 # If set to YESCRYPT, YESCRYPT-based algorithm will be used for encrypting password
-# MD5 should not be used for new hashes, see crypt(5) for recommendations.
 #
 # Note: if you use PAM, it is recommended to use a value consistent with
 # the PAM modules configuration.
index de17d2db165888243bcdc62a698e4e7912e0bbb4..28d73854dbf00969d40306f66c5d0c62b984eda9 100644 (file)
@@ -69,10 +69,6 @@ is_valid_hash(const char *hash)
        if (match_regex("^\\$5\\$(rounds=[1-9][0-9]{3,8}\\$)?[^$:\n]{1,16}\\$[./A-Za-z0-9]{43}$", hash))
                return true;
 
-       // MD5: $1$ + salt + $ + 22-char hash
-       if (match_regex("^\\$1\\$[^$:\n]{1,8}\\$[./A-Za-z0-9]{22}$", hash))
-               return true;
-
        // Not a valid hash
        return false;
 }
index 4fd983c8adcdc61803db80c698f830319ab70bd0..93a04af926807c9c3147e9a5efd7a1d1def05bac 100644 (file)
@@ -56,7 +56,7 @@ static bool similar (/*@notnull@*/const char *old, /*@notnull@*/const char *new)
 
        /*
         * XXX - sometimes this fails when changing from a simple password
-        * to a really long one (MD5).  For now, I just return success if
+        * to a really long one.  For now, I just return success if
         * the new password is long enough.  Please feel free to suggest
         * something better...  --marekm
         */
index 1f2560b9f7daedf40eed7374b04466de138a8d89..f80a9911f91af663ee084bd81fa1d1613be35327 100644 (file)
@@ -78,9 +78,6 @@
 #define Y_COST_MAX 11
 #endif
 
-/* Fixed salt len for md5crypt. */
-#define MD5_CRYPT_SALT_SIZE 8
-
 /* Generate salt of size salt_size. */
 #define MAX_SALT_SIZE 44
 #define MIN_SALT_SIZE 8
@@ -358,10 +355,11 @@ static /*@observer@*/const char *gensalt (size_t salt_size)
 
        method = meth ?: getdef_str("ENCRYPT_METHOD") ?: "SHA512";
 
-       if (streq(method, "MD5")) {
-               MAGNUM(result, '1');
-               salt_len = MD5_CRYPT_SALT_SIZE;
-               rounds = 0;
+       if (streq(method, "SHA256")) {
+               MAGNUM(result, '5');
+               salt_len = SHA_CRYPT_SALT_SIZE;
+               rounds = SHA_get_salt_rounds (arg);
+               SHA_salt_rounds_to_buf (result, rounds);
 #ifdef USE_BCRYPT
        } else if (streq(method, "BCRYPT")) {
                BCRYPTMAGNUM(result);
@@ -376,11 +374,6 @@ static /*@observer@*/const char *gensalt (size_t salt_size)
                rounds = YESCRYPT_get_salt_cost (arg);
                YESCRYPT_salt_cost_to_buf (result, rounds);
 #endif /* USE_YESCRYPT */
-       } else if (streq(method, "SHA256")) {
-               MAGNUM(result, '5');
-               salt_len = SHA_CRYPT_SALT_SIZE;
-               rounds = SHA_get_salt_rounds (arg);
-               SHA_salt_rounds_to_buf (result, rounds);
        } else if (streq(method, "SHA512")) {
 sha512:
                MAGNUM(result, '6');
index f7461ce897d388744517b7984d882c69123b2be4..81d8985f9d6e97e37f33d644806aff4f934352e6 100644 (file)
@@ -92,7 +92,6 @@
          <para>
            The available methods are <phrase condition="bcrypt">
            <replaceable>BCRYPT</replaceable>,</phrase>
-           <replaceable>MD5</replaceable>,
            <replaceable>SHA256</replaceable>,
            <replaceable>SHA512</replaceable>,
            <phrase condition="yescrypt">
index fc65ec59499dc072a49f56e41c673f13f859c4f5..80d8ce594b6a9d657c92c2abc003ac23f838ecd2 100644 (file)
          <para>
            The available methods are <phrase condition="bcrypt">
            <replaceable>BCRYPT</replaceable>,</phrase>
-           <replaceable>MD5</replaceable>,
            <replaceable>SHA256</replaceable>,
            <replaceable>SHA512</replaceable>,
            <phrase condition="yescrypt">
index 9455c9b682ccc34ba0f166e36cbf9a9427e901d2..747b24f552b73de0998c326155be1a48121eddeb 100644 (file)
     <para>
       It can take one of these values: <phrase condition="bcrypt">
       <replaceable>BCRYPT</replaceable>,</phrase>
-      <replaceable>MD5</replaceable>,
       <replaceable>SHA256</replaceable>,
       <replaceable>SHA512</replaceable> (default),
       <phrase condition="yescrypt">
       <replaceable>YESCRYPT</replaceable></phrase>.
-      MD5 should not be used for new hashes, see
+      See
       <refentrytitle>crypt</refentrytitle><manvolnum>5</manvolnum>
       for recommendations.
     </para>
index 3d480d2ed19ac4647e0a60c6809b2080744b492e..59f868226f87b486016d306aeeae02d674a16045 100644 (file)
        <listitem>
          <para>Use the specified method to encrypt the passwords.</para>
          <para>
-           The available methods are MD5, NONE, and SHA256 or SHA512
+           The available methods are NONE, and SHA256 or SHA512
            if your libc support these methods.
          </para>
        </listitem>
index fbd9e01808520f523ead39bbb04ac04fdd5b6b7b..ea8cdd2a5bafee7f5e817d1a4b88be9042064cba 100644 (file)
@@ -115,8 +115,7 @@ usage (int status)
                        Prog);
        (void) fprintf (usageout,
                        _("  -c, --crypt-method METHOD     the crypt method (one of %s)\n"),
-                       "NONE MD5"
-                       " SHA256 SHA512"
+                       "NONE SHA256 SHA512"
 #if defined(USE_BCRYPT)
                        " BCRYPT"
 #endif
@@ -232,8 +231,7 @@ static void check_flags (void)
        }
 
        if (cflg) {
-               if (   !streq(crypt_method, "MD5")
-                   && !streq(crypt_method, "NONE")
+               if (   !streq(crypt_method, "NONE")
                    && !streq(crypt_method, "SHA256")
                    && !streq(crypt_method, "SHA512")
 #ifdef USE_BCRYPT
index db8ea0b0a5db2875e1e3bfd34128a759f67ce456..5c0cbdf3a50db3bb5616485f243e1bff519d27b3 100644 (file)
@@ -117,8 +117,7 @@ usage (int status)
                        Prog);
        (void) fprintf (usageout,
                        _("  -c, --crypt-method METHOD     the crypt method (one of %s)\n"),
-                       "NONE MD5"
-                       " SHA256 SHA512"
+                       "NONE SHA256 SHA512"
 #if defined(USE_BCRYPT)
                        " BCRYPT"
 #endif
@@ -233,8 +232,7 @@ static void check_flags (void)
        }
 
        if (cflg) {
-               if (!IS_CRYPT_METHOD("MD5")
-                   &&(!IS_CRYPT_METHOD("NONE"))
+               if (!IS_CRYPT_METHOD("NONE")
                    &&(!IS_CRYPT_METHOD("SHA256"))
                    &&(!IS_CRYPT_METHOD("SHA512"))
 #ifdef USE_BCRYPT
index fa6870112de4b2df29619803f30818842d47665a..094f26cd74575a5def38a5e061166572be36e4d8 100644 (file)
@@ -132,8 +132,7 @@ static void usage (int status)
 #ifndef USE_PAM
        (void) fprintf (usageout,
                        _("  -c, --crypt-method METHOD     the crypt method (one of %s)\n"),
-                       "NONE MD5"
-                       " SHA256 SHA512"
+                       "NONE SHA256 SHA512"
 #if defined(USE_BCRYPT)
                        " BCRYPT"
 #endif
@@ -735,8 +734,7 @@ static void check_flags (void)
        }
 
        if (cflg) {
-               if (   !streq(crypt_method, "MD5")
-                   && !streq(crypt_method, "NONE")
+               if (   !streq(crypt_method, "NONE")
                    && !streq(crypt_method, "SHA256")
                    && !streq(crypt_method, "SHA512")
 #ifdef USE_BCRYPT
index 9915a159cc3b96941838cf2840fcb82f5a167d7f..06434ebe2f4d508203189ade4d605e59633f8474 100644 (file)
@@ -250,7 +250,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index fb945b4f4a14cd6011fdb45e12fbf50a031cc22b..13b24c768ba7ed1b0bdf72e8d68b8e233e974572 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
diff --git a/tests/crypt/login.defs_MD5/01_chpasswd.test b/tests/crypt/login.defs_MD5/01_chpasswd.test
deleted file mode 100755 (executable)
index d583517..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 nobody:test | chpasswd
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl 01_chpasswd/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl 01_chpasswd/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl 01_chpasswd/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl 01_chpasswd/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/crypt/login.defs_MD5/01_chpasswd/group b/tests/crypt/login.defs_MD5/01_chpasswd/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_MD5/01_chpasswd/gshadow b/tests/crypt/login.defs_MD5/01_chpasswd/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/crypt/login.defs_MD5/01_chpasswd/passwd b/tests/crypt/login.defs_MD5/01_chpasswd/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_MD5/01_chpasswd/shadow b/tests/crypt/login.defs_MD5/01_chpasswd/shadow
deleted file mode 100644 (file)
index 658661b..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:@PASS_MD5 test@:@TODAY@:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
diff --git a/tests/crypt/login.defs_MD5/02_chgpasswd.test b/tests/crypt/login.defs_MD5/02_chgpasswd.test
deleted file mode 100755 (executable)
index c102e89..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "Change a group password"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "echo nogroup:test | chgpasswd..."
-echo nogroup:test | chgpasswd
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl 02_chgpasswd/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl 02_chgpasswd/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl 02_chgpasswd/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/crypt/login.defs_MD5/02_chgpasswd/group b/tests/crypt/login.defs_MD5/02_chgpasswd/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_MD5/02_chgpasswd/gshadow b/tests/crypt/login.defs_MD5/02_chgpasswd/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_MD5/02_chgpasswd/passwd b/tests/crypt/login.defs_MD5/02_chgpasswd/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_MD5/02_chgpasswd/shadow b/tests/crypt/login.defs_MD5/02_chgpasswd/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/crypt/login.defs_MD5/config/etc/group b/tests/crypt/login.defs_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/crypt/login.defs_MD5/config/etc/gshadow b/tests/crypt/login.defs_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/crypt/login.defs_MD5/config/etc/login.defs b/tests/crypt/login.defs_MD5/config/etc/login.defs
deleted file mode 100644 (file)
index 04a8042..0000000
+++ /dev/null
@@ -1,303 +0,0 @@
-#
-# /etc/login.defs - Configuration control definitions for the login package.
-#
-# Three items must be defined:  MAIL_DIR, ENV_SUPATH, and ENV_PATH.
-# If unspecified, some arbitrary (and possibly incorrect) value will
-# be assumed.  All other items are optional - if not specified then
-# the described action or option will be inhibited.
-#
-# Comment lines (lines beginning with "#") and blank lines are ignored.
-#
-# Modified for Linux.  --marekm
-
-# REQUIRED for useradd/userdel/usermod
-#   Directory where mailboxes reside, _or_ name of file, relative to the
-#   home directory.  If you _do_ define MAIL_DIR and MAIL_FILE,
-#   MAIL_DIR takes precedence.
-#
-#   Essentially:
-#      - MAIL_DIR defines the location of users mail spool files
-#        (for mbox use) by appending the username to MAIL_DIR as defined
-#        below.
-#      - MAIL_FILE defines the location of the users mail spool files as the
-#        fully-qualified filename obtained by prepending the user home
-#        directory before $MAIL_FILE
-#
-# NOTE: This is no more used for setting up users MAIL environment variable
-#       which is, starting from shadow 4.0.12-1 in Debian, entirely the
-#       job of the pam_mail PAM modules
-#       See default PAM configuration files provided for
-#       login, su, etc.
-#
-# This is a temporary situation: setting these variables will soon
-# move to /etc/default/useradd and the variables will then be
-# no more supported
-MAIL_DIR        /var/mail
-#MAIL_FILE      .mail
-
-#
-# Enable logging and display of /var/log/faillog login failure info.
-# This option conflicts with the pam_tally PAM module.
-#
-FAILLOG_ENAB           yes
-
-#
-# Enable display of unknown usernames when login failures are recorded.
-#
-# WARNING: Unknown usernames may become world readable. 
-# See #290803 and #298773 for details about how this could become a security
-# concern
-LOG_UNKFAIL_ENAB       no
-
-#
-# Enable logging of successful logins
-#
-LOG_OK_LOGINS          no
-
-#
-# Enable "syslog" logging of su activity - in addition to sulog file logging.
-# SYSLOG_SG_ENAB does the same for newgrp and sg.
-#
-SYSLOG_SU_ENAB         yes
-SYSLOG_SG_ENAB         yes
-
-#
-# If defined, all su activity is logged to this file.
-#
-#SULOG_FILE    /var/log/sulog
-
-#
-# If defined, file which maps tty line to TERM environment parameter.
-# Each line of the file is in a format something like "vt100  tty01".
-#
-#TTYTYPE_FILE  /etc/ttytype
-
-#
-# If defined, login failures will be logged here in a utmp format
-# last, when invoked as lastb, will read /var/log/btmp, so...
-#
-FTMP_FILE      /var/log/btmp
-
-#
-# If defined, the command name to display when running "su -".  For
-# example, if this is defined as "su" then a "ps" will display the
-# command is "-su".  If not defined, then "ps" would display the
-# name of the shell actually being run, e.g. something like "-sh".
-#
-SU_NAME                su
-
-#
-# If defined, file which inhibits all the usual chatter during the login
-# sequence.  If a full pathname, then hushed mode will be enabled if the
-# user's name or shell are found in the file.  If not a full pathname, then
-# hushed mode will be enabled if the file exists in the user's home directory.
-#
-HUSHLOGIN_FILE .hushlogin
-#HUSHLOGIN_FILE        /etc/hushlogins
-
-#
-# *REQUIRED*  The default PATH settings, for superuser and normal users.
-#
-# (they are minimal, add the rest in the shell startup files)
-ENV_SUPATH     PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV_PATH       PATH=/usr/local/bin:/usr/bin:/bin:/usr/games
-
-#
-# Terminal permissions
-#
-#      TTYGROUP        Login tty will be assigned this group ownership.
-#      TTYPERM         Login tty will be set to this permission.
-#
-# If you have a "write" program which is "setgid" to a special group
-# which owns the terminals, define TTYGROUP to the group number and
-# TTYPERM to 0620.  Otherwise leave TTYGROUP commented out and assign
-# TTYPERM to either 622 or 600.
-#
-# In Debian /usr/bin/bsd-write or similar programs are setgid tty
-# However, the default and recommended value for TTYPERM is still 0600
-# to not allow anyone to write to anyone else console or terminal
-
-# Users can still allow other people to write them by issuing 
-# the "mesg y" command.
-
-TTYGROUP       tty
-TTYPERM                0600
-
-#
-# Login configuration initializations:
-#
-#      ERASECHAR       Terminal ERASE character ('\010' = backspace).
-#      KILLCHAR        Terminal KILL character ('\025' = CTRL/U).
-#      UMASK           Default "umask" value.
-#
-# The ERASECHAR and KILLCHAR are used only on System V machines.
-# 
-# UMASK usage is discouraged because it catches only some classes of user
-# entries to system, in fact only those made through login(1), while setting
-# umask in shell rc file will catch also logins through su, cron, ssh etc.
-#
-# At the same time, using shell rc to set umask won't catch entries which use
-# non-shell executables in place of login shell, like /usr/sbin/pppd for "ppp"
-# user and alike.
-#
-# Therefore the use of pam_umask is recommended (Debian package libpam-umask)
-# as the solution which catches all these cases on PAM-enabled systems.
-# 
-# This avoids the confusion created by having the umask set
-# in two different places -- in login.defs and shell rc files (i.e.
-# /etc/profile).
-#
-# For discussion, see #314539 and #248150 as well as the thread starting at
-# http://lists.debian.org/debian-devel/2005/06/msg01598.html
-#
-# Prefix these values with "0" to get octal, "0x" to get hexadecimal.
-#
-ERASECHAR      0177
-KILLCHAR       025
-# 022 is the "historical" value in Debian for UMASK when it was used
-# 027, or even 077, could be considered better for privacy
-# There is no One True Answer here : each sysadmin must make up their
-# mind.
-#UMASK         022
-
-#
-# Password aging controls:
-#
-#      PASS_MAX_DAYS   Maximum number of days a password may be used.
-#      PASS_WARN_AGE   Number of days warning given before a password expires.
-#
-PASS_MAX_DAYS  99999
-PASS_WARN_AGE  7
-
-#
-# Min/max values for automatic uid selection in useradd
-#
-UID_MIN                         1000
-UID_MAX                        60000
-
-#
-# Min/max values for automatic gid selection in groupadd
-#
-GID_MIN                          100
-GID_MAX                        60000
-
-#
-# Max number of login retries if password is bad. This will most likely be
-# overridden by PAM, since the default pam_unix module has it's own built
-# in of 3 retries. However, this is a safe fallback in case you are using
-# an authentication module that does not enforce PAM_MAXTRIES.
-#
-LOGIN_RETRIES          5
-
-#
-# Max time in seconds for login
-#
-LOGIN_TIMEOUT          60
-
-#
-# Which fields may be changed by regular users using chfn - use
-# any combination of letters "frwh" (full name, room number, work
-# phone, home phone).  If not defined, no changes are allowed.
-# For backward compatibility, "yes" = "rwh" and "no" = "frwh".
-# 
-CHFN_RESTRICT          rwh
-
-#
-# Should login be allowed if we can't cd to the home directory?
-# Default is no.
-#
-DEFAULT_HOME   yes
-
-#
-# If defined, this command is run when removing a user.
-# It should remove any at/cron/print jobs etc. owned by
-# the user to be removed (passed as the first argument).
-#
-#USERDEL_CMD   /usr/sbin/userdel_local
-
-#
-# This enables userdel to remove user groups if no members exist.
-#
-# Other former uses of this variable such as setting the umask when
-# user==primary group are not used in PAM environments, thus in Debian
-#
-USERGROUPS_ENAB yes
-
-#
-# Instead of the real user shell, the program specified by this parameter
-# will be launched, although its visible name (argv[0]) will be the shell's.
-# The program may do whatever it wants (logging, additional authentification,
-# banner, ...) before running the actual shell.
-#
-# FAKE_SHELL /bin/fakeshell
-
-#
-# If defined, either full pathname of a file containing device names or
-# a ":" delimited list of device names.  Root logins will be allowed only
-# upon these devices.
-#
-# This variable is used by login and su.
-#
-#CONSOLE       /etc/consoles
-#CONSOLE       console:tty01:tty02:tty03:tty04
-
-#
-# List of groups to add to the user's supplementary group set
-# when logging in on the console (as determined by the CONSOLE
-# setting).  Default is none.
-#
-# Use with caution - it is possible for users to gain permanent
-# access to these groups, even when not logged in on the console.
-# How to do it is left as an exercise for the reader...
-#
-# This variable is used by login and su.
-#
-#CONSOLE_GROUPS                floppy:audio:cdrom
-
-ENCRYPT_METHOD MD5
-#SHA_CRYPT_MIN_ROUNDS 5000
-#SHA_CRYPT_MAX_ROUNDS 5000
-
-################# OBSOLETED BY PAM ##############
-#                                              #
-# These options are now handled by PAM. Please #
-# edit the appropriate file in /etc/pam.d/ to  #
-# enable the equivalents of them.
-#
-###############
-
-#MOTD_FILE
-#DIALUPS_CHECK_ENAB
-#LASTLOG_ENAB
-#MAIL_CHECK_ENAB
-#OBSCURE_CHECKS_ENAB
-#PORTTIME_CHECKS_ENAB
-#SU_WHEEL_ONLY
-#PASS_CHANGE_TRIES
-#PASS_ALWAYS_WARN
-#ENVIRON_FILE
-#NOLOGINS_FILE
-#ISSUE_FILE
-#PASS_MIN_LEN
-#ULIMIT
-#ENV_HZ
-#CHFN_AUTH
-#CHSH_AUTH
-#FAIL_DELAY
-
-################# OBSOLETED #######################
-#                                                #
-# These options are no more handled by shadow.    #
-#                                                 #
-# Shadow utilities will display a warning if they #
-# still appear.                                   #
-#                                                 #
-###################################################
-
-# CLOSE_SESSIONS
-# LOGIN_STRING
-# NO_PASSWORD_CONSOLE
-# QMAIL_DIR
-
-
-
diff --git a/tests/crypt/login.defs_MD5/config/etc/passwd b/tests/crypt/login.defs_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/crypt/login.defs_MD5/config/etc/shadow b/tests/crypt/login.defs_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:::
index 96e611048c4fc74d1f763c175020a4aabd17d8cb..39a057ef52f591b5b01e4bc4f6c9c38da40ce2b3 100644 (file)
@@ -1,7 +1,7 @@
 Usage: chgpasswd [options]
 
 Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -R, --root CHROOT_DIR         directory to chroot into
index 2f881b5d61c229d8400d645e9fdd76e75908512a..70407c1db7e0c2823e6cfc71c96733d46d43bf8b 100644 (file)
@@ -2,7 +2,7 @@ chgpasswd: unrecognized option '--foo'
 Usage: chgpasswd [options]
 
 Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -R, --root CHROOT_DIR         directory to chroot into
index 43057afdebe1ef1b065d732bb74c76315b70ef95..972a3a2bd73263cdf0987cb5f14c45b2d09096eb 100644 (file)
@@ -2,7 +2,7 @@ chgpasswd: the -c and -e flags are exclusive
 Usage: chgpasswd [options]
 
 Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -R, --root CHROOT_DIR         directory to chroot into
index 293e93253dce476371b8e6d2c45f03786063a145..81fc7f8f849f6628369f44926e2eeae91ce0f5da 100755 (executable)
@@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0
 
 change_config
 
-echo -n "Password must use md5 and another method (chgpasswd --sha-rounds 12)..."
+echo -n "Password hashing method (chgpasswd --sha-rounds 12)..."
 echo 'nobody:test' | chgpasswd --sha-rounds 12 2>tmp/usage.out && exit 1 || {
        status=$?
 }
index 3074d9fd3b9520f5b043c907fabd5ba78b425dbd..f74595df0214abd4ef406b56d7641cdf6e4f470b 100644 (file)
@@ -2,7 +2,7 @@ chgpasswd: -s flag is only allowed with the -c flag
 Usage: chgpasswd [options]
 
 Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -R, --root CHROOT_DIR         directory to chroot into
index ebfcde6b5fbb24602e6b697cb4d02705c1d8284f..a447f60179103a65593ddf57b46825888ab3689d 100755 (executable)
@@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0
 
 change_config
 
-echo -n "Password must use md5 and another method (chgpasswd --sha-rounds 12foo -c SHA512)..."
+echo -n "Password hashing method (chgpasswd --sha-rounds 12foo -c SHA512)..."
 echo 'nobody:test' | chgpasswd --sha-rounds 12foo -c SHA512 2>tmp/usage.out && exit 1 || {
        status=$?
 }
index d8722d46a615b466aa724de087ff37427447d95e..b25b65cabb64c2b348ae60f2c0e8509af91e2423 100644 (file)
@@ -2,7 +2,7 @@ chgpasswd: invalid numeric argument '12foo'
 Usage: chgpasswd [options]
 
 Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -R, --root CHROOT_DIR         directory to chroot into
index 8cff29b2e9cf971afbd6554309c20a03e15d793d..3312b8b2ada2b0eb6c677105d75b3f7fe024ceb7 100755 (executable)
@@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0
 
 change_config
 
-echo -n "Password must use md5 and another method (chgpasswd --crypt-method SHA513)..."
+echo -n "Password hashing method (chgpasswd --crypt-method SHA513)..."
 echo 'nobody:test' | chgpasswd --crypt-method SHA513 2>tmp/usage.out && exit 1 || {
        status=$?
 }
index d03539c2a6c29af069b301dc86436cb6ff3dc38e..e44197be31b602a55973978d89a9bbe037850796 100644 (file)
@@ -2,7 +2,7 @@ chgpasswd: unsupported crypt method: SHA513
 Usage: chgpasswd [options]
 
 Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -R, --root CHROOT_DIR         directory to chroot into
diff --git a/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/chgpasswd.test b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/chgpasswd.test
deleted file mode 100755 (executable)
index 920589b..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 --crypt-method MD5)..."
-echo 'nogroup:test
-lp:test2' | chgpasswd --crypt-method 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/17_chgpasswd_password_MD5/config/etc/group b/tests/grouptools/chgpasswd/17_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/17_chgpasswd_password_MD5/config/etc/gshadow b/tests/grouptools/chgpasswd/17_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/17_chgpasswd_password_MD5/config/etc/passwd b/tests/grouptools/chgpasswd/17_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/17_chgpasswd_password_MD5/config/etc/shadow b/tests/grouptools/chgpasswd/17_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/17_chgpasswd_password_MD5/data/gshadow b/tests/grouptools/chgpasswd/17_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 3813c52ba66dcf9bdc5487a3b6deb8b5c055fe29..e615b80712dc0859af3c12d6a582705a8b00e168 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index 3813c52ba66dcf9bdc5487a3b6deb8b5c055fe29..e615b80712dc0859af3c12d6a582705a8b00e168 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index 3813c52ba66dcf9bdc5487a3b6deb8b5c055fe29..e615b80712dc0859af3c12d6a582705a8b00e168 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index 3813c52ba66dcf9bdc5487a3b6deb8b5c055fe29..e615b80712dc0859af3c12d6a582705a8b00e168 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index 3813c52ba66dcf9bdc5487a3b6deb8b5c055fe29..e615b80712dc0859af3c12d6a582705a8b00e168 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index 051927890d1d28b8fed32d8fee379f7290cf38ca..02de2860ce896f46ebf585526b26b5bbba0123ae 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index 051927890d1d28b8fed32d8fee379f7290cf38ca..02de2860ce896f46ebf585526b26b5bbba0123ae 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index d6e5f4421e717785c646cc78dffce687fc6ac3c2..37b360a4b2feeeb9ef0b7acf385ecbb324f909d0 100644 (file)
@@ -253,7 +253,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index 26040e06f2bf618701a8f03d300666b8b0fac684..1bd2e71097709409cc1707acdffb519bce35325b 100644 (file)
@@ -253,7 +253,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index 7c106a1ae9cb99d6f5d2811923ef0ab4c490fc01..e22178ef8e5756caa813984f8e0df8fc14fb93bc 100644 (file)
@@ -253,7 +253,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index 26040e06f2bf618701a8f03d300666b8b0fac684..1bd2e71097709409cc1707acdffb519bce35325b 100644 (file)
@@ -253,7 +253,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/config.txt b/tests/newusers/37_create_user_encrypt_MD5-PAM/config.txt
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/group b/tests/newusers/37_create_user_encrypt_MD5-PAM/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/newusers/37_create_user_encrypt_MD5-PAM/config/etc/gshadow b/tests/newusers/37_create_user_encrypt_MD5-PAM/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/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/common-password b/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/common-password
deleted file mode 100644 (file)
index 07f3f1d..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# /etc/pam.d/common-password - password-related modules common to all services
-#
-# This file is included from other service-specific PAM config files,
-# and should contain a list of modules that define the services to be
-# used to change user passwords.  The default is pam_unix.
-
-# Explanation of pam_unix options:
-#
-# The "md5" option enables MD5 passwords.  Without this option, the
-# default is Unix crypt.
-#
-# The "obscure" option replaces the old `OBSCURE_CHECKS_ENAB' option in
-# login.defs.
-#
-# See the pam_unix manpage for other options.
-
-# As of pam 1.0.1-6, this file is managed by pam-auth-update by default.
-# To take advantage of this, it is recommended that you configure any
-# local modules either before or after the default block, and use
-# pam-auth-update to manage selection of other modules.  See
-# pam-auth-update(8) for details.
-
-# here are the per-package modules (the "Primary" block)
-password       [success=1 default=ignore]      pam_unix.so obscure md5
-# here's the fallback if no module succeeds
-password       requisite                       pam_deny.so
-# prime the stack with a positive return value if there isn't one already;
-# this avoids us returning an error just because nothing sets a success code
-# since the modules above will each just jump around
-password       required                        pam_permit.so
-# and here are more per-package modules (the "Additional" block)
-# end of pam-auth-update config
diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/newusers b/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/newusers
deleted file mode 100644 (file)
index 552045e..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# The PAM configuration file for the Shadow `chpasswd' service
-#
-
-@include common-password
-
diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/passwd b/tests/newusers/37_create_user_encrypt_MD5-PAM/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/newusers/37_create_user_encrypt_MD5-PAM/config/etc/shadow b/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/shadow
deleted file mode 100644 (file)
index 031ce88..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root::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/newusers/37_create_user_encrypt_MD5-PAM/data/group b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/group
deleted file mode 100644 (file)
index fecba0c..0000000
+++ /dev/null
@@ -1,42 +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:
-foo:x:1000:
diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/data/gshadow b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/gshadow
deleted file mode 100644 (file)
index 5042e58..0000000
+++ /dev/null
@@ -1,42 +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::
-foo:*::
diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/data/newusers.list b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/newusers.list
deleted file mode 100644 (file)
index 9c40fa2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-foo:fooPass:::User Foo - Gecos Field::/bin/sh
diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/data/passwd b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/passwd
deleted file mode 100644 (file)
index 7bf7386..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:User Foo - Gecos Field::/bin/sh
diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/data/shadow b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/shadow
deleted file mode 100644 (file)
index cff74f8..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-root::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:::
-foo:@PASS_MD5 fooPass@:@TODAY@:0:99999:7:::
diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/newusers.test b/tests/newusers/37_create_user_encrypt_MD5-PAM/newusers.test
deleted file mode 100755 (executable)
index f916194..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "newusers can encrypt the passwords with the MD5 algorithm"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-newusers data/newusers.list
-
-echo -n "Check the passwd file..." 
-../../common/compare_file.pl data/passwd /etc/passwd 
-echo "OK" 
-echo -n "Check the group file..." 
-../../common/compare_file.pl data/group /etc/group 
-echo "OK" 
-echo -n "Check the shadow file..." 
-../../common/compare_file.pl data/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/newusers/37_create_user_encrypt_MD5/config.txt b/tests/newusers/37_create_user_encrypt_MD5/config.txt
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/tests/newusers/37_create_user_encrypt_MD5/config/etc/group b/tests/newusers/37_create_user_encrypt_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/newusers/37_create_user_encrypt_MD5/config/etc/gshadow b/tests/newusers/37_create_user_encrypt_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/newusers/37_create_user_encrypt_MD5/config/etc/passwd b/tests/newusers/37_create_user_encrypt_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/newusers/37_create_user_encrypt_MD5/config/etc/shadow b/tests/newusers/37_create_user_encrypt_MD5/config/etc/shadow
deleted file mode 100644 (file)
index 031ce88..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root::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/newusers/37_create_user_encrypt_MD5/data/group b/tests/newusers/37_create_user_encrypt_MD5/data/group
deleted file mode 100644 (file)
index fecba0c..0000000
+++ /dev/null
@@ -1,42 +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:
-foo:x:1000:
diff --git a/tests/newusers/37_create_user_encrypt_MD5/data/gshadow b/tests/newusers/37_create_user_encrypt_MD5/data/gshadow
deleted file mode 100644 (file)
index 5042e58..0000000
+++ /dev/null
@@ -1,42 +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::
-foo:*::
diff --git a/tests/newusers/37_create_user_encrypt_MD5/data/newusers.list b/tests/newusers/37_create_user_encrypt_MD5/data/newusers.list
deleted file mode 100644 (file)
index 9c40fa2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-foo:fooPass:::User Foo - Gecos Field::/bin/sh
diff --git a/tests/newusers/37_create_user_encrypt_MD5/data/passwd b/tests/newusers/37_create_user_encrypt_MD5/data/passwd
deleted file mode 100644 (file)
index 7bf7386..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:User Foo - Gecos Field::/bin/sh
diff --git a/tests/newusers/37_create_user_encrypt_MD5/data/shadow b/tests/newusers/37_create_user_encrypt_MD5/data/shadow
deleted file mode 100644 (file)
index cff74f8..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-root::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:::
-foo:@PASS_MD5 fooPass@:@TODAY@:0:99999:7:::
diff --git a/tests/newusers/37_create_user_encrypt_MD5/newusers.test b/tests/newusers/37_create_user_encrypt_MD5/newusers.test
deleted file mode 100755 (executable)
index e497ca9..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "newusers can encrypt the passwords with the MD5 algorithm"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-newusers -c MD5 data/newusers.list
-
-echo -n "Check the passwd file..." 
-../../common/compare_file.pl data/passwd /etc/passwd 
-echo "OK" 
-echo -n "Check the group file..." 
-../../common/compare_file.pl data/group /etc/group 
-echo "OK" 
-echo -n "Check the shadow file..." 
-../../common/compare_file.pl data/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
-
index be8f317c65034071a746cc0bd119752932b53936..75facce46a7dc450781a26b7b0a89c523e67681f 100644 (file)
@@ -1,7 +1,7 @@
 newusers: -s flag is only allowed with the -c flag
 Usage: newusers [options] [input]
 
-  -c, --crypt-method            the crypt method (one of NONE MD5 SHA256 SHA512)
+  -c, --crypt-method            the crypt method (one of NONE SHA256 SHA512)
   -r, --system                  create system accounts
   -s, --sha-rounds              number of SHA rounds for the SHA*
                                 crypt algorithms
diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config.txt b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config.txt
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/group b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/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/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/gshadow b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/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/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/passwd b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/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/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/shadow b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/shadow
deleted file mode 100644 (file)
index 031ce88..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root::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/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/group b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/group
deleted file mode 100644 (file)
index fecba0c..0000000
+++ /dev/null
@@ -1,42 +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:
-foo:x:1000:
diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/gshadow b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/gshadow
deleted file mode 100644 (file)
index 5042e58..0000000
+++ /dev/null
@@ -1,42 +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::
-foo:*::
diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/newusers.list b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/newusers.list
deleted file mode 100644 (file)
index 9c40fa2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-foo:fooPass:::User Foo - Gecos Field::/bin/sh
diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/passwd b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/passwd
deleted file mode 100644 (file)
index 7bf7386..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:User Foo - Gecos Field::/bin/sh
diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/shadow b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/shadow
deleted file mode 100644 (file)
index cff74f8..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-root::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:::
-foo:@PASS_MD5 fooPass@:@TODAY@:0:99999:7:::
diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test
deleted file mode 100755 (executable)
index 2a5bfb8..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "newusers ignore the number of rounds with the MD5 method"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo "newusers -c MD5 -s 3000 data/newusers.list"
-newusers -c MD5 -s 3000 data/newusers.list
-
-echo -n "Check the passwd file..." 
-../../common/compare_file.pl data/passwd /etc/passwd 
-echo "OK" 
-echo -n "Check the group file..." 
-../../common/compare_file.pl data/group /etc/group 
-echo "OK" 
-echo -n "Check the shadow file..." 
-../../common/compare_file.pl data/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
-
index f9699c45c2eb8fa9db3d3e9978b945c01d984cae..645f9de544cbca79c1368eb1953ccdd797cc5288 100644 (file)
@@ -293,12 +293,10 @@ CHFN_RESTRICT             rwh
 
 #
 # Only works if compiled with ENCRYPTMETHOD_SELECT defined:
-# If set to MD5, MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 # If set to BCRYPT, BCRYPT-based algorithm will be used for encrypting password
 # If set to YESCRYPT, YESCRYPT-based algorithm will be used for encrypting password
-# MD5 should not be used for new hashes, see crypt(5) for recommendations.
 #
 # Note: If you use PAM, it is recommended to use a value consistent with
 # the PAM modules configuration.
index 41f470a63d8088f1cfa6cbd0c7cee19f8da637a2..1b22201d6913e927e0088e13c3dd549ac84cfd0e 100755 (executable)
@@ -246,7 +246,6 @@ 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/16_chgpasswd_password_NONE/chgpasswd.test
-run_test ./grouptools/chgpasswd/17_chgpasswd_password_MD5/chgpasswd.test
 run_test ./grouptools/chgpasswd/19_chgpasswd_password_SHA256/chgpasswd.test
 run_test ./grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/chgpasswd.test
 run_test ./grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/chgpasswd.test
@@ -602,7 +601,6 @@ if [ "$USE_PAM" = "yes" ]; then
        run_test ./usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/chpasswd.test
        run_test ./usertools/chpasswd-PAM/14_chpasswd_password_encrypted/chpasswd.test
        run_test ./usertools/chpasswd-PAM/16_chpasswd_password_NONE/chpasswd.test
-       run_test ./usertools/chpasswd-PAM/17_chpasswd_password_MD5/chpasswd.test
        run_test ./usertools/chpasswd-PAM/19_chpasswd_password_SHA256/chpasswd.test
        run_test ./usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/chpasswd.test
        run_test ./usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/chpasswd.test
@@ -835,10 +833,6 @@ run_test ./cktools/pwck/29_pwck_password_change_in_future/pwck.test
 run_test ./cktools/pwck/30_pwck_NIS_entries/pwck.test
 run_test ./cktools/pwck/31_pwck_shadow_entry_passwd_no_x/pwck.test
 run_test ./cktools/pwck/32_pwck_quiet/pwck.test
-if [ "$USE_PAM" != "yes" ]; then
-       run_test ./crypt/login.defs_MD5/01_chpasswd.test
-fi
-run_test ./crypt/login.defs_MD5/02_chgpasswd.test
 if [ "$USE_PAM" != "yes" ]; then
        run_test ./crypt/login.defs_SHA256-round-max/01_chpasswd.test
        run_test ./crypt/login.defs_SHA256-round-min-max/01_chpasswd.test
@@ -890,7 +884,6 @@ run_test ./newusers/34_update_password_no_shadow/newusers.test
 run_test ./newusers/35_read_from_stdin/newusers.test
 if [ "$USE_PAM" != "yes" ]; then
        run_test ./newusers/36_create_user_encrypted/newusers.test
-       run_test ./newusers/37_create_user_encrypt_MD5/newusers.test
        run_test ./newusers/38_update_password_no_shadow_encrypted/newusers.test
        run_test ./newusers/39_update_password_no_shadow_password_encrypted/newusers.test
        run_test ./newusers/40_update_password_encrypted/newusers.test
@@ -899,19 +892,11 @@ if [ "$USE_PAM" != "yes" ]; then
        run_test ./newusers/43_create_user_encrypt_SHA256_rounds_3000/newusers.test
        run_test ./newusers/44_create_user_encrypt_SHA256_rounds_300/newusers.test
        run_test ./newusers/45_create_user_encrypt_rounds_3000/newusers.test
-       run_test ./newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test
 else
-
-       run_test ./newusers/37_create_user_encrypt_MD5-PAM/newusers.test
-
-
-
        run_test ./newusers/41_create_user_encrypt_SHA256-PAM/newusers.test
        run_test ./newusers/42_create_user_encrypt_SHA512-PAM/newusers.test
        run_test ./newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/newusers.test
        run_test ./newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/newusers.test
-
-
 fi
 run_test ./newusers/47_create_user_error_UID_4294967295/newusers.test
 run_test ./newusers/48_create_user_error_GID_4294967295/newusers.test
index e6944d05f72d5474b178ba9d0beac87d3d55b9a1..224e039847103102c07891befcc2e91f1c148e0d 100755 (executable)
@@ -262,7 +262,6 @@ 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/16_chgpasswd_password_NONE/chgpasswd.test
-run_test ./grouptools/chgpasswd/17_chgpasswd_password_MD5/chgpasswd.test
 run_test ./grouptools/chgpasswd/19_chgpasswd_password_SHA256/chgpasswd.test
 run_test ./grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/chgpasswd.test
 run_test ./grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/chgpasswd.test
@@ -618,7 +617,6 @@ if [ "$USE_PAM" = "yes" ]; then
        run_test ./usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/chpasswd.test
        run_test ./usertools/chpasswd-PAM/14_chpasswd_password_encrypted/chpasswd.test
        run_test ./usertools/chpasswd-PAM/16_chpasswd_password_NONE/chpasswd.test
-       run_test ./usertools/chpasswd-PAM/17_chpasswd_password_MD5/chpasswd.test
        run_test ./usertools/chpasswd-PAM/19_chpasswd_password_SHA256/chpasswd.test
        run_test ./usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/chpasswd.test
        run_test ./usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/chpasswd.test
@@ -851,10 +849,6 @@ run_test ./cktools/pwck/29_pwck_password_change_in_future/pwck.test
 run_test ./cktools/pwck/30_pwck_NIS_entries/pwck.test
 run_test ./cktools/pwck/31_pwck_shadow_entry_passwd_no_x/pwck.test
 run_test ./cktools/pwck/32_pwck_quiet/pwck.test
-if [ "$USE_PAM" != "yes" ]; then
-       run_test ./crypt/login.defs_MD5/01_chpasswd.test
-fi
-run_test ./crypt/login.defs_MD5/02_chgpasswd.test
 if [ "$USE_PAM" != "yes" ]; then
        run_test ./crypt/login.defs_SHA256-round-max/01_chpasswd.test
        run_test ./crypt/login.defs_SHA256-round-min-max/01_chpasswd.test
@@ -906,7 +900,6 @@ run_test ./newusers/34_update_password_no_shadow/newusers.test
 run_test ./newusers/35_read_from_stdin/newusers.test
 if [ "$USE_PAM" != "yes" ]; then
        run_test ./newusers/36_create_user_encrypted/newusers.test
-       run_test ./newusers/37_create_user_encrypt_MD5/newusers.test
        run_test ./newusers/38_update_password_no_shadow_encrypted/newusers.test
        run_test ./newusers/39_update_password_no_shadow_password_encrypted/newusers.test
        run_test ./newusers/40_update_password_encrypted/newusers.test
@@ -915,19 +908,11 @@ if [ "$USE_PAM" != "yes" ]; then
        run_test ./newusers/43_create_user_encrypt_SHA256_rounds_3000/newusers.test
        run_test ./newusers/44_create_user_encrypt_SHA256_rounds_300/newusers.test
        run_test ./newusers/45_create_user_encrypt_rounds_3000/newusers.test
-       run_test ./newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test
 else
-
-       run_test ./newusers/37_create_user_encrypt_MD5-PAM/newusers.test
-
-
-
        run_test ./newusers/41_create_user_encrypt_SHA256-PAM/newusers.test
        run_test ./newusers/42_create_user_encrypt_SHA512-PAM/newusers.test
        run_test ./newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/newusers.test
        run_test ./newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/newusers.test
-
-
 fi
 run_test ./newusers/47_create_user_error_UID_4294967295/newusers.test
 run_test ./newusers/48_create_user_error_GID_4294967295/newusers.test
index 081d2466ee52908ff997e81660e2b56eefd43c03..672ee39f6eb2b8690bbd7a856e3cd8222e6c763e 100644 (file)
@@ -256,7 +256,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index cfa264c163836c414dabad3d2c535d01ca012aea..3821e10fd18e9e43bad66dc1574542b7d216cf13 100644 (file)
@@ -256,7 +256,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index a1997b537d27cb8e2886535ef45621bb6552cbf7..642ee49a3d313015a64f65cab639f5c3d9c585ee 100644 (file)
@@ -256,7 +256,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index 3ad4a5df86b7bc276caa1884c122405d1b8bee75..b0d77528eec897f664ed1ab150000112d20c5271 100644 (file)
@@ -256,7 +256,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index 697edb275581b5339198d6f075e94e4b86409766..7298a480963dd85f4ba768f3959535cd66d9e006 100644 (file)
@@ -256,7 +256,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index 7cdc98d939bef0632e8c7ce042f6cb5857431685..8a551d3f302ca2276de4f6ce04a4a0707c02f4a3 100644 (file)
@@ -256,7 +256,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index bad60dba7753588efd460f4561f34bd1ff7c8567..2ab5d15421596519c7bba416f7139226c408f0d5 100644 (file)
@@ -256,7 +256,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index d835ca173385bbe10d131745db2c6434016e9281..45afa28708e02ddfe27865eff754dd1f6fd1f5d6 100644 (file)
@@ -293,12 +293,10 @@ CHFN_RESTRICT             rwh
 
 #
 # Only works if compiled with ENCRYPTMETHOD_SELECT defined:
-# If set to MD5, MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 # If set to BCRYPT, BCRYPT-based algorithm will be used for encrypting password
 # If set to YESCRYPT, YESCRYPT-based algorithm will be used for encrypting password
-# MD5 should not be used for new hashes, see crypt(5) for recommendations.
 #
 # Note: If you use PAM, it is recommended to use a value consistent with
 # the PAM modules configuration.
index 7dc814957d2e9dccfc5de9a4abd8229730e72366..a7ec6a5a3bfd2bf3d2c58bdb25ab67601acc5602 100644 (file)
@@ -110,17 +110,6 @@ test_is_valid_hash_ok_sha256(MAYBE_UNUSED void ** _1)
 }
 
 
-static void
-test_is_valid_hash_ok_md5(MAYBE_UNUSED void ** _1)
-{
-       // Basic MD5 hash: $1$ + salt + $ + 22 character hash
-       assert_true(is_valid_hash("$1$salt$abcdefghijklmnopqrstuv"));
-
-       // MD5 with maximum salt length (8 characters)
-       assert_true(is_valid_hash("$1$maxsalt8$abcdefghijklmnopqrstuv"));
-}
-
-
 static void
 test_is_valid_hash_ok_special(MAYBE_UNUSED void ** _1)
 {
@@ -164,7 +153,6 @@ test_is_valid_hash_edge_account_locks(MAYBE_UNUSED void ** _1)
        // Complex ! prefix scenarios with various hash types should work
        assert_true(is_valid_hash("!$2a$12$abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ."));
        assert_true(is_valid_hash("!$5$salt$abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQ"));
-       assert_true(is_valid_hash("!$1$salt$abcdefghijklmnopqrstuv"));
 
        // But invalid hashes with ! prefix should still fail
        assert_false(is_valid_hash("!invalid"));
@@ -230,7 +218,6 @@ main(void)
         cmocka_unit_test(test_is_valid_hash_ok_bcrypt),
         cmocka_unit_test(test_is_valid_hash_ok_sha512),
         cmocka_unit_test(test_is_valid_hash_ok_sha256),
-        cmocka_unit_test(test_is_valid_hash_ok_md5),
         cmocka_unit_test(test_is_valid_hash_ok_special),
         cmocka_unit_test(test_is_valid_hash_edge_salt_chars),
         cmocka_unit_test(test_is_valid_hash_edge_account_locks),
index ce025a639bfeda15ddeabf9f9d506a587a3a95e8..1fd8eec89d5244a74e5934cae9473765ca9086b2 100644 (file)
@@ -1,7 +1,7 @@
 Usage: chpasswd [options]
 
 Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -R, --root CHROOT_DIR         directory to chroot into
index 781d8a60e17da950b7322f28c0f54871e245d852..2bdf29dbe6f08df67760e5e9519563be7445258d 100644 (file)
@@ -2,7 +2,7 @@ chpasswd: unrecognized option '--foo'
 Usage: chpasswd [options]
 
 Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -R, --root CHROOT_DIR         directory to chroot into
index 6e3d25f4e84aeaf481b017df451c490f6f899feb..6947d8eb9f6e1b357e8848336afd3dc0d717ee72 100644 (file)
@@ -2,7 +2,7 @@ chpasswd: the -c and -e flags are exclusive
 Usage: chpasswd [options]
 
 Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -R, --root CHROOT_DIR         directory to chroot into
index 29982fc147b002cee3a1b59b85b2b2decde25d20..4a2001012ad9652203d91004d1e114561ac65783 100755 (executable)
@@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0
 
 change_config
 
-echo -n "Password must use md5 and another method (chpasswd --sha-rounds 12)..."
+echo -n "Password hashing method (chpasswd --sha-rounds 12)..."
 echo 'nobody:test' | chpasswd --sha-rounds 12 2>tmp/usage.out && exit 1 || {
        status=$?
 }
index 66c08a96c016a3d599d98098cb821c16abf91836..04c065f295dd87e98472cbfc404c4d31b73e9b17 100644 (file)
@@ -2,7 +2,7 @@ chpasswd: -s flag is only allowed with the -c flag
 Usage: chpasswd [options]
 
 Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -R, --root CHROOT_DIR         directory to chroot into
index 1b478f98b5f34df88fb66f194c0079908b7f93e0..bbd513ba88ba42b80c082146d4857896223a4f99 100755 (executable)
@@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0
 
 change_config
 
-echo -n "Password must use md5 and another method (chpasswd --sha-rounds 12foo -c SHA512)..."
+echo -n "Password hashing method (chpasswd --sha-rounds 12foo -c SHA512)..."
 echo 'nobody:test' | chpasswd --sha-rounds 12foo -c SHA512 2>tmp/usage.out && exit 1 || {
        status=$?
 }
index f7e0ac24977469634f1ca9bc5144332201594a4e..e5e0b9251f72051081f5f6845fec8bf47b5349ef 100644 (file)
@@ -2,7 +2,7 @@ chpasswd: invalid numeric argument '12foo'
 Usage: chpasswd [options]
 
 Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -R, --root CHROOT_DIR         directory to chroot into
index a2f653c7ae9d4a34a509e0d32ced486d624e42f9..51787dd83cbf450968136bc5bd8ba61bbec1cf2d 100755 (executable)
@@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0
 
 change_config
 
-echo -n "Password must use md5 and another method (chpasswd --crypt-method SHA513)..."
+echo -n "Password hashing method (chpasswd --crypt-method SHA513)..."
 echo 'nobody:test' | chpasswd --crypt-method SHA513 2>tmp/usage.out && exit 1 || {
        status=$?
 }
index 1475a5c8994940eccb7019266cff360d042a2a8c..f7ee539d1a30f0b15491869a7c75d35879acd33b 100644 (file)
@@ -2,7 +2,7 @@ chpasswd: unsupported crypt method: SHA513
 Usage: chpasswd [options]
 
 Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -R, --root CHROOT_DIR         directory to chroot into
diff --git a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/chpasswd.test b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/chpasswd.test
deleted file mode 100755 (executable)
index f7da2c6..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "chpasswd 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 nobody and lp's password (chpasswd --crypt-method MD5)..."
-echo 'nobody:test
-lp:test2' | chpasswd --crypt-method 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 data/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/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/group b/tests/usertools/chpasswd-PAM/17_chpasswd_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/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/gshadow b/tests/usertools/chpasswd-PAM/17_chpasswd_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/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/chpasswd
deleted file mode 100644 (file)
index 552045e..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# The PAM configuration file for the Shadow `chpasswd' service
-#
-
-@include common-password
-
diff --git a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/common-password
deleted file mode 100644 (file)
index 06c59a7..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# /etc/pam.d/common-password - password-related modules common to all services
-#
-# This file is included from other service-specific PAM config files,
-# and should contain a list of modules that define the services to be
-# used to change user passwords.  The default is pam_unix.
-
-# Explanation of pam_unix options:
-#
-# The "md5" option enables MD5 passwords.  Without this option, the
-# default is Unix crypt.
-#
-# The "obscure" option replaces the old `OBSCURE_CHECKS_ENAB' option in
-# login.defs.
-#
-# See the pam_unix manpage for other options.
-
-# As of pam 1.0.1-6, this file is managed by pam-auth-update by default.
-# To take advantage of this, it is recommended that you configure any
-# local modules either before or after the default block, and use
-# pam-auth-update to manage selection of other modules.  See
-# pam-auth-update(8) for details.
-
-# here are the per-package modules (the "Primary" block)
-password       [success=1 default=ignore]      pam_unix.so obscure
-# here's the fallback if no module succeeds
-password       requisite                       pam_deny.so
-# prime the stack with a positive return value if there isn't one already;
-# this avoids us returning an error just because nothing sets a success code
-# since the modules above will each just jump around
-password       required                        pam_permit.so
-# and here are more per-package modules (the "Additional" block)
-# end of pam-auth-update config
diff --git a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/passwd b/tests/usertools/chpasswd-PAM/17_chpasswd_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/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/shadow b/tests/usertools/chpasswd-PAM/17_chpasswd_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/usertools/chpasswd-PAM/17_chpasswd_password_MD5/data/shadow b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/data/shadow
deleted file mode 100644 (file)
index cb54856..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:@PASS_MD5 test2@:@TODAY@: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:@PASS_MD5 test@:@TODAY@:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
index 05067eca42ac38b6e65cc8b22e7b83a8c19c3077..4edef0e81ed71a9c88b4ebc35e9f6b484de96585 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB no
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index ea75ec4150d3cd0463e2eca781e32487f4e94cef..82baf949f1645d9f0ec6a019878e146c21d070d7 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index b93af9d388b79995ed2fa5dae376ea98b863af7c..a6e72f174fc2757da6a378d33ab6c64616a40b44 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #
index 824715933b275faaa0dfba43b596244f6df2172e..404075d6dd15564baf98072767a2a03a3e67236c 100644 (file)
@@ -248,7 +248,6 @@ USERGROUPS_ENAB yes
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
 #
-# If set to MD5 , MD5-based algorithm will be used for encrypting password
 # If set to SHA256, SHA256-based algorithm will be used for encrypting password
 # If set to SHA512, SHA512-based algorithm will be used for encrypting password
 #