]> git.ipfire.org Git - thirdparty/shadow.git/commitdiff
*/: Remove support for DES
authorAlejandro Colomar <alx@kernel.org>
Sat, 27 Dec 2025 11:25:41 +0000 (12:25 +0100)
committerAlejandro Colomar <foss+github@alejandro-colomar.es>
Fri, 17 Jul 2026 18:42:47 +0000 (20:42 +0200)
Reviewed-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
159 files changed:
etc/login.defs
lib/chkhash.c
lib/obscure.c
lib/salt.c
lib/valid.c
man/chgpasswd.8.xml
man/chpasswd.8.xml
man/login.defs.d/ENCRYPT_METHOD.xml
man/newusers.8.xml
man/passwd.1.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_DES/01_chpasswd.test [deleted file]
tests/crypt/login.defs_DES/01_chpasswd/group [deleted file]
tests/crypt/login.defs_DES/01_chpasswd/gshadow [deleted file]
tests/crypt/login.defs_DES/01_chpasswd/passwd [deleted file]
tests/crypt/login.defs_DES/01_chpasswd/shadow [deleted file]
tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5.test [deleted file]
tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/group [deleted file]
tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/gshadow [deleted file]
tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/passwd [deleted file]
tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/passwd.new [deleted file]
tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/shadow [deleted file]
tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES.test [deleted file]
tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/group [deleted file]
tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/gshadow [deleted file]
tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/passwd [deleted file]
tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/shadow [deleted file]
tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE.test [deleted file]
tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/group [deleted file]
tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/gshadow [deleted file]
tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/passwd [deleted file]
tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/shadow [deleted file]
tests/crypt/login.defs_DES/05_chpasswd-e.test [deleted file]
tests/crypt/login.defs_DES/05_chpasswd-e/group [deleted file]
tests/crypt/login.defs_DES/05_chpasswd-e/gshadow [deleted file]
tests/crypt/login.defs_DES/05_chpasswd-e/passwd [deleted file]
tests/crypt/login.defs_DES/05_chpasswd-e/shadow [deleted file]
tests/crypt/login.defs_DES/07_chgpasswd.test [deleted file]
tests/crypt/login.defs_DES/07_chgpasswd/group [deleted file]
tests/crypt/login.defs_DES/07_chgpasswd/gshadow [deleted file]
tests/crypt/login.defs_DES/07_chgpasswd/passwd [deleted file]
tests/crypt/login.defs_DES/07_chgpasswd/shadow [deleted file]
tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5.test [deleted file]
tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/group [deleted file]
tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/gshadow [deleted file]
tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/passwd [deleted file]
tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/shadow [deleted file]
tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES.test [deleted file]
tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/group [deleted file]
tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/gshadow [deleted file]
tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/passwd [deleted file]
tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/shadow [deleted file]
tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE.test [deleted file]
tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/group [deleted file]
tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/gshadow [deleted file]
tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/passwd [deleted file]
tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/shadow [deleted file]
tests/crypt/login.defs_DES/11_chgpasswd-e.test [deleted file]
tests/crypt/login.defs_DES/11_chgpasswd-e/group [deleted file]
tests/crypt/login.defs_DES/11_chgpasswd-e/gshadow [deleted file]
tests/crypt/login.defs_DES/11_chgpasswd-e/passwd [deleted file]
tests/crypt/login.defs_DES/11_chgpasswd-e/shadow [deleted file]
tests/crypt/login.defs_DES/config/etc/group [deleted file]
tests/crypt/login.defs_DES/config/etc/gshadow [deleted file]
tests/crypt/login.defs_DES/config/etc/login.defs [deleted file]
tests/crypt/login.defs_DES/config/etc/passwd [deleted file]
tests/crypt/login.defs_DES/config/etc/shadow [deleted file]
tests/crypt/login.defs_none/config/etc/login.defs
tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/login.defs
tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/login.defs
tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/login.defs
tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/login.defs
tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/login.defs
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/data/usage.out
tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/data/usage.out
tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/data/usage.out
tests/grouptools/chgpasswd/18_chgpasswd_password_DES/chgpasswd.test [deleted file]
tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/group [deleted file]
tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/gshadow [deleted file]
tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/passwd [deleted file]
tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/shadow [deleted file]
tests/grouptools/chgpasswd/18_chgpasswd_password_DES/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/45_create_user_encrypt_rounds_3000/data/newusers.err
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/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/data/usage.out
tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/data/usage.out
tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/data/usage.out
tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/chpasswd.test [deleted file]
tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/group [deleted file]
tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/gshadow [deleted file]
tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/pam.d/chpasswd [deleted file]
tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/pam.d/common-password [deleted file]
tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/passwd [deleted file]
tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/shadow [deleted file]
tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/data/shadow [deleted file]
tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/login.defs
tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/login.defs
tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/login.defs
tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/login.defs
tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/login.defs
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 83f58d1fa5a28bd1fafc4f4be5dbe7780fd47f4a..a0abc9afad99ea530722abb59f41c0ad2230f480 100644 (file)
@@ -364,13 +364,12 @@ CHFN_RESTRICT             rwh
 # 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
-# If set to DES, DES-based algorithm will be used for encrypting password (default)
-# MD5 and DES should not be used for new hashes, see crypt(5) for recommendations.
+# 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.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 6ecdbac79ee360f4217e09598cdfd08508a8fd74..454a2a69cf0fef296c26f7d54eac39baa4d0f599 100644 (file)
@@ -73,10 +73,6 @@ is_valid_hash(const char *hash)
        if (match_regex("^\\$1\\$[^$:\n]{1,8}\\$[./A-Za-z0-9]{22}$", hash))
                return true;
 
-       // DES: exactly 13 characters from [A-Za-z0-9./]
-       if (match_regex("^[./A-Za-z0-9]{13}$", hash))
-               return true;
-
        // Not a valid hash
        return false;
 }
index 64d0e7ee54f6f1cbca1912263d4c1eb174ae30a7..f8cb7649e79f229946da2649974976ddac1d03a2 100644 (file)
@@ -201,7 +201,6 @@ void
 obscure_get_range(int *minlen, int *maxlen)
 {
        int        val;
-       const char *method;
 
        /* Minimum length is 0, even if -1 is configured. */
        val = getdef_num("PASS_MIN_LEN", 0);
@@ -209,17 +208,4 @@ obscure_get_range(int *minlen, int *maxlen)
 
        /* Maximum password length check is optional. */
        *maxlen = -1;
-
-       if (!getdef_bool("OBSCURE_CHECKS_ENAB")) {
-               return;
-       }
-
-       method = getdef_str ("ENCRYPT_METHOD");
-       if (NULL == method)
-               return;
-
-       if (!streq(method, "DES"))
-               return;
-
-       *maxlen = getdef_num ("PASS_MAX_LEN", 8);
 }
index 98b8a81946a2bd398112d9e1a2be05902ad95ad9..1f2560b9f7daedf40eed7374b04466de138a8d89 100644 (file)
@@ -387,7 +387,7 @@ sha512:
                salt_len = SHA_CRYPT_SALT_SIZE;
                rounds = SHA_get_salt_rounds (arg);
                SHA_salt_rounds_to_buf (result, rounds);
-       } else if (!streq(method, "DES")) {
+       } else {
                fprintf (log_get_logfd(),
                         _("Invalid ENCRYPT_METHOD value: '%s'.\n"
                           "Defaulting to SHA512.\n"),
@@ -396,18 +396,6 @@ sha512:
        }
 
 #if USE_XCRYPT_GENSALT
-       /*
-        * Prepare DES setting for crypt_gensalt(), if result
-        * has not been filled with anything previously.
-        */
-       if (streq(result, "")) {
-               /* Avoid -Wunused-but-set-variable. */
-               salt_len = GENSALT_SETTING_SIZE - 1;
-               rounds = 0;
-               memset(result, '.', salt_len);
-               stpcpy(&result[salt_len], "");
-       }
-
        char *retval = crypt_gensalt (result, rounds, NULL, 0);
 
        /* Should not happen, but... */
index 919a99bc33598b58e021d8f831b32f188f44dae0..4fb9879fab9923a4020e7eb84849dca6ee5a5162 100644 (file)
@@ -23,7 +23,7 @@
 /*
  * valid - compare encrypted passwords
  *
- *     Valid() compares the DES encrypted password from the password file
+ *     Valid() compares the hashed password from the password file
  *     against the password which the user has entered after it has been
  *     encrypted using the same salt as the original.  Entries which do
  *     not have a password file entry have a NULL pw_name field and this
index ce6e987a68ca020b0cde63e02c7e932f498ce3e7..f7461ce897d388744517b7984d882c69123b2be4 100644 (file)
@@ -92,7 +92,6 @@
          <para>
            The available methods are <phrase condition="bcrypt">
            <replaceable>BCRYPT</replaceable>,</phrase>
-           <replaceable>DES</replaceable>,
            <replaceable>MD5</replaceable>,
            <replaceable>SHA256</replaceable>,
            <replaceable>SHA512</replaceable>,
index 778878825c44535d4d5271bdb52582584b4a5bda..fc65ec59499dc072a49f56e41c673f13f859c4f5 100644 (file)
          <para>
            The available methods are <phrase condition="bcrypt">
            <replaceable>BCRYPT</replaceable>,</phrase>
-           <replaceable>DES</replaceable>,
            <replaceable>MD5</replaceable>,
            <replaceable>SHA256</replaceable>,
            <replaceable>SHA512</replaceable>,
index 6af3b118707083947445dcdb69b5e0db50de826d..9455c9b682ccc34ba0f166e36cbf9a9427e901d2 100644 (file)
     <para>
       It can take one of these values: <phrase condition="bcrypt">
       <replaceable>BCRYPT</replaceable>,</phrase>
-      <replaceable>DES</replaceable>,
       <replaceable>MD5</replaceable>,
       <replaceable>SHA256</replaceable>,
       <replaceable>SHA512</replaceable> (default),
       <phrase condition="yescrypt">
       <replaceable>YESCRYPT</replaceable></phrase>.
-      MD5 and DES should not be used for new hashes, see
+      MD5 should not be used for new hashes, see
       <refentrytitle>crypt</refentrytitle><manvolnum>5</manvolnum>
       for recommendations.
     </para>
index dc39a6e6afd500f687faa48bc3d69bc4ad6148d3..3d480d2ed19ac4647e0a60c6809b2080744b492e 100644 (file)
        <listitem>
          <para>Use the specified method to encrypt the passwords.</para>
          <para>
-           The available methods are DES, MD5, NONE, and SHA256 or SHA512
+           The available methods are MD5, NONE, and SHA256 or SHA512
            if your libc support these methods.
          </para>
        </listitem>
index 54da906c7186d5c9fa22bda3e4f7508d8894a8fb..1c8e0f3a934bf856fcb5c1b86d1f4d5770012da9 100644 (file)
       <title>Hints for user passwords</title>
       <para>
        The security of a password depends on the strength of the
-       encryption algorithm and the size of the key space. The legacy
-       <emphasis>UNIX</emphasis> System encryption method is based on the
-       NBS DES algorithm. More recent methods are now recommended (see
-       <option>ENCRYPT_METHOD</option>). The size of the key space
+       hashing method and the size of the key space.
+       The hashing method can be selected with
+       <option>ENCRYPT_METHOD</option>.
+       The size of the key space
        depends on the randomness of the selected password.
       </para>
 
index 347a202eb57b0e40c768cd9f88c633a8f0d6cbc1..fbd9e01808520f523ead39bbb04ac04fdd5b6b7b 100644 (file)
@@ -115,7 +115,7 @@ usage (int status)
                        Prog);
        (void) fprintf (usageout,
                        _("  -c, --crypt-method METHOD     the crypt method (one of %s)\n"),
-                       "NONE DES MD5"
+                       "NONE MD5"
                        " SHA256 SHA512"
 #if defined(USE_BCRYPT)
                        " BCRYPT"
@@ -232,8 +232,7 @@ static void check_flags (void)
        }
 
        if (cflg) {
-               if (   !streq(crypt_method, "DES")
-                   && !streq(crypt_method, "MD5")
+               if (   !streq(crypt_method, "MD5")
                    && !streq(crypt_method, "NONE")
                    && !streq(crypt_method, "SHA256")
                    && !streq(crypt_method, "SHA512")
index bbbe4626e8b9cb6df005a4c875da67b2dd539a2b..db8ea0b0a5db2875e1e3bfd34128a759f67ce456 100644 (file)
@@ -117,7 +117,7 @@ usage (int status)
                        Prog);
        (void) fprintf (usageout,
                        _("  -c, --crypt-method METHOD     the crypt method (one of %s)\n"),
-                       "NONE DES MD5"
+                       "NONE MD5"
                        " SHA256 SHA512"
 #if defined(USE_BCRYPT)
                        " BCRYPT"
@@ -233,8 +233,7 @@ static void check_flags (void)
        }
 
        if (cflg) {
-               if ((!IS_CRYPT_METHOD("DES"))
-                   &&(!IS_CRYPT_METHOD("MD5"))
+               if (!IS_CRYPT_METHOD("MD5")
                    &&(!IS_CRYPT_METHOD("NONE"))
                    &&(!IS_CRYPT_METHOD("SHA256"))
                    &&(!IS_CRYPT_METHOD("SHA512"))
index 957930b0533d7482a3dbfdffb0022d4ffb8635d4..fa6870112de4b2df29619803f30818842d47665a 100644 (file)
@@ -132,7 +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 DES MD5"
+                       "NONE MD5"
                        " SHA256 SHA512"
 #if defined(USE_BCRYPT)
                        " BCRYPT"
@@ -735,8 +735,7 @@ static void check_flags (void)
        }
 
        if (cflg) {
-               if (   !streq(crypt_method, "DES")
-                   && !streq(crypt_method, "MD5")
+               if (   !streq(crypt_method, "MD5")
                    && !streq(crypt_method, "NONE")
                    && !streq(crypt_method, "SHA256")
                    && !streq(crypt_method, "SHA512")
index 4ad8c17b31b3a9bec456db0ce8060f96416059b4..fc6b072d44fc337855fbb7fa00a8266932f94e11 100644 (file)
@@ -253,12 +253,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 60063f89aae4df0f4be10f826e07e0b28620b96c..6dcfe953cd9f8a91e7ef8f979762346b61816fa5 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
diff --git a/tests/crypt/login.defs_DES/01_chpasswd.test b/tests/crypt/login.defs_DES/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_DES/01_chpasswd/group b/tests/crypt/login.defs_DES/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_DES/01_chpasswd/gshadow b/tests/crypt/login.defs_DES/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_DES/01_chpasswd/passwd b/tests/crypt/login.defs_DES/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_DES/01_chpasswd/shadow b/tests/crypt/login.defs_DES/01_chpasswd/shadow
deleted file mode 100644 (file)
index 7607cc6..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_DES test@:@TODAY@:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
diff --git a/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5.test b/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5.test
deleted file mode 100755 (executable)
index 2ae3f3b..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 --crypt-method MD5
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl 02_chpasswd--crypt-method-MD5/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl 02_chpasswd--crypt-method-MD5/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl 02_chpasswd--crypt-method-MD5/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl 02_chpasswd--crypt-method-MD5/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/group b/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/group
deleted file mode 100644 (file)
index 1012390..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
diff --git a/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/gshadow b/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/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_DES/02_chpasswd--crypt-method-MD5/passwd b/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/passwd
deleted file mode 100644 (file)
index 43fc135..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
diff --git a/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/passwd.new b/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/passwd.new
deleted file mode 100644 (file)
index 43fc135..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
diff --git a/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/shadow b/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/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_DES/03_chpasswd--crypt-method-DES.test b/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES.test
deleted file mode 100755 (executable)
index 9848828..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 --crypt-method DES
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl 03_chpasswd--crypt-method-DES/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl 03_chpasswd--crypt-method-DES/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl 03_chpasswd--crypt-method-DES/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl 03_chpasswd--crypt-method-DES/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/group b/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/group
deleted file mode 100644 (file)
index 1012390..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
diff --git a/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/gshadow b/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/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_DES/03_chpasswd--crypt-method-DES/passwd b/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/passwd
deleted file mode 100644 (file)
index 43fc135..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
diff --git a/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/shadow b/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/shadow
deleted file mode 100644 (file)
index 7607cc6..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_DES test@:@TODAY@:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
diff --git a/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE.test b/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE.test
deleted file mode 100755 (executable)
index 4c4f18a..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 --crypt-method NONE
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl 04_chpasswd--crypt-method-NONE/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl 04_chpasswd--crypt-method-NONE/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl 04_chpasswd--crypt-method-NONE/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl 04_chpasswd--crypt-method-NONE/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/group b/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/group
deleted file mode 100644 (file)
index 1012390..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
diff --git a/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/gshadow b/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/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_DES/04_chpasswd--crypt-method-NONE/passwd b/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/passwd
deleted file mode 100644 (file)
index 43fc135..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
diff --git a/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/shadow b/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/shadow
deleted file mode 100644 (file)
index d2bde3b..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:test:@TODAY@:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
diff --git a/tests/crypt/login.defs_DES/05_chpasswd-e.test b/tests/crypt/login.defs_DES/05_chpasswd-e.test
deleted file mode 100755 (executable)
index fdac6ae..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 -e
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl 05_chpasswd-e/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl 05_chpasswd-e/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl 05_chpasswd-e/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl 05_chpasswd-e/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/crypt/login.defs_DES/05_chpasswd-e/group b/tests/crypt/login.defs_DES/05_chpasswd-e/group
deleted file mode 100644 (file)
index 1012390..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
diff --git a/tests/crypt/login.defs_DES/05_chpasswd-e/gshadow b/tests/crypt/login.defs_DES/05_chpasswd-e/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_DES/05_chpasswd-e/passwd b/tests/crypt/login.defs_DES/05_chpasswd-e/passwd
deleted file mode 100644 (file)
index 43fc135..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
diff --git a/tests/crypt/login.defs_DES/05_chpasswd-e/shadow b/tests/crypt/login.defs_DES/05_chpasswd-e/shadow
deleted file mode 100644 (file)
index d2bde3b..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:test:@TODAY@:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
diff --git a/tests/crypt/login.defs_DES/07_chgpasswd.test b/tests/crypt/login.defs_DES/07_chgpasswd.test
deleted file mode 100755 (executable)
index 5b7a073..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's password"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Change nogroup's password..."
-echo nogroup:test | chgpasswd
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl 07_chgpasswd/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl 07_chgpasswd/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl 07_chgpasswd/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl 07_chgpasswd/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/crypt/login.defs_DES/07_chgpasswd/group b/tests/crypt/login.defs_DES/07_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_DES/07_chgpasswd/gshadow b/tests/crypt/login.defs_DES/07_chgpasswd/gshadow
deleted file mode 100644 (file)
index 53dba5e..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_DES test@::
-crontab:x::
-Debian-exim:x::
diff --git a/tests/crypt/login.defs_DES/07_chgpasswd/passwd b/tests/crypt/login.defs_DES/07_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_DES/07_chgpasswd/shadow b/tests/crypt/login.defs_DES/07_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_DES/08_chgpasswd--crypt-method-MD5.test b/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5.test
deleted file mode 100755 (executable)
index 405e8b2..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's password"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Change nogroup's password..."
-echo nogroup:test | chgpasswd --crypt-method MD5
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl 08_chgpasswd--crypt-method-MD5/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl 08_chgpasswd--crypt-method-MD5/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl 08_chgpasswd--crypt-method-MD5/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl 08_chgpasswd--crypt-method-MD5/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/group b/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/group
deleted file mode 100644 (file)
index 1012390..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
diff --git a/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/gshadow b/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/gshadow
deleted file mode 100644 (file)
index a709bcb..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:@PASS_MD5 test@::
-crontab:x::
-Debian-exim:x::
diff --git a/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/passwd b/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/passwd
deleted file mode 100644 (file)
index 43fc135..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
diff --git a/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/shadow b/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/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_DES/09_chgpasswd--crypt-method-DES.test b/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES.test
deleted file mode 100755 (executable)
index 1553e00..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's password"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Change nogroup's password..."
-echo nogroup:test | chgpasswd --crypt-method DES
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl 09_chgpasswd--crypt-method-DES/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl 09_chgpasswd--crypt-method-DES/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl 09_chgpasswd--crypt-method-DES/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl 09_chgpasswd--crypt-method-DES/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/group b/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/group
deleted file mode 100644 (file)
index 1012390..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
diff --git a/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/gshadow b/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/gshadow
deleted file mode 100644 (file)
index 53dba5e..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_DES test@::
-crontab:x::
-Debian-exim:x::
diff --git a/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/passwd b/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/passwd
deleted file mode 100644 (file)
index 43fc135..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
diff --git a/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/shadow b/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/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_DES/10_chgpasswd--crypt-method-NONE.test b/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE.test
deleted file mode 100755 (executable)
index a010de2..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's password"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Change nogroup's password..."
-echo nogroup:test | chgpasswd --crypt-method NONE
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl 10_chgpasswd--crypt-method-NONE/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl 10_chgpasswd--crypt-method-NONE/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl 10_chgpasswd--crypt-method-NONE/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl 10_chgpasswd--crypt-method-NONE/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/group b/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/group
deleted file mode 100644 (file)
index 1012390..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
diff --git a/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/gshadow b/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/gshadow
deleted file mode 100644 (file)
index a8f0af9..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:test::
-crontab:x::
-Debian-exim:x::
diff --git a/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/passwd b/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/passwd
deleted file mode 100644 (file)
index 43fc135..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
diff --git a/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/shadow b/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/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_DES/11_chgpasswd-e.test b/tests/crypt/login.defs_DES/11_chgpasswd-e.test
deleted file mode 100755 (executable)
index 6b801c1..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "Add a new user"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create user test1 (useradd test1)..."
-echo nogroup:test | chgpasswd -e
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl 11_chgpasswd-e/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl 11_chgpasswd-e/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl 11_chgpasswd-e/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl 11_chgpasswd-e/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/crypt/login.defs_DES/11_chgpasswd-e/group b/tests/crypt/login.defs_DES/11_chgpasswd-e/group
deleted file mode 100644 (file)
index 1012390..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
diff --git a/tests/crypt/login.defs_DES/11_chgpasswd-e/gshadow b/tests/crypt/login.defs_DES/11_chgpasswd-e/gshadow
deleted file mode 100644 (file)
index a8f0af9..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:test::
-crontab:x::
-Debian-exim:x::
diff --git a/tests/crypt/login.defs_DES/11_chgpasswd-e/passwd b/tests/crypt/login.defs_DES/11_chgpasswd-e/passwd
deleted file mode 100644 (file)
index 43fc135..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
diff --git a/tests/crypt/login.defs_DES/11_chgpasswd-e/shadow b/tests/crypt/login.defs_DES/11_chgpasswd-e/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_DES/config/etc/group b/tests/crypt/login.defs_DES/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_DES/config/etc/gshadow b/tests/crypt/login.defs_DES/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_DES/config/etc/login.defs b/tests/crypt/login.defs_DES/config/etc/login.defs
deleted file mode 100644 (file)
index bff8179..0000000
+++ /dev/null
@@ -1,304 +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 DES
-#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
-#PASS_MAX_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_DES/config/etc/passwd b/tests/crypt/login.defs_DES/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_DES/config/etc/shadow b/tests/crypt/login.defs_DES/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 d89c033e91477735f0b180277d0b5ee44e7cb787..52375c5a8f786147127656a25d7e9dc7ecf653ea 100644 (file)
@@ -254,7 +254,7 @@ USERGROUPS_ENAB yes
 #
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 #SHA_CRYPT_MIN_ROUNDS 5000
 #SHA_CRYPT_MAX_ROUNDS 5000
 
index bff8179d8c092283ce1cfab654ff09d508465c46..938562a25a1cefeba2d4fc6a18c1d282161f86ac 100644 (file)
@@ -254,7 +254,7 @@ USERGROUPS_ENAB yes
 #
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
-ENCRYPT_METHOD DES
+ENCRYPT_METHOD SHA512
 #SHA_CRYPT_MIN_ROUNDS 5000
 #SHA_CRYPT_MAX_ROUNDS 5000
 
index bff8179d8c092283ce1cfab654ff09d508465c46..938562a25a1cefeba2d4fc6a18c1d282161f86ac 100644 (file)
@@ -254,7 +254,7 @@ USERGROUPS_ENAB yes
 #
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
-ENCRYPT_METHOD DES
+ENCRYPT_METHOD SHA512
 #SHA_CRYPT_MIN_ROUNDS 5000
 #SHA_CRYPT_MAX_ROUNDS 5000
 
index bff8179d8c092283ce1cfab654ff09d508465c46..938562a25a1cefeba2d4fc6a18c1d282161f86ac 100644 (file)
@@ -254,7 +254,7 @@ USERGROUPS_ENAB yes
 #
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
-ENCRYPT_METHOD DES
+ENCRYPT_METHOD SHA512
 #SHA_CRYPT_MIN_ROUNDS 5000
 #SHA_CRYPT_MAX_ROUNDS 5000
 
index bff8179d8c092283ce1cfab654ff09d508465c46..938562a25a1cefeba2d4fc6a18c1d282161f86ac 100644 (file)
@@ -254,7 +254,7 @@ USERGROUPS_ENAB yes
 #
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
-ENCRYPT_METHOD DES
+ENCRYPT_METHOD SHA512
 #SHA_CRYPT_MIN_ROUNDS 5000
 #SHA_CRYPT_MAX_ROUNDS 5000
 
index bff8179d8c092283ce1cfab654ff09d508465c46..938562a25a1cefeba2d4fc6a18c1d282161f86ac 100644 (file)
@@ -254,7 +254,7 @@ USERGROUPS_ENAB yes
 #
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
-ENCRYPT_METHOD DES
+ENCRYPT_METHOD SHA512
 #SHA_CRYPT_MIN_ROUNDS 5000
 #SHA_CRYPT_MAX_ROUNDS 5000
 
index 94fdba7cd9fc7eaaccc050cd31594388a9090726..96e611048c4fc74d1f763c175020a4aabd17d8cb 100644 (file)
@@ -1,7 +1,7 @@
 Usage: chgpasswd [options]
 
 Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 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 5a1d3aea695ebfce0b4b1065af9c26bb927f2c19..2f881b5d61c229d8400d645e9fdd76e75908512a 100644 (file)
@@ -2,7 +2,7 @@ chgpasswd: unrecognized option '--foo'
 Usage: chgpasswd [options]
 
 Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 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 b9205b78e7817c0c9f34ed3cf52e3f146a8b8676..43057afdebe1ef1b065d732bb74c76315b70ef95 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 DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 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 eac04c9d4d93da3251ebac7729c4a80e38fcfd50..3074d9fd3b9520f5b043c907fabd5ba78b425dbd 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 DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 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 4bc1e84d9693cd4b3ae5326570c3cc9b826b157a..d8722d46a615b466aa724de087ff37427447d95e 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 DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 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 5d8aba385b4d552882bba0f56c83c97dcd480c91..d03539c2a6c29af069b301dc86436cb6ff3dc38e 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 DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 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/18_chgpasswd_password_DES/chgpasswd.test b/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/chgpasswd.test
deleted file mode 100755 (executable)
index bf504af..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 DES 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 DES)..."
-echo 'nogroup:test
-lp:test2' | chgpasswd --crypt-method DES
-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/18_chgpasswd_password_DES/config/etc/group b/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/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/18_chgpasswd_password_DES/config/etc/gshadow b/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/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/18_chgpasswd_password_DES/config/etc/passwd b/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/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/18_chgpasswd_password_DES/config/etc/shadow b/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/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/18_chgpasswd_password_DES/data/gshadow b/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/data/gshadow
deleted file mode 100644 (file)
index dcf1749..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:@PASS_DES 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_DES test@::
-crontab:x::
-Debian-exim:x::
index 3aff416f6123a641d1a5681eca8bad7a14c7a433..66e13c5e5373af067f169da816e8d607756578b3 100644 (file)
@@ -251,7 +251,6 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
index 3aff416f6123a641d1a5681eca8bad7a14c7a433..66e13c5e5373af067f169da816e8d607756578b3 100644 (file)
@@ -251,7 +251,6 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
index 3aff416f6123a641d1a5681eca8bad7a14c7a433..66e13c5e5373af067f169da816e8d607756578b3 100644 (file)
@@ -251,7 +251,6 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
index 3aff416f6123a641d1a5681eca8bad7a14c7a433..66e13c5e5373af067f169da816e8d607756578b3 100644 (file)
@@ -251,7 +251,6 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
index 3aff416f6123a641d1a5681eca8bad7a14c7a433..66e13c5e5373af067f169da816e8d607756578b3 100644 (file)
@@ -251,7 +251,6 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
index bc7a3a518b5a876db41b92ccffa67fcaed1c0524..791b445fc3b5bc7b043a71af3aa25430e4468c32 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index bc7a3a518b5a876db41b92ccffa67fcaed1c0524..791b445fc3b5bc7b043a71af3aa25430e4468c32 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 42161877832fc0f7001bd798c1ca0012b349a345..4652bfb6e27d3fe31b2f8e54b470a6629613241f 100644 (file)
@@ -256,7 +256,6 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
index 95a3463d9ef86af293f2c34730258982d6e50ea5..36adac466cd34a04ae9dd0b17dd7f8741ab299b3 100644 (file)
@@ -256,7 +256,6 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
index a44acaee3bc0bf226ae76283a7cbbd1813ef52da..0882212fa03f201885e9bf5286e3fcf25f2483f8 100644 (file)
@@ -256,7 +256,6 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
index 95a3463d9ef86af293f2c34730258982d6e50ea5..36adac466cd34a04ae9dd0b17dd7f8741ab299b3 100644 (file)
@@ -256,7 +256,6 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
index 4b285aff0560286ae52d15c293af827306ec4584..be8f317c65034071a746cc0bd119752932b53936 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 DES MD5 SHA256 SHA512)
+  -c, --crypt-method            the crypt method (one of NONE MD5 SHA256 SHA512)
   -r, --system                  create system accounts
   -s, --sha-rounds              number of SHA rounds for the SHA*
                                 crypt algorithms
index 1e61b5cd41969947874b350801cd51cb035bbc81..a0f3a52495aa549c82ffb22b00c27c04b3b70438 100644 (file)
@@ -304,13 +304,12 @@ CHFN_RESTRICT             rwh
 # 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
-# If set to DES, DES-based algorithm will be used for encrypting password (default)
-# MD5 and DES should not be used for new hashes, see crypt(5) for recommendations.
+# 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.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 1e7b113723bd34fe173a2de060cc050bf1171a73..5b931229effcde59a2f1668fe989855df0e75ee8 100755 (executable)
@@ -247,7 +247,6 @@ 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/18_chgpasswd_password_DES/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
@@ -605,7 +604,6 @@ if [ "$USE_PAM" = "yes" ]; then
        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/18_chpasswd_password_DES/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
@@ -838,18 +836,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_DES/01_chpasswd.test
-       run_test ./crypt/login.defs_DES/02_chpasswd--crypt-method-MD5.test
-       run_test ./crypt/login.defs_DES/03_chpasswd--crypt-method-DES.test
-       run_test ./crypt/login.defs_DES/04_chpasswd--crypt-method-NONE.test
-       run_test ./crypt/login.defs_DES/05_chpasswd-e.test
-fi
-run_test ./crypt/login.defs_DES/07_chgpasswd.test
-run_test ./crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5.test
-run_test ./crypt/login.defs_DES/09_chgpasswd--crypt-method-DES.test
-run_test ./crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE.test
-run_test ./crypt/login.defs_DES/11_chgpasswd-e.test
 if [ "$USE_PAM" != "yes" ]; then
        run_test ./crypt/login.defs_MD5/01_chpasswd.test
 fi
index 1305c488ad4254ca5d4e673735d68d81c6ff3c66..64969da969b8779615ca69940462a95a1da75b17 100755 (executable)
@@ -263,7 +263,6 @@ 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/18_chgpasswd_password_DES/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
@@ -621,7 +620,6 @@ if [ "$USE_PAM" = "yes" ]; then
        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/18_chpasswd_password_DES/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
@@ -854,18 +852,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_DES/01_chpasswd.test
-       run_test ./crypt/login.defs_DES/02_chpasswd--crypt-method-MD5.test
-       run_test ./crypt/login.defs_DES/03_chpasswd--crypt-method-DES.test
-       run_test ./crypt/login.defs_DES/04_chpasswd--crypt-method-NONE.test
-       run_test ./crypt/login.defs_DES/05_chpasswd-e.test
-fi
-run_test ./crypt/login.defs_DES/07_chgpasswd.test
-run_test ./crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5.test
-run_test ./crypt/login.defs_DES/09_chgpasswd--crypt-method-DES.test
-run_test ./crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE.test
-run_test ./crypt/login.defs_DES/11_chgpasswd-e.test
 if [ "$USE_PAM" != "yes" ]; then
        run_test ./crypt/login.defs_MD5/01_chpasswd.test
 fi
index 5f93a8b5fbb68d053108266fa43814e304e833fc..d797d5d68d94eb3790463abaadf3ecd20a6843b5 100644 (file)
@@ -259,7 +259,6 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
index dceb7596360752d1f21139b29bccb8260711b838..f50cc54c3618442507f48cedc69257e20c2ad372 100644 (file)
@@ -259,7 +259,6 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
index 67bec019d249bfb1fe8c56150c5dc1dc886e8de6..536b0668e996289b5f1c317750b5e9f2cee522da 100644 (file)
@@ -259,7 +259,6 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
index 67079b58ea7a16179852ce381245ff02b51743f0..0fa2845d78b9697226360de779cb478ce900b8f8 100644 (file)
@@ -259,7 +259,6 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
index 2790b553fc52991fa71ee8f129db36472b126713..70ed030003dec25990fb2e01682b9a0702584f1e 100644 (file)
@@ -259,7 +259,6 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
index a121116a08740b8a357eaaaa31ca00315feb7773..fa31f107bba8ac70d7c1b631fd3add423f394632 100644 (file)
@@ -259,7 +259,6 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
index bb1079d629db41f5e5472771f280a6ec9ff5ef8e..3ede831e64c2ba2b8428b4180664e2ec0c932320 100644 (file)
@@ -259,7 +259,6 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
index 7f1feffd64055729436dad82e73dd50f4921e29f..29a66c5ac8f5baea750396028d3c298be860541e 100644 (file)
@@ -304,13 +304,12 @@ CHFN_RESTRICT             rwh
 # 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
-# If set to DES, DES-based algorithm will be used for encrypting password (default)
-# MD5 and DES should not be used for new hashes, see crypt(5) for recommendations.
+# 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.
 #
-ENCRYPT_METHOD SHA512
+#ENCRYPT_METHOD SHA512
 
 #
 # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 269429d534a842fd49e84bce39d8ad556ec4598b..ce025a639bfeda15ddeabf9f9d506a587a3a95e8 100644 (file)
@@ -1,7 +1,7 @@
 Usage: chpasswd [options]
 
 Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 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 28aae640f6aa92a8470a15153cfb8c7d768c2596..781d8a60e17da950b7322f28c0f54871e245d852 100644 (file)
@@ -2,7 +2,7 @@ chpasswd: unrecognized option '--foo'
 Usage: chpasswd [options]
 
 Options:
-  -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 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 22a7292071683aab546ed1c6fe6f1a1ee0998d85..6e3d25f4e84aeaf481b017df451c490f6f899feb 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 DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 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 ffc3cee727f5fa7b155addd03fc0170d1240612c..66c08a96c016a3d599d98098cb821c16abf91836 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 DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 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 fa20130440ee9eba126df11dc6f78ee3711c9b8d..f7e0ac24977469634f1ca9bc5144332201594a4e 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 DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 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 79a0e12fb4702f70d3ef570a65ee25f864668d0b..1475a5c8994940eccb7019266cff360d042a2a8c 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 DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE MD5 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/18_chpasswd_password_DES/chpasswd.test b/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/chpasswd.test
deleted file mode 100755 (executable)
index 750b82f..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 DES 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 DES)..."
-echo 'nobody:test
-lp:test2' | chpasswd --crypt-method DES
-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/18_chpasswd_password_DES/config/etc/group b/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/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/18_chpasswd_password_DES/config/etc/gshadow b/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/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/18_chpasswd_password_DES/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/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/18_chpasswd_password_DES/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/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/18_chpasswd_password_DES/config/etc/passwd b/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/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/18_chpasswd_password_DES/config/etc/shadow b/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/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/18_chpasswd_password_DES/data/shadow b/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/data/shadow
deleted file mode 100644 (file)
index d69c00c..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_DES 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_DES test@:@TODAY@:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
index bff8179d8c092283ce1cfab654ff09d508465c46..938562a25a1cefeba2d4fc6a18c1d282161f86ac 100644 (file)
@@ -254,7 +254,7 @@ USERGROUPS_ENAB yes
 #
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
-ENCRYPT_METHOD DES
+ENCRYPT_METHOD SHA512
 #SHA_CRYPT_MIN_ROUNDS 5000
 #SHA_CRYPT_MAX_ROUNDS 5000
 
index bff8179d8c092283ce1cfab654ff09d508465c46..938562a25a1cefeba2d4fc6a18c1d282161f86ac 100644 (file)
@@ -254,7 +254,7 @@ USERGROUPS_ENAB yes
 #
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
-ENCRYPT_METHOD DES
+ENCRYPT_METHOD SHA512
 #SHA_CRYPT_MIN_ROUNDS 5000
 #SHA_CRYPT_MAX_ROUNDS 5000
 
index bff8179d8c092283ce1cfab654ff09d508465c46..938562a25a1cefeba2d4fc6a18c1d282161f86ac 100644 (file)
@@ -254,7 +254,7 @@ USERGROUPS_ENAB yes
 #
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
-ENCRYPT_METHOD DES
+ENCRYPT_METHOD SHA512
 #SHA_CRYPT_MIN_ROUNDS 5000
 #SHA_CRYPT_MAX_ROUNDS 5000
 
index bff8179d8c092283ce1cfab654ff09d508465c46..938562a25a1cefeba2d4fc6a18c1d282161f86ac 100644 (file)
@@ -254,7 +254,7 @@ USERGROUPS_ENAB yes
 #
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
-ENCRYPT_METHOD DES
+ENCRYPT_METHOD SHA512
 #SHA_CRYPT_MIN_ROUNDS 5000
 #SHA_CRYPT_MAX_ROUNDS 5000
 
index bff8179d8c092283ce1cfab654ff09d508465c46..938562a25a1cefeba2d4fc6a18c1d282161f86ac 100644 (file)
@@ -254,7 +254,7 @@ USERGROUPS_ENAB yes
 #
 #CONSOLE_GROUPS                floppy:audio:cdrom
 
-ENCRYPT_METHOD DES
+ENCRYPT_METHOD SHA512
 #SHA_CRYPT_MIN_ROUNDS 5000
 #SHA_CRYPT_MAX_ROUNDS 5000
 
index 4b8591bbb6f5b30ebae77d6ba34d3e9686cb6971..56d0d6cbfcc81d579435e3441bf11383ce7b9d22 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB no
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 3cb8070944911da4fe1c727570e4bf0e14d83de6..99e03d9168671990925a120669def6e810b5f8db 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index c4536c0ce83da1cf8c506dc65da17a76eb70f20e..98f0ade5764d8b98458f342f39148aaa4d552775 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
index 1c16f1198136659db8a84e68534fca9397964f6e..75ddf300500741e43bf7226655056a2dc3b14d32 100644 (file)
@@ -251,12 +251,11 @@ USERGROUPS_ENAB yes
 # 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 DES, DES-based algorithm will be used for encrypting password (default)
 #
 # Note: It is recommended to use a value consistent with
 # the PAM modules configuration.
 #
-#ENCRYPT_METHOD DES
+#ENCRYPT_METHOD SHA512
 
 #
 # Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.