diff --git a/etc/login.defs b/etc/login.defs index 739085da52..9325277480 100644 --- a/etc/login.defs +++ b/etc/login.defs @@ -273,13 +273,6 @@ PASS_CHANGE_TRIES 5 # PASS_ALWAYS_WARN yes -# -# Number of significant characters in the password for crypt(). -# Default is 8, don't change unless your crypt() is better. -# Only used for DES encryption algorithm. -# -#PASS_MAX_LEN 8 - # # Require password before chfn(1)/chsh(1) can make any changes. # @@ -302,18 +295,15 @@ CHFN_RESTRICT rwh # # Only works if compiled with ENCRYPTMETHOD_SELECT defined: -# If set to MD5, MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password # If set to BCRYPT, BCRYPT-based algorithm will be used for encrypting password # If set to YESCRYPT, YESCRYPT-based algorithm will be used for encrypting password -# 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. # # 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. diff --git a/lib/chkhash.c b/lib/chkhash.c index 6ecdbac79e..3a0f246d22 100644 --- a/lib/chkhash.c +++ b/lib/chkhash.c @@ -50,7 +50,7 @@ is_valid_hash(const char *hash) return true; // Minimum hash length - if (strlen(hash) < 13) + if (strlen(hash) < 48) return false; // Yescrypt: $y$ + algorithm parameters + $ + salt + $ + 43-char hash @@ -69,14 +69,6 @@ is_valid_hash(const char *hash) if (match_regex("^\\$5\\$(rounds=[1-9][0-9]{3,8}\\$)?[^$:\n]{1,16}\\$[./A-Za-z0-9]{43}$", hash)) return true; - // MD5: $1$ + salt + $ + 22-char hash - if (match_regex("^\\$1\\$[^$:\n]{1,8}\\$[./A-Za-z0-9]{22}$", hash)) - return true; - - // 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; } diff --git a/lib/getdef.c b/lib/getdef.c index b15d06ffec..c2c72f9c9f 100644 --- a/lib/getdef.c +++ b/lib/getdef.c @@ -63,7 +63,6 @@ struct itemdef { {"OBSCURE_CHECKS_ENAB", NULL}, \ {"PASS_ALWAYS_WARN", NULL}, \ {"PASS_CHANGE_TRIES", NULL}, \ - {"PASS_MAX_LEN", NULL}, \ {"PASS_MIN_LEN", NULL}, \ {"PORTTIME_CHECKS_ENAB", NULL}, \ {"QUOTAS_ENAB", NULL}, \ diff --git a/lib/obscure.c b/lib/obscure.c index 9a53df85e3..1c45ea551d 100644 --- a/lib/obscure.c +++ b/lib/obscure.c @@ -12,6 +12,7 @@ #include +#include #include #include @@ -26,10 +27,6 @@ #include "string/strdup/strdup.h" -#if WITH_LIBBSD == 0 -#include "freezero.h" -#endif /* WITH_LIBBSD */ - /* * can't be a palindrome - like `R A D A R' or `M A D A M' */ @@ -59,7 +56,7 @@ static bool similar (/*@notnull@*/const char *old, /*@notnull@*/const char *new) /* * XXX - sometimes this fails when changing from a simple password - * to a really long one (MD5). For now, I just return success if + * to a really long one. For now, I just return success if * the new password is long enough. Please feel free to suggest * something better... --marekm */ @@ -115,19 +112,8 @@ static /*@observer@*//*@null@*/const char *obscure_msg ( /*@notnull@*/const char *old, /*@notnull@*/const char *new) { - int maxlen, minlen; - size_t oldlen, newlen; - char *new1, *old1; - const char *msg; - - oldlen = strlen (old); - newlen = strlen (new); - - obscure_get_range(&minlen, &maxlen); - - if (newlen < (size_t) minlen) { + if (strlen(new) < pass_min_len()) return _("too short"); - } /* * Remaining checks are optional. @@ -136,39 +122,7 @@ static /*@observer@*//*@null@*/const char *obscure_msg ( return NULL; } - msg = password_check(old, new); - if (NULL != msg) { - return msg; - } - - if (maxlen == -1) { - return NULL; - } - - /* The traditional crypt() truncates passwords to 8 chars. It is - possible to circumvent the above checks by choosing an easy - 8-char password and adding some random characters to it... - Example: "password$%^&*123". So check it again, this time - truncated to the maximum length. Idea from npasswd. --marekm */ - - if ( (oldlen <= (size_t) maxlen) - && (newlen <= (size_t) maxlen)) { - return NULL; - } - - new1 = xstrdup (new); - old1 = xstrdup (old); - if (newlen > (size_t) maxlen) - stpcpy(&new1[maxlen], ""); - if (oldlen > (size_t) maxlen) - stpcpy(&old1[maxlen], ""); - - msg = password_check(old1, new1); - - freezero (new1, newlen); - freezero (old1, oldlen); - - return msg; + return password_check(old, new); } /* @@ -191,43 +145,12 @@ obscure(const char *old, const char *new) return true; } -/* - * obscure_get_range - retrieve min and max password lengths - * - * Returns minimum and maximum allowed lengths of a password - * to pass obscure checks. - */ -void -obscure_get_range(int *minlen, int *maxlen) +size_t +pass_min_len(void) { - int val; - const char *method; + int val; /* Minimum length is 0, even if -1 is configured. */ val = getdef_num("PASS_MIN_LEN", 0); - *minlen = val == -1 ? 0 : val; - - /* Maximum password length check is optional. */ - *maxlen = -1; - - if (!getdef_bool("OBSCURE_CHECKS_ENAB")) { - return; - } - - method = getdef_str ("ENCRYPT_METHOD"); - if (NULL != method) { - if ( streq(method, "MD5") - || streq(method, "SHA256") - || streq(method, "SHA512") -#ifdef USE_BCRYPT - || streq(method, "BCRYPT") -#endif -#ifdef USE_YESCRYPT - || streq(method, "YESCRYPT") -#endif - ) { - return; - } - } - *maxlen = getdef_num ("PASS_MAX_LEN", 8); + return val == -1 ? 0 : val; } diff --git a/lib/prototypes.h b/lib/prototypes.h index 162804da13..6e989b2fc2 100644 --- a/lib/prototypes.h +++ b/lib/prototypes.h @@ -301,7 +301,7 @@ extern int do_pam_passwd_non_interactive (const char *pam_service, /* obscure.c */ extern bool obscure (const char *, const char *); -extern void obscure_get_range(int *, int *); +extern size_t pass_min_len(void); /* pam_pass.c */ #ifdef USE_PAM diff --git a/lib/salt.c b/lib/salt.c index 83a64825b2..b0f1eb6d12 100644 --- a/lib/salt.c +++ b/lib/salt.c @@ -77,9 +77,6 @@ #define Y_COST_MAX 11 #endif -/* Fixed salt len for md5crypt. */ -#define MD5_CRYPT_SALT_SIZE 8 - /* Generate salt of size salt_size. */ #define MAX_SALT_SIZE 44 #define MIN_SALT_SIZE 8 @@ -355,12 +352,13 @@ static /*@observer@*/const char *gensalt (size_t salt_size) bzero(result, GENSALT_SETTING_SIZE); - method = meth ?: getdef_str("ENCRYPT_METHOD") ?: "DES"; + method = meth ?: getdef_str("ENCRYPT_METHOD") ?: "SHA512"; - if (streq(method, "MD5")) { - MAGNUM(result, '1'); - salt_len = MD5_CRYPT_SALT_SIZE; - rounds = 0; + if (streq(method, "SHA256")) { + MAGNUM(result, '5'); + salt_len = SHA_CRYPT_SALT_SIZE; + rounds = SHA_get_salt_rounds (arg); + SHA_salt_rounds_to_buf (result, rounds); #ifdef USE_BCRYPT } else if (streq(method, "BCRYPT")) { BCRYPTMAGNUM(result); @@ -375,39 +373,21 @@ static /*@observer@*/const char *gensalt (size_t salt_size) rounds = YESCRYPT_get_salt_cost (arg); YESCRYPT_salt_cost_to_buf (result, rounds); #endif /* USE_YESCRYPT */ - } else if (streq(method, "SHA256")) { - MAGNUM(result, '5'); - salt_len = SHA_CRYPT_SALT_SIZE; - rounds = SHA_get_salt_rounds (arg); - SHA_salt_rounds_to_buf (result, rounds); } else if (streq(method, "SHA512")) { +sha512: MAGNUM(result, '6'); 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 DES.\n"), + "Defaulting to SHA512.\n"), method); - salt_len = MAX_SALT_SIZE; - rounds = 0; - bzero(result, GENSALT_SETTING_SIZE); + goto 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... */ diff --git a/lib/valid.c b/lib/valid.c index 919a99bc33..4fb9879fab 100644 --- a/lib/valid.c +++ b/lib/valid.c @@ -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 diff --git a/man/Makefile.am b/man/Makefile.am index c1cfc90f04..4c3cdffdb9 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -161,7 +161,7 @@ login_defs_v = \ PASS_ALWAYS_WARN.xml \ PASS_CHANGE_TRIES.xml \ PASS_MAX_DAYS.xml \ - PASS_MAX_LEN.xml \ + PASS_MIN_LEN.xml \ PASS_MIN_DAYS.xml \ PASS_WARN_AGE.xml \ PORTTIME_CHECKS_ENAB.xml \ diff --git a/man/chgpasswd.8.xml b/man/chgpasswd.8.xml index ce6e987a68..81d8985f9d 100644 --- a/man/chgpasswd.8.xml +++ b/man/chgpasswd.8.xml @@ -92,8 +92,6 @@ The available methods are BCRYPT, - DES, - MD5, SHA256, SHA512, diff --git a/man/chpasswd.8.xml b/man/chpasswd.8.xml index 778878825c..80d8ce594b 100644 --- a/man/chpasswd.8.xml +++ b/man/chpasswd.8.xml @@ -118,8 +118,6 @@ The available methods are BCRYPT, - DES, - MD5, SHA256, SHA512, diff --git a/man/login.defs.d/ENCRYPT_METHOD.xml b/man/login.defs.d/ENCRYPT_METHOD.xml index 1865bf0f9e..58d35c47b9 100644 --- a/man/login.defs.d/ENCRYPT_METHOD.xml +++ b/man/login.defs.d/ENCRYPT_METHOD.xml @@ -12,13 +12,11 @@ It can take one of these values: BCRYPT, - DES (default), - MD5, SHA256, SHA512, YESCRYPT. - MD5 and DES should not be used for new hashes, see + See crypt5 for recommendations. diff --git a/man/login.defs.d/PASS_MAX_LEN.xml b/man/login.defs.d/PASS_MAX_LEN.xml deleted file mode 100644 index d8221b2a5b..0000000000 --- a/man/login.defs.d/PASS_MAX_LEN.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - (number) - (number) - - - Number of significant characters in the password for crypt(). - - - is 8 by default. - Don't change unless your crypt() is better. - - - is only used for DES. - It is ignored if an encryption algorithm other than DES is used, - because - set to an algorithm other than DES. - - - In addition, is only used if - set to - yes. - - - Note: This only affects the generation of user passwords. - Group password lengths are not checked. - - - diff --git a/man/login.defs.d/PASS_MIN_LEN.xml b/man/login.defs.d/PASS_MIN_LEN.xml new file mode 100644 index 0000000000..cb4c724d79 --- /dev/null +++ b/man/login.defs.d/PASS_MIN_LEN.xml @@ -0,0 +1,12 @@ + + + (number) + + + Minimum allowed length of a password. + + + diff --git a/man/newusers.8.xml b/man/newusers.8.xml index 879f2e9cb0..962cac08d3 100644 --- a/man/newusers.8.xml +++ b/man/newusers.8.xml @@ -271,7 +271,7 @@ Use the specified method to encrypt the passwords. - The available methods are DES, MD5, NONE, and SHA256 or SHA512 + The available methods are NONE, and SHA256 or SHA512 if your libc support these methods. diff --git a/man/passwd.1.xml b/man/passwd.1.xml index f05efab530..9c5f810e5a 100644 --- a/man/passwd.1.xml +++ b/man/passwd.1.xml @@ -11,7 +11,7 @@ - + @@ -108,10 +108,10 @@ Hints for user passwords The security of a password depends on the strength of the - encryption algorithm and the size of the key space. The legacy - UNIX System encryption method is based on the - NBS DES algorithm. More recent methods are now recommended (see - ). The size of the key space + hashing method and the size of the key space. + The hashing method can be selected with + . + The size of the key space depends on the randomness of the selected password. @@ -402,7 +402,7 @@ &OBSCURE_CHECKS_ENAB; &PASS_ALWAYS_WARN; &PASS_CHANGE_TRIES; - &PASS_MAX_LEN; + &PASS_MIN_LEN; &SHA_CRYPT_MIN_ROUNDS; diff --git a/src/chgpasswd.c b/src/chgpasswd.c index 71829868ed..3c1ebce541 100644 --- a/src/chgpasswd.c +++ b/src/chgpasswd.c @@ -114,8 +114,7 @@ usage (int status) Prog); (void) fprintf (usageout, _(" -c, --crypt-method METHOD the crypt method (one of %s)\n"), - "NONE DES MD5" - " SHA256 SHA512" + "NONE SHA256 SHA512" #if defined(USE_BCRYPT) " BCRYPT" #endif @@ -231,9 +230,7 @@ static void check_flags (void) } if (cflg) { - if ( !streq(crypt_method, "DES") - && !streq(crypt_method, "MD5") - && !streq(crypt_method, "NONE") + if ( !streq(crypt_method, "NONE") && !streq(crypt_method, "SHA256") && !streq(crypt_method, "SHA512") #ifdef USE_BCRYPT diff --git a/src/chpasswd.c b/src/chpasswd.c index 1bff211ecb..3021c03ea5 100644 --- a/src/chpasswd.c +++ b/src/chpasswd.c @@ -116,8 +116,7 @@ usage (int status) Prog); (void) fprintf (usageout, _(" -c, --crypt-method METHOD the crypt method (one of %s)\n"), - "NONE DES MD5" - " SHA256 SHA512" + "NONE SHA256 SHA512" #if defined(USE_BCRYPT) " BCRYPT" #endif @@ -232,9 +231,7 @@ static void check_flags (void) } if (cflg) { - if ((!IS_CRYPT_METHOD("DES")) - &&(!IS_CRYPT_METHOD("MD5")) - &&(!IS_CRYPT_METHOD("NONE")) + if (!IS_CRYPT_METHOD("NONE") &&(!IS_CRYPT_METHOD("SHA256")) &&(!IS_CRYPT_METHOD("SHA512")) #ifdef USE_BCRYPT diff --git a/src/newusers.c b/src/newusers.c index 853218fd3e..a9bd0c9de3 100644 --- a/src/newusers.c +++ b/src/newusers.c @@ -129,8 +129,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" - " SHA256 SHA512" + "NONE SHA256 SHA512" #if defined(USE_BCRYPT) " BCRYPT" #endif @@ -733,9 +732,7 @@ static void check_flags (void) } if (cflg) { - if ( !streq(crypt_method, "DES") - && !streq(crypt_method, "MD5") - && !streq(crypt_method, "NONE") + if ( !streq(crypt_method, "NONE") && !streq(crypt_method, "SHA256") && !streq(crypt_method, "SHA512") #ifdef USE_BCRYPT diff --git a/src/passwd.c b/src/passwd.c index 103393382b..c5226be98f 100644 --- a/src/passwd.c +++ b/src/passwd.c @@ -245,20 +245,10 @@ static int new_password (const struct passwd *pw) * tests. This provides an escape for initial login passwords. */ if (!qflg && !sflg) { - int pass_max_len, pass_min_len; - - obscure_get_range(&pass_min_len, &pass_max_len); - if (pass_max_len == -1) { - (void) printf (_( -"Enter the new password (minimum of %d characters)\n" -"Please use a combination of upper and lower case letters and numbers.\n"), - pass_min_len); - } else { - (void) printf (_( -"Enter the new password (minimum of %d, maximum of %d characters)\n" + printf(_( +"Enter the new password (minimum of %zu characters)\n" "Please use a combination of upper and lower case letters and numbers.\n"), - pass_min_len, pass_max_len); - } + pass_min_len()); } if (sflg) { diff --git a/tests/chage/15_chage-I_no_shadow_entry/config/etc/login.defs b/tests/chage/15_chage-I_no_shadow_entry/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/15_chage-I_no_shadow_entry/config/etc/login.defs +++ b/tests/chage/15_chage-I_no_shadow_entry/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/16_chage-m_no_shadow_entry/config/etc/login.defs b/tests/chage/16_chage-m_no_shadow_entry/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/16_chage-m_no_shadow_entry/config/etc/login.defs +++ b/tests/chage/16_chage-m_no_shadow_entry/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/17_chage-M_no_shadow_entry/config/etc/login.defs b/tests/chage/17_chage-M_no_shadow_entry/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/17_chage-M_no_shadow_entry/config/etc/login.defs +++ b/tests/chage/17_chage-M_no_shadow_entry/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/18_chage-d_no_shadow_entry/config/etc/login.defs b/tests/chage/18_chage-d_no_shadow_entry/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/18_chage-d_no_shadow_entry/config/etc/login.defs +++ b/tests/chage/18_chage-d_no_shadow_entry/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/19_chage-W_no_shadow_entry/config/etc/login.defs b/tests/chage/19_chage-W_no_shadow_entry/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/19_chage-W_no_shadow_entry/config/etc/login.defs +++ b/tests/chage/19_chage-W_no_shadow_entry/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/20_chage-E_no_shadow_entry/config/etc/login.defs b/tests/chage/20_chage-E_no_shadow_entry/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/20_chage-E_no_shadow_entry/config/etc/login.defs +++ b/tests/chage/20_chage-E_no_shadow_entry/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/25_chage_interactive/config/etc/login.defs b/tests/chage/25_chage_interactive/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/25_chage_interactive/config/etc/login.defs +++ b/tests/chage/25_chage_interactive/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/26_chage_interactive_date_0/config/etc/login.defs b/tests/chage/26_chage_interactive_date_0/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/26_chage_interactive_date_0/config/etc/login.defs +++ b/tests/chage/26_chage_interactive_date_0/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/27_chage_interactive_date_-1/config/etc/login.defs b/tests/chage/27_chage_interactive_date_-1/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/27_chage_interactive_date_-1/config/etc/login.defs +++ b/tests/chage/27_chage_interactive_date_-1/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/28_chage_interactive_date_EPOCH/config/etc/login.defs b/tests/chage/28_chage_interactive_date_EPOCH/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/28_chage_interactive_date_EPOCH/config/etc/login.defs +++ b/tests/chage/28_chage_interactive_date_EPOCH/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/login.defs b/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/login.defs +++ b/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/login.defs b/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/login.defs +++ b/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/31_chage_interactive_date_invalid/config/etc/login.defs b/tests/chage/31_chage_interactive_date_invalid/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/31_chage_interactive_date_invalid/config/etc/login.defs +++ b/tests/chage/31_chage_interactive_date_invalid/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/32_chage_interactive_date_invalid2/config/etc/login.defs b/tests/chage/32_chage_interactive_date_invalid2/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/32_chage_interactive_date_invalid2/config/etc/login.defs +++ b/tests/chage/32_chage_interactive_date_invalid2/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/33_chage_interactive-W_invalid1/config/etc/login.defs b/tests/chage/33_chage_interactive-W_invalid1/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/33_chage_interactive-W_invalid1/config/etc/login.defs +++ b/tests/chage/33_chage_interactive-W_invalid1/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/34_chage_interactive-W_invalid2/config/etc/login.defs b/tests/chage/34_chage_interactive-W_invalid2/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/34_chage_interactive-W_invalid2/config/etc/login.defs +++ b/tests/chage/34_chage_interactive-W_invalid2/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/35_chage_interactive-W-1/config/etc/login.defs b/tests/chage/35_chage_interactive-W-1/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/35_chage_interactive-W-1/config/etc/login.defs +++ b/tests/chage/35_chage_interactive-W-1/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/36_chage_interactive-I_invalid1/config/etc/login.defs b/tests/chage/36_chage_interactive-I_invalid1/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/36_chage_interactive-I_invalid1/config/etc/login.defs +++ b/tests/chage/36_chage_interactive-I_invalid1/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/37_chage_interactive-I_invalid2/config/etc/login.defs b/tests/chage/37_chage_interactive-I_invalid2/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/37_chage_interactive-I_invalid2/config/etc/login.defs +++ b/tests/chage/37_chage_interactive-I_invalid2/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/38_chage_interactive-I-1/config/etc/login.defs b/tests/chage/38_chage_interactive-I-1/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/38_chage_interactive-I-1/config/etc/login.defs +++ b/tests/chage/38_chage_interactive-I-1/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chage/39_chage_interactive-d-1/config/etc/login.defs b/tests/chage/39_chage_interactive-d-1/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/chage/39_chage_interactive-d-1/config/etc/login.defs +++ b/tests/chage/39_chage_interactive-d-1/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/chage/01_chage--root/config_chroot/etc/login.defs b/tests/chroot/chage/01_chage--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/chage/01_chage--root/config_chroot/etc/login.defs +++ b/tests/chroot/chage/01_chage--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/login.defs b/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/login.defs +++ b/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/login.defs b/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/login.defs +++ b/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/login.defs b/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/login.defs +++ b/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/chsh/01_chsh--root/config_chroot/etc/login.defs b/tests/chroot/chsh/01_chsh--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/chsh/01_chsh--root/config_chroot/etc/login.defs +++ b/tests/chroot/chsh/01_chsh--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/login.defs b/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/login.defs +++ b/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/login.defs b/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/login.defs +++ b/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/login.defs b/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/login.defs +++ b/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/login.defs b/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/login.defs +++ b/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/grpck/01_grpck--root/config_chroot/etc/login.defs b/tests/chroot/grpck/01_grpck--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/grpck/01_grpck--root/config_chroot/etc/login.defs +++ b/tests/chroot/grpck/01_grpck--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/login.defs b/tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/login.defs +++ b/tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/login.defs b/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/login.defs +++ b/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/login.defs b/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/login.defs +++ b/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/login/01_login_sublogin/config/etc/login.defs b/tests/chroot/login/01_login_sublogin/config/etc/login.defs index b975cad8a6..8f2ff0c3d9 100644 --- a/tests/chroot/login/01_login_sublogin/config/etc/login.defs +++ b/tests/chroot/login/01_login_sublogin/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/login/01_login_sublogin/config_chroot/etc/login.defs b/tests/chroot/login/01_login_sublogin/config_chroot/etc/login.defs index b975cad8a6..8f2ff0c3d9 100644 --- a/tests/chroot/login/01_login_sublogin/config_chroot/etc/login.defs +++ b/tests/chroot/login/01_login_sublogin/config_chroot/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/pwck/01_pwck--root/config_chroot/etc/login.defs b/tests/chroot/pwck/01_pwck--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/pwck/01_pwck--root/config_chroot/etc/login.defs +++ b/tests/chroot/pwck/01_pwck--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/login.defs b/tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/login.defs +++ b/tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/login.defs b/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/login.defs +++ b/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/useradd/01_useradd--root/config_chroot/etc/login.defs b/tests/chroot/useradd/01_useradd--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/useradd/01_useradd--root/config_chroot/etc/login.defs +++ b/tests/chroot/useradd/01_useradd--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/login.defs b/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/login.defs index d93373961f..aa6839493e 100644 --- a/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/login.defs +++ b/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/login.defs b/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/login.defs +++ b/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/login.defs b/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/login.defs +++ b/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/login.defs b/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/login.defs +++ b/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/userdel/01_userdel--root/config_chroot/etc/login.defs b/tests/chroot/userdel/01_userdel--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/userdel/01_userdel--root/config_chroot/etc/login.defs +++ b/tests/chroot/userdel/01_userdel--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/chroot/usermod/01_usermod--root/config_chroot/etc/login.defs b/tests/chroot/usermod/01_usermod--root/config_chroot/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/chroot/usermod/01_usermod--root/config_chroot/etc/login.defs +++ b/tests/chroot/usermod/01_usermod--root/config_chroot/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/crypt/login.defs_DES/01_chpasswd.test b/tests/crypt/login.defs_DES/01_chpasswd.test deleted file mode 100755 index d583517095..0000000000 --- a/tests/crypt/login.defs_DES/01_chpasswd.test +++ /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 index 101239088b..0000000000 --- a/tests/crypt/login.defs_DES/01_chpasswd/group +++ /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 index ae42486590..0000000000 --- a/tests/crypt/login.defs_DES/01_chpasswd/gshadow +++ /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 index 43fc135a40..0000000000 --- a/tests/crypt/login.defs_DES/01_chpasswd/passwd +++ /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 index 7607cc6e5f..0000000000 --- a/tests/crypt/login.defs_DES/01_chpasswd/shadow +++ /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 index 2ae3f3b065..0000000000 --- a/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5.test +++ /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 index 101239088b..0000000000 --- a/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/group +++ /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 index ae42486590..0000000000 --- a/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/gshadow +++ /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 index 43fc135a40..0000000000 --- a/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/passwd +++ /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 index 43fc135a40..0000000000 --- a/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/passwd.new +++ /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 index 658661b314..0000000000 --- a/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/shadow +++ /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 index 98488282c1..0000000000 --- a/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES.test +++ /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 index 101239088b..0000000000 --- a/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/group +++ /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 index ae42486590..0000000000 --- a/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/gshadow +++ /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 index 43fc135a40..0000000000 --- a/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/passwd +++ /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 index 7607cc6e5f..0000000000 --- a/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/shadow +++ /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 index 4c4f18a120..0000000000 --- a/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE.test +++ /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 index 101239088b..0000000000 --- a/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/group +++ /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 index ae42486590..0000000000 --- a/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/gshadow +++ /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 index 43fc135a40..0000000000 --- a/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/passwd +++ /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 index d2bde3beb5..0000000000 --- a/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/shadow +++ /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 index fdac6ae09c..0000000000 --- a/tests/crypt/login.defs_DES/05_chpasswd-e.test +++ /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 index 101239088b..0000000000 --- a/tests/crypt/login.defs_DES/05_chpasswd-e/group +++ /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 index ae42486590..0000000000 --- a/tests/crypt/login.defs_DES/05_chpasswd-e/gshadow +++ /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 index 43fc135a40..0000000000 --- a/tests/crypt/login.defs_DES/05_chpasswd-e/passwd +++ /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 index d2bde3beb5..0000000000 --- a/tests/crypt/login.defs_DES/05_chpasswd-e/shadow +++ /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 index 5b7a07327c..0000000000 --- a/tests/crypt/login.defs_DES/07_chgpasswd.test +++ /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 index 101239088b..0000000000 --- a/tests/crypt/login.defs_DES/07_chgpasswd/group +++ /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 index 53dba5ebd7..0000000000 --- a/tests/crypt/login.defs_DES/07_chgpasswd/gshadow +++ /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 index 43fc135a40..0000000000 --- a/tests/crypt/login.defs_DES/07_chgpasswd/passwd +++ /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 index 5f50d1873b..0000000000 --- a/tests/crypt/login.defs_DES/07_chgpasswd/shadow +++ /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 index 405e8b235b..0000000000 --- a/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5.test +++ /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 index 101239088b..0000000000 --- a/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/group +++ /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 index a709bcbe7a..0000000000 --- a/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/gshadow +++ /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 index 43fc135a40..0000000000 --- a/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/passwd +++ /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 index 5f50d1873b..0000000000 --- a/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/shadow +++ /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 index 1553e003db..0000000000 --- a/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES.test +++ /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 index 101239088b..0000000000 --- a/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/group +++ /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 index 53dba5ebd7..0000000000 --- a/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/gshadow +++ /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 index 43fc135a40..0000000000 --- a/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/passwd +++ /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 index 5f50d1873b..0000000000 --- a/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/shadow +++ /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 index a010de2260..0000000000 --- a/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE.test +++ /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 index 101239088b..0000000000 --- a/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/group +++ /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 index a8f0af9791..0000000000 --- a/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/gshadow +++ /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 index 43fc135a40..0000000000 --- a/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/passwd +++ /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 index 5f50d1873b..0000000000 --- a/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/shadow +++ /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 index 6b801c1fac..0000000000 --- a/tests/crypt/login.defs_DES/11_chgpasswd-e.test +++ /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 index 101239088b..0000000000 --- a/tests/crypt/login.defs_DES/11_chgpasswd-e/group +++ /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 index a8f0af9791..0000000000 --- a/tests/crypt/login.defs_DES/11_chgpasswd-e/gshadow +++ /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 index 43fc135a40..0000000000 --- a/tests/crypt/login.defs_DES/11_chgpasswd-e/passwd +++ /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 index 5f50d1873b..0000000000 --- a/tests/crypt/login.defs_DES/11_chgpasswd-e/shadow +++ /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 index 101239088b..0000000000 --- a/tests/crypt/login.defs_DES/config/etc/group +++ /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 index ae42486590..0000000000 --- a/tests/crypt/login.defs_DES/config/etc/gshadow +++ /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 index bbd7adac0c..0000000000 --- a/tests/crypt/login.defs_DES/config/etc/login.defs +++ /dev/null @@ -1,306 +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_MIN_DAYS Minimum number of days allowed between password changes. -# PASS_WARN_AGE Number of days warning given before a password expires. -# -PASS_MAX_DAYS 99999 -PASS_MIN_DAYS 0 -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 index 43fc135a40..0000000000 --- a/tests/crypt/login.defs_DES/config/etc/passwd +++ /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 index 5f50d1873b..0000000000 --- a/tests/crypt/login.defs_DES/config/etc/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/crypt/login.defs_MD5/01_chpasswd.test b/tests/crypt/login.defs_MD5/01_chpasswd.test deleted file mode 100755 index d583517095..0000000000 --- a/tests/crypt/login.defs_MD5/01_chpasswd.test +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "Add a new user" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo -n "Create user test1 (useradd test1)..." -echo nobody:test | chpasswd -echo "OK" - -echo -n "Check the passwd file..." -../../common/compare_file.pl 01_chpasswd/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl 01_chpasswd/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl 01_chpasswd/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl 01_chpasswd/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/crypt/login.defs_MD5/01_chpasswd/group b/tests/crypt/login.defs_MD5/01_chpasswd/group deleted file mode 100644 index 101239088b..0000000000 --- a/tests/crypt/login.defs_MD5/01_chpasswd/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/crypt/login.defs_MD5/01_chpasswd/gshadow b/tests/crypt/login.defs_MD5/01_chpasswd/gshadow deleted file mode 100644 index ae42486590..0000000000 --- a/tests/crypt/login.defs_MD5/01_chpasswd/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/crypt/login.defs_MD5/01_chpasswd/passwd b/tests/crypt/login.defs_MD5/01_chpasswd/passwd deleted file mode 100644 index 43fc135a40..0000000000 --- a/tests/crypt/login.defs_MD5/01_chpasswd/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/crypt/login.defs_MD5/01_chpasswd/shadow b/tests/crypt/login.defs_MD5/01_chpasswd/shadow deleted file mode 100644 index 658661b314..0000000000 --- a/tests/crypt/login.defs_MD5/01_chpasswd/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:@PASS_MD5 test@:@TODAY@:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/crypt/login.defs_MD5/02_chgpasswd.test b/tests/crypt/login.defs_MD5/02_chgpasswd.test deleted file mode 100755 index c102e8908f..0000000000 --- a/tests/crypt/login.defs_MD5/02_chgpasswd.test +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "Change a group password" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo -n "echo nogroup:test | chgpasswd..." -echo nogroup:test | chgpasswd -echo "OK" - -echo -n "Check the passwd file..." -../../common/compare_file.pl 02_chgpasswd/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl 02_chgpasswd/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl 02_chgpasswd/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl 02_chgpasswd/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/crypt/login.defs_MD5/02_chgpasswd/group b/tests/crypt/login.defs_MD5/02_chgpasswd/group deleted file mode 100644 index 101239088b..0000000000 --- a/tests/crypt/login.defs_MD5/02_chgpasswd/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/crypt/login.defs_MD5/02_chgpasswd/gshadow b/tests/crypt/login.defs_MD5/02_chgpasswd/gshadow deleted file mode 100644 index a709bcbe7a..0000000000 --- a/tests/crypt/login.defs_MD5/02_chgpasswd/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:@PASS_MD5 test@:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/crypt/login.defs_MD5/02_chgpasswd/passwd b/tests/crypt/login.defs_MD5/02_chgpasswd/passwd deleted file mode 100644 index 43fc135a40..0000000000 --- a/tests/crypt/login.defs_MD5/02_chgpasswd/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/crypt/login.defs_MD5/02_chgpasswd/shadow b/tests/crypt/login.defs_MD5/02_chgpasswd/shadow deleted file mode 100644 index 5f50d1873b..0000000000 --- a/tests/crypt/login.defs_MD5/02_chgpasswd/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/crypt/login.defs_MD5/config/etc/group b/tests/crypt/login.defs_MD5/config/etc/group deleted file mode 100644 index 101239088b..0000000000 --- a/tests/crypt/login.defs_MD5/config/etc/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/crypt/login.defs_MD5/config/etc/gshadow b/tests/crypt/login.defs_MD5/config/etc/gshadow deleted file mode 100644 index ae42486590..0000000000 --- a/tests/crypt/login.defs_MD5/config/etc/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/crypt/login.defs_MD5/config/etc/login.defs b/tests/crypt/login.defs_MD5/config/etc/login.defs deleted file mode 100644 index 979f672084..0000000000 --- a/tests/crypt/login.defs_MD5/config/etc/login.defs +++ /dev/null @@ -1,306 +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_MIN_DAYS Minimum number of days allowed between password changes. -# PASS_WARN_AGE Number of days warning given before a password expires. -# -PASS_MAX_DAYS 99999 -PASS_MIN_DAYS 0 -PASS_WARN_AGE 7 - -# -# Min/max values for automatic uid selection in useradd -# -UID_MIN 1000 -UID_MAX 60000 - -# -# Min/max values for automatic gid selection in groupadd -# -GID_MIN 100 -GID_MAX 60000 - -# -# Max number of login retries if password is bad. This will most likely be -# overridden by PAM, since the default pam_unix module has it's own built -# in of 3 retries. However, this is a safe fallback in case you are using -# an authentication module that does not enforce PAM_MAXTRIES. -# -LOGIN_RETRIES 5 - -# -# Max time in seconds for login -# -LOGIN_TIMEOUT 60 - -# -# Which fields may be changed by regular users using chfn - use -# any combination of letters "frwh" (full name, room number, work -# phone, home phone). If not defined, no changes are allowed. -# For backward compatibility, "yes" = "rwh" and "no" = "frwh". -# -CHFN_RESTRICT rwh - -# -# Should login be allowed if we can't cd to the home directory? -# Default is no. -# -DEFAULT_HOME yes - -# -# If defined, this command is run when removing a user. -# It should remove any at/cron/print jobs etc. owned by -# the user to be removed (passed as the first argument). -# -#USERDEL_CMD /usr/sbin/userdel_local - -# -# This enables userdel to remove user groups if no members exist. -# -# Other former uses of this variable such as setting the umask when -# user==primary group are not used in PAM environments, thus in Debian -# -USERGROUPS_ENAB yes - -# -# Instead of the real user shell, the program specified by this parameter -# will be launched, although its visible name (argv[0]) will be the shell's. -# The program may do whatever it wants (logging, additional authentification, -# banner, ...) before running the actual shell. -# -# FAKE_SHELL /bin/fakeshell - -# -# If defined, either full pathname of a file containing device names or -# a ":" delimited list of device names. Root logins will be allowed only -# upon these devices. -# -# This variable is used by login and su. -# -#CONSOLE /etc/consoles -#CONSOLE console:tty01:tty02:tty03:tty04 - -# -# List of groups to add to the user's supplementary group set -# when logging in on the console (as determined by the CONSOLE -# setting). Default is none. -# -# Use with caution - it is possible for users to gain permanent -# access to these groups, even when not logged in on the console. -# How to do it is left as an exercise for the reader... -# -# This variable is used by login and su. -# -#CONSOLE_GROUPS floppy:audio:cdrom - -ENCRYPT_METHOD MD5 -#SHA_CRYPT_MIN_ROUNDS 5000 -#SHA_CRYPT_MAX_ROUNDS 5000 - -################# OBSOLETED BY PAM ############## -# # -# These options are now handled by PAM. Please # -# edit the appropriate file in /etc/pam.d/ to # -# enable the equivalents of them. -# -############### - -#MOTD_FILE -#DIALUPS_CHECK_ENAB -#LASTLOG_ENAB -#MAIL_CHECK_ENAB -#OBSCURE_CHECKS_ENAB -#PORTTIME_CHECKS_ENAB -#SU_WHEEL_ONLY -#PASS_CHANGE_TRIES -#PASS_ALWAYS_WARN -#ENVIRON_FILE -#NOLOGINS_FILE -#ISSUE_FILE -#PASS_MIN_LEN -#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_MD5/config/etc/passwd b/tests/crypt/login.defs_MD5/config/etc/passwd deleted file mode 100644 index 43fc135a40..0000000000 --- a/tests/crypt/login.defs_MD5/config/etc/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/crypt/login.defs_MD5/config/etc/shadow b/tests/crypt/login.defs_MD5/config/etc/shadow deleted file mode 100644 index 5f50d1873b..0000000000 --- a/tests/crypt/login.defs_MD5/config/etc/shadow +++ /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_SHA256-round-max/config/etc/login.defs b/tests/crypt/login.defs_SHA256-round-max/config/etc/login.defs index 436aa6cbbd..d52c988a5e 100644 --- a/tests/crypt/login.defs_SHA256-round-max/config/etc/login.defs +++ b/tests/crypt/login.defs_SHA256-round-max/config/etc/login.defs @@ -281,7 +281,6 @@ SHA_CRYPT_MAX_ROUNDS 7000 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/crypt/login.defs_SHA256-round-min-max/config/etc/login.defs b/tests/crypt/login.defs_SHA256-round-min-max/config/etc/login.defs index 1c014696e9..c433bd67c3 100644 --- a/tests/crypt/login.defs_SHA256-round-min-max/config/etc/login.defs +++ b/tests/crypt/login.defs_SHA256-round-min-max/config/etc/login.defs @@ -281,7 +281,6 @@ SHA_CRYPT_MAX_ROUNDS 10000 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/crypt/login.defs_SHA256-round-min/config/etc/login.defs b/tests/crypt/login.defs_SHA256-round-min/config/etc/login.defs index 5f6eb59135..e3ba604d8e 100644 --- a/tests/crypt/login.defs_SHA256-round-min/config/etc/login.defs +++ b/tests/crypt/login.defs_SHA256-round-min/config/etc/login.defs @@ -281,7 +281,6 @@ SHA_CRYPT_MIN_ROUNDS 2000 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/crypt/login.defs_SHA256/config/etc/login.defs b/tests/crypt/login.defs_SHA256/config/etc/login.defs index 59d995a311..6952a68d44 100644 --- a/tests/crypt/login.defs_SHA256/config/etc/login.defs +++ b/tests/crypt/login.defs_SHA256/config/etc/login.defs @@ -281,7 +281,6 @@ ENCRYPT_METHOD SHA256 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/crypt/login.defs_SHA512/config/etc/login.defs b/tests/crypt/login.defs_SHA512/config/etc/login.defs index c4c5bb14e8..59f84548e4 100644 --- a/tests/crypt/login.defs_SHA512/config/etc/login.defs +++ b/tests/crypt/login.defs_SHA512/config/etc/login.defs @@ -281,7 +281,6 @@ ENCRYPT_METHOD SHA512 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/crypt/login.defs_none/config/etc/login.defs b/tests/crypt/login.defs_none/config/etc/login.defs index bdd1619ef3..56741af4e9 100644 --- a/tests/crypt/login.defs_none/config/etc/login.defs +++ b/tests/crypt/login.defs_none/config/etc/login.defs @@ -256,7 +256,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 @@ -281,7 +281,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/login.defs b/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/login.defs +++ b/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/login.defs b/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/login.defs +++ b/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/login.defs b/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/login.defs +++ b/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/login.defs b/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/login.defs +++ b/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/login.defs b/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/login.defs +++ b/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/login.defs b/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/login.defs +++ b/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/login.defs b/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/login.defs +++ b/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/login.defs b/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/login.defs +++ b/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/login.defs b/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/login.defs +++ b/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/login.defs b/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/login.defs +++ b/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/login.defs b/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/login.defs +++ b/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/login.defs b/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/login.defs +++ b/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/login.defs b/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/login.defs +++ b/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/login.defs b/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/login.defs +++ b/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/login.defs b/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/login.defs +++ b/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/login.defs b/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/login.defs +++ b/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/login.defs b/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/login.defs +++ b/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/login.defs b/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/login.defs +++ b/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/login.defs b/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/login.defs +++ b/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/login.defs b/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/login.defs +++ b/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/login.defs b/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/login.defs +++ b/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/login.defs b/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/login.defs +++ b/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/login.defs b/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/login.defs +++ b/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/login.defs b/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/login.defs +++ b/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/login.defs b/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/login.defs +++ b/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/login.defs b/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/login.defs +++ b/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/login.defs b/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/login.defs +++ b/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/login.defs b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/login.defs +++ b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/login.defs b/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/login.defs +++ b/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/login.defs b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/login.defs +++ b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/login.defs b/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/login.defs +++ b/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/login.defs b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/login.defs +++ b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/login.defs b/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/login.defs +++ b/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/login.defs b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/login.defs +++ b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/login.defs b/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/login.defs +++ b/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/login.defs b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/login.defs +++ b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/login.defs b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/login.defs +++ b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/login.defs b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/login.defs +++ b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/login.defs b/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/login.defs +++ b/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/login.defs b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/login.defs +++ b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/login.defs b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/login.defs +++ b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/login.defs b/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/login.defs +++ b/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/login.defs b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/login.defs +++ b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/login.defs b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/login.defs +++ b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/login.defs b/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/login.defs +++ b/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/grpck/02_grpck_group_open_failure/config/etc/login.defs b/tests/failures/grpck/02_grpck_group_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/grpck/02_grpck_group_open_failure/config/etc/login.defs +++ b/tests/failures/grpck/02_grpck_group_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/login.defs b/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/login.defs +++ b/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/login.defs b/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/login.defs +++ b/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/login.defs b/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/login.defs +++ b/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/login.defs b/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/login.defs +++ b/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/login.defs b/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/login.defs +++ b/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/login.defs b/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/login.defs +++ b/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/login.defs b/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/login.defs +++ b/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/login.defs b/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/login.defs +++ b/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/login.defs b/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/login.defs +++ b/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/login.defs b/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/login.defs +++ b/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/login.defs b/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/login.defs +++ b/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/login.defs b/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/login.defs +++ b/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/login.defs b/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/login.defs +++ b/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/login.defs b/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/login.defs +++ b/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/newusers/03_newusers_open_group_failure/config/etc/login.defs b/tests/failures/newusers/03_newusers_open_group_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/newusers/03_newusers_open_group_failure/config/etc/login.defs +++ b/tests/failures/newusers/03_newusers_open_group_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/login.defs b/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/login.defs +++ b/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/login.defs b/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/login.defs +++ b/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/login.defs b/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/login.defs +++ b/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/login.defs b/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/login.defs +++ b/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/login.defs b/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/login.defs +++ b/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/login.defs b/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/login.defs +++ b/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/login.defs b/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/login.defs +++ b/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/login.defs b/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/login.defs +++ b/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/login.defs b/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/login.defs +++ b/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/login.defs b/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/login.defs +++ b/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/login.defs b/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/login.defs +++ b/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/login.defs b/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/login.defs +++ b/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/login.defs b/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/login.defs +++ b/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/login.defs b/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/login.defs +++ b/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/login.defs b/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/login.defs +++ b/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/login.defs b/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/login.defs +++ b/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/useradd/03_useradd_open_group_failure/config/etc/login.defs b/tests/failures/useradd/03_useradd_open_group_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/useradd/03_useradd_open_group_failure/config/etc/login.defs +++ b/tests/failures/useradd/03_useradd_open_group_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/login.defs b/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/login.defs +++ b/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/login.defs b/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/login.defs +++ b/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/login.defs b/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/login.defs +++ b/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/login.defs b/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/login.defs +++ b/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/login.defs b/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/login.defs +++ b/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/login.defs b/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/login.defs +++ b/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/login.defs b/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/login.defs +++ b/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/login.defs b/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/login.defs +++ b/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/login.defs b/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/login.defs +++ b/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/login.defs b/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/login.defs +++ b/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/login.defs b/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/login.defs +++ b/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/login.defs b/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/login.defs +++ b/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/login.defs b/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/login.defs +++ b/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/login.defs b/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/login.defs +++ b/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/login.defs b/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/login.defs +++ b/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/login.defs b/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/login.defs +++ b/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/login.defs b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/login.defs +++ b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/login.defs b/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/login.defs +++ b/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/login.defs b/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/login.defs +++ b/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/login.defs b/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/login.defs +++ b/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/userdel/10_userdel_open_group_failure/config/etc/login.defs b/tests/failures/userdel/10_userdel_open_group_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/userdel/10_userdel_open_group_failure/config/etc/login.defs +++ b/tests/failures/userdel/10_userdel_open_group_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/login.defs b/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/login.defs +++ b/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/login.defs b/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/login.defs +++ b/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/login.defs b/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/login.defs +++ b/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/login.defs b/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/login.defs +++ b/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/login.defs b/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/login.defs +++ b/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/login.defs b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/login.defs +++ b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/login.defs b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/login.defs +++ b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/login.defs b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/login.defs +++ b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/login.defs b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/login.defs +++ b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/login.defs b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/login.defs +++ b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/login.defs b/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/login.defs +++ b/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/login.defs b/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/login.defs +++ b/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/login.defs b/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/login.defs +++ b/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/login.defs b/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/login.defs +++ b/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/login.defs b/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/login.defs +++ b/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/login.defs b/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/login.defs +++ b/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/login.defs b/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/login.defs +++ b/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/login.defs b/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/login.defs +++ b/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/login.defs b/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/login.defs +++ b/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/login.defs b/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/login.defs +++ b/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/login.defs b/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/login.defs +++ b/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/login.defs b/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/login.defs index bbd7adac0c..59f84548e4 100644 --- a/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/login.defs +++ b/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/login.defs @@ -256,7 +256,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 @@ -281,7 +281,6 @@ ENCRYPT_METHOD DES #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/login.defs b/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/login.defs index bbd7adac0c..59f84548e4 100644 --- a/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/login.defs +++ b/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/login.defs @@ -256,7 +256,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 @@ -281,7 +281,6 @@ ENCRYPT_METHOD DES #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/login.defs b/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/login.defs index bbd7adac0c..59f84548e4 100644 --- a/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/login.defs +++ b/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/login.defs @@ -256,7 +256,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 @@ -281,7 +281,6 @@ ENCRYPT_METHOD DES #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/login.defs b/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/login.defs index bbd7adac0c..59f84548e4 100644 --- a/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/login.defs +++ b/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/login.defs @@ -256,7 +256,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 @@ -281,7 +281,6 @@ ENCRYPT_METHOD DES #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/login.defs b/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/login.defs index bbd7adac0c..59f84548e4 100644 --- a/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/login.defs +++ b/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/login.defs @@ -256,7 +256,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 @@ -281,7 +281,6 @@ ENCRYPT_METHOD DES #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/chgpasswd/06_chgpasswd_usage/data/usage.out b/tests/grouptools/chgpasswd/06_chgpasswd_usage/data/usage.out index 94fdba7cd9..39a057ef52 100644 --- a/tests/grouptools/chgpasswd/06_chgpasswd_usage/data/usage.out +++ b/tests/grouptools/chgpasswd/06_chgpasswd_usage/data/usage.out @@ -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 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/07_chgpasswd_usage_bad_option/data/usage.out b/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/data/usage.out index 5a1d3aea69..70407c1db7 100644 --- a/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/data/usage.out +++ b/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/data/usage.out @@ -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 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/09_chgpasswd_usage-e-c_exclusive/data/usage.out b/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/data/usage.out index b9205b78e7..972a3a2bd7 100644 --- a/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/data/usage.out +++ b/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/data/usage.out @@ -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 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/11_chgpasswd_usage-s_without-c/chgpasswd.test b/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/chgpasswd.test index 293e93253d..81fc7f8f84 100755 --- a/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/chgpasswd.test +++ b/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/chgpasswd.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "Password must use md5 and another method (chgpasswd --sha-rounds 12)..." +echo -n "Password hashing method (chgpasswd --sha-rounds 12)..." echo 'nobody:test' | chgpasswd --sha-rounds 12 2>tmp/usage.out && exit 1 || { status=$? } diff --git a/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/data/usage.out b/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/data/usage.out index eac04c9d4d..f74595df02 100644 --- a/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/data/usage.out +++ b/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/data/usage.out @@ -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 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/12_chgpasswd_usage-s_invalid/chgpasswd.test b/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/chgpasswd.test index ebfcde6b5f..a447f60179 100755 --- a/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/chgpasswd.test +++ b/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/chgpasswd.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "Password must use md5 and another method (chgpasswd --sha-rounds 12foo -c SHA512)..." +echo -n "Password hashing method (chgpasswd --sha-rounds 12foo -c SHA512)..." echo 'nobody:test' | chgpasswd --sha-rounds 12foo -c SHA512 2>tmp/usage.out && exit 1 || { status=$? } diff --git a/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/data/usage.out b/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/data/usage.out index 4bc1e84d96..b25b65cabb 100644 --- a/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/data/usage.out +++ b/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/data/usage.out @@ -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 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/13_chgpasswd_usage-c_invalid/chgpasswd.test b/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/chgpasswd.test index 8cff29b2e9..3312b8b2ad 100755 --- a/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/chgpasswd.test +++ b/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/chgpasswd.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "Password must use md5 and another method (chgpasswd --crypt-method SHA513)..." +echo -n "Password hashing method (chgpasswd --crypt-method SHA513)..." echo 'nobody:test' | chgpasswd --crypt-method SHA513 2>tmp/usage.out && exit 1 || { status=$? } diff --git a/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/data/usage.out b/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/data/usage.out index 5d8aba385b..e44197be31 100644 --- a/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/data/usage.out +++ b/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/data/usage.out @@ -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 SHA256 SHA512) -e, --encrypted supplied passwords are encrypted -h, --help display this help message and exit -R, --root CHROOT_DIR directory to chroot into diff --git a/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/chgpasswd.test b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/chgpasswd.test deleted file mode 100755 index 920589b7f1..0000000000 --- a/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/chgpasswd.test +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../../common/config.sh -. ../../../common/log.sh - -log_start "$0" "chgpasswd can use create MD5 passwords" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo -n "Change nogroup and lp's password (chgpasswd --crypt-method MD5)..." -echo 'nogroup:test -lp:test2' | chgpasswd --crypt-method MD5 -echo "OK" - -echo -n "Check the passwd file..." -../../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../../common/compare_file.pl config/etc/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/group b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/group deleted file mode 100644 index 101239088b..0000000000 --- a/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/gshadow b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/gshadow deleted file mode 100644 index ae42486590..0000000000 --- a/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/passwd b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/passwd deleted file mode 100644 index 43fc135a40..0000000000 --- a/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/shadow b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/shadow deleted file mode 100644 index 5f50d1873b..0000000000 --- a/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/data/gshadow b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/data/gshadow deleted file mode 100644 index eea258edbb..0000000000 --- a/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:@PASS_MD5 test2@:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:@PASS_MD5 test@:: -crontab:x:: -Debian-exim:x:: 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 index bf504af58a..0000000000 --- a/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/chgpasswd.test +++ /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 index 101239088b..0000000000 --- a/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/group +++ /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 index ae42486590..0000000000 --- a/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/gshadow +++ /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 index 43fc135a40..0000000000 --- a/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/passwd +++ /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 index 5f50d1873b..0000000000 --- a/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/shadow +++ /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 index dcf1749dec..0000000000 --- a/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/data/gshadow +++ /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:: diff --git a/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/login.defs b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/login.defs index 9c4122f002..ea3f033500 100644 --- a/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/login.defs +++ b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/login.defs @@ -250,10 +250,8 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/login.defs b/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/login.defs index 9c4122f002..ea3f033500 100644 --- a/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/login.defs +++ b/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/login.defs @@ -250,10 +250,8 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/login.defs b/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/login.defs index 9c4122f002..ea3f033500 100644 --- a/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/login.defs +++ b/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/login.defs @@ -250,10 +250,8 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/login.defs b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/login.defs index 9c4122f002..ea3f033500 100644 --- a/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/login.defs +++ b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/login.defs @@ -250,10 +250,8 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/login.defs b/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/login.defs index 9c4122f002..ea3f033500 100644 --- a/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/login.defs +++ b/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/login.defs @@ -250,10 +250,8 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/login.defs b/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/login.defs index 46c26db30c..d777b601c8 100644 --- a/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/login.defs +++ b/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/login.defs b/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/login.defs index 46c26db30c..d777b601c8 100644 --- a/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/login.defs +++ b/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/login.defs b/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/login.defs +++ b/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/login.defs b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/login.defs index c220b78f20..95ca93b98d 100644 --- a/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/login.defs +++ b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/login.defs b/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/login.defs +++ b/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/login.defs b/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/login.defs +++ b/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/login.defs b/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/login.defs +++ b/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/login.defs b/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/login.defs +++ b/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/login.defs b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/login.defs +++ b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/login.defs b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/login.defs +++ b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/login.defs b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/login.defs index 6c8e47ec5c..b1259e9d70 100644 --- a/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/login.defs +++ b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/login.defs @@ -278,7 +278,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/login.defs b/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/login.defs index 5a7a736a02..4b80ef9bfb 100644 --- a/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/login.defs +++ b/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/login.defs b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/login.defs index 3b5d94796e..8cedc2ca34 100644 --- a/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/login.defs +++ b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/login.defs @@ -279,7 +279,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/login.defs b/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/login.defs +++ b/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/login.defs b/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/login.defs +++ b/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/login.defs b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/login.defs +++ b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/login.defs b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/login.defs +++ b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/login.defs b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/login.defs +++ b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/login.defs b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/login.defs +++ b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/login.defs b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/login.defs +++ b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/login.defs b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/login.defs +++ b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/login.defs b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/login.defs +++ b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/login.defs b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/login.defs +++ b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupdel/10_groupdel_usage/config/etc/login.defs b/tests/grouptools/groupdel/10_groupdel_usage/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupdel/10_groupdel_usage/config/etc/login.defs +++ b/tests/grouptools/groupdel/10_groupdel_usage/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/login.defs b/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/login.defs +++ b/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/login.defs b/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/login.defs +++ b/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/login.defs b/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/login.defs +++ b/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/login.defs b/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/login.defs +++ b/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/login.defs b/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/login.defs +++ b/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/login.defs b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/login.defs +++ b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/login.defs b/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/login.defs +++ b/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/login.defs b/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/login.defs +++ b/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/login.defs b/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/login.defs +++ b/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/login.defs b/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/login.defs +++ b/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/login.defs b/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/login.defs +++ b/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/login.defs b/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/login.defs +++ b/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/login.defs b/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/login.defs +++ b/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/login.defs b/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/login.defs +++ b/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/login.defs b/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/login.defs +++ b/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/login.defs b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/login.defs +++ b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/login.defs b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/login.defs +++ b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/login.defs b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/login.defs +++ b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/login.defs b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/login.defs +++ b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/login.defs b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/login.defs +++ b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/login.defs b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/login.defs +++ b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/login.defs b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/login.defs +++ b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/login.defs b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/login.defs +++ b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/login.defs b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/login.defs +++ b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/login.defs b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/login.defs +++ b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/login.defs b/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/login.defs +++ b/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/login.defs b/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/login.defs +++ b/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/login.defs b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/login.defs +++ b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/login.defs b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/login.defs +++ b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/login.defs b/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/login.defs +++ b/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/login.defs b/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/login.defs +++ b/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/login.defs b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/login.defs +++ b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/login.defs b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/login.defs +++ b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/login.defs b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/login.defs +++ b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/login.defs b/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/login.defs +++ b/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/login.defs b/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/login.defs +++ b/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/login.defs b/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/login.defs +++ b/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/login.defs b/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/login.defs +++ b/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/login.defs b/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/login.defs +++ b/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/login/01_login_prompt/config/etc/login.defs b/tests/login/01_login_prompt/config/etc/login.defs index b975cad8a6..8f2ff0c3d9 100644 --- a/tests/login/01_login_prompt/config/etc/login.defs +++ b/tests/login/01_login_prompt/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/login/02_login_user/config/etc/login.defs b/tests/login/02_login_user/config/etc/login.defs index b975cad8a6..8f2ff0c3d9 100644 --- a/tests/login/02_login_user/config/etc/login.defs +++ b/tests/login/02_login_user/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/login/03_login_check_tty/config/etc/login.defs b/tests/login/03_login_check_tty/config/etc/login.defs index b975cad8a6..8f2ff0c3d9 100644 --- a/tests/login/03_login_check_tty/config/etc/login.defs +++ b/tests/login/03_login_check_tty/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/newgidmap/01_newgidmap/config/etc/login.defs b/tests/newgidmap/01_newgidmap/config/etc/login.defs index e223664eb2..a2ac73426f 100644 --- a/tests/newgidmap/01_newgidmap/config/etc/login.defs +++ b/tests/newgidmap/01_newgidmap/config/etc/login.defs @@ -255,10 +255,8 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -304,7 +302,6 @@ ENCRYPT_METHOD SHA512 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/login.defs b/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/login.defs index 6cf104208f..ffc977136c 100644 --- a/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/login.defs +++ b/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/login.defs @@ -255,10 +255,8 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -305,7 +303,6 @@ GRANT_AUX_GROUP_SUBIDS yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/newuidmap/01_newuidmap/config/etc/login.defs b/tests/newuidmap/01_newuidmap/config/etc/login.defs index 602f6b7f1a..abe5fb5828 100644 --- a/tests/newuidmap/01_newuidmap/config/etc/login.defs +++ b/tests/newuidmap/01_newuidmap/config/etc/login.defs @@ -255,10 +255,8 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -306,7 +304,6 @@ ENCRYPT_METHOD SHA512 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/login.defs b/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/login.defs index 6cf104208f..ffc977136c 100644 --- a/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/login.defs +++ b/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/login.defs @@ -255,10 +255,8 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -305,7 +303,6 @@ GRANT_AUX_GROUP_SUBIDS yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/login.defs b/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/login.defs index cb1921ba53..ab0cd77747 100644 --- a/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/login.defs +++ b/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/login.defs b/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/login.defs index 2e194ac122..e85a2ac10b 100644 --- a/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/login.defs +++ b/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/config.txt b/tests/newusers/37_create_user_encrypt_MD5-PAM/config.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/group b/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/group deleted file mode 100644 index 101239088b..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/gshadow b/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/gshadow deleted file mode 100644 index ae42486590..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/common-password b/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/common-password deleted file mode 100644 index 07f3f1ded2..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/common-password +++ /dev/null @@ -1,33 +0,0 @@ -# -# /etc/pam.d/common-password - password-related modules common to all services -# -# This file is included from other service-specific PAM config files, -# and should contain a list of modules that define the services to be -# used to change user passwords. The default is pam_unix. - -# Explanation of pam_unix options: -# -# The "md5" option enables MD5 passwords. Without this option, the -# default is Unix crypt. -# -# The "obscure" option replaces the old `OBSCURE_CHECKS_ENAB' option in -# login.defs. -# -# See the pam_unix manpage for other options. - -# As of pam 1.0.1-6, this file is managed by pam-auth-update by default. -# To take advantage of this, it is recommended that you configure any -# local modules either before or after the default block, and use -# pam-auth-update to manage selection of other modules. See -# pam-auth-update(8) for details. - -# here are the per-package modules (the "Primary" block) -password [success=1 default=ignore] pam_unix.so obscure md5 -# here's the fallback if no module succeeds -password requisite pam_deny.so -# prime the stack with a positive return value if there isn't one already; -# this avoids us returning an error just because nothing sets a success code -# since the modules above will each just jump around -password required pam_permit.so -# and here are more per-package modules (the "Additional" block) -# end of pam-auth-update config diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/newusers b/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/newusers deleted file mode 100644 index 552045e4d5..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/newusers +++ /dev/null @@ -1,6 +0,0 @@ -# -# The PAM configuration file for the Shadow `chpasswd' service -# - -@include common-password - diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/passwd b/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/passwd deleted file mode 100644 index 43fc135a40..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/shadow b/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/shadow deleted file mode 100644 index 031ce889f4..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/data/group b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/group deleted file mode 100644 index fecba0c4ed..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5-PAM/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/data/gshadow b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/gshadow deleted file mode 100644 index 5042e5818a..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5-PAM/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/data/newusers.list b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/newusers.list deleted file mode 100644 index 9c40fa2b6e..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5-PAM/data/newusers.list +++ /dev/null @@ -1 +0,0 @@ -foo:fooPass:::User Foo - Gecos Field::/bin/sh diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/data/passwd b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/passwd deleted file mode 100644 index 7bf7386cf5..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5-PAM/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:User Foo - Gecos Field::/bin/sh diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/data/shadow b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/shadow deleted file mode 100644 index cff74f8f80..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5-PAM/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:@PASS_MD5 fooPass@:@TODAY@:0:99999:7::: diff --git a/tests/newusers/37_create_user_encrypt_MD5-PAM/newusers.test b/tests/newusers/37_create_user_encrypt_MD5-PAM/newusers.test deleted file mode 100755 index f916194cdb..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5-PAM/newusers.test +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "newusers can encrypt the passwords with the MD5 algorithm" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -newusers data/newusers.list - -echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/newusers/37_create_user_encrypt_MD5/config.txt b/tests/newusers/37_create_user_encrypt_MD5/config.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/newusers/37_create_user_encrypt_MD5/config/etc/group b/tests/newusers/37_create_user_encrypt_MD5/config/etc/group deleted file mode 100644 index 101239088b..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5/config/etc/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/newusers/37_create_user_encrypt_MD5/config/etc/gshadow b/tests/newusers/37_create_user_encrypt_MD5/config/etc/gshadow deleted file mode 100644 index ae42486590..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5/config/etc/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/37_create_user_encrypt_MD5/config/etc/passwd b/tests/newusers/37_create_user_encrypt_MD5/config/etc/passwd deleted file mode 100644 index 43fc135a40..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5/config/etc/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/newusers/37_create_user_encrypt_MD5/config/etc/shadow b/tests/newusers/37_create_user_encrypt_MD5/config/etc/shadow deleted file mode 100644 index 031ce889f4..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5/config/etc/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/newusers/37_create_user_encrypt_MD5/data/group b/tests/newusers/37_create_user_encrypt_MD5/data/group deleted file mode 100644 index fecba0c4ed..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/newusers/37_create_user_encrypt_MD5/data/gshadow b/tests/newusers/37_create_user_encrypt_MD5/data/gshadow deleted file mode 100644 index 5042e5818a..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/newusers/37_create_user_encrypt_MD5/data/newusers.list b/tests/newusers/37_create_user_encrypt_MD5/data/newusers.list deleted file mode 100644 index 9c40fa2b6e..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5/data/newusers.list +++ /dev/null @@ -1 +0,0 @@ -foo:fooPass:::User Foo - Gecos Field::/bin/sh diff --git a/tests/newusers/37_create_user_encrypt_MD5/data/passwd b/tests/newusers/37_create_user_encrypt_MD5/data/passwd deleted file mode 100644 index 7bf7386cf5..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:User Foo - Gecos Field::/bin/sh diff --git a/tests/newusers/37_create_user_encrypt_MD5/data/shadow b/tests/newusers/37_create_user_encrypt_MD5/data/shadow deleted file mode 100644 index cff74f8f80..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:@PASS_MD5 fooPass@:@TODAY@:0:99999:7::: diff --git a/tests/newusers/37_create_user_encrypt_MD5/newusers.test b/tests/newusers/37_create_user_encrypt_MD5/newusers.test deleted file mode 100755 index e497ca9c13..0000000000 --- a/tests/newusers/37_create_user_encrypt_MD5/newusers.test +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "newusers can encrypt the passwords with the MD5 algorithm" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -newusers -c MD5 data/newusers.list - -echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.err b/tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.err index 4b285aff05..75facce46a 100644 --- a/tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.err +++ b/tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.err @@ -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 SHA256 SHA512) -r, --system create system accounts -s, --sha-rounds number of SHA rounds for the SHA* crypt algorithms diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config.txt b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/group b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/group deleted file mode 100644 index 101239088b..0000000000 --- a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/gshadow b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/gshadow deleted file mode 100644 index ae42486590..0000000000 --- a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/passwd b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/passwd deleted file mode 100644 index 43fc135a40..0000000000 --- a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/shadow b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/shadow deleted file mode 100644 index 031ce889f4..0000000000 --- a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/group b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/group deleted file mode 100644 index fecba0c4ed..0000000000 --- a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/gshadow b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/gshadow deleted file mode 100644 index 5042e5818a..0000000000 --- a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/newusers.list b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/newusers.list deleted file mode 100644 index 9c40fa2b6e..0000000000 --- a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/newusers.list +++ /dev/null @@ -1 +0,0 @@ -foo:fooPass:::User Foo - Gecos Field::/bin/sh diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/passwd b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/passwd deleted file mode 100644 index 7bf7386cf5..0000000000 --- a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:User Foo - Gecos Field::/bin/sh diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/shadow b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/shadow deleted file mode 100644 index cff74f8f80..0000000000 --- a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:@PASS_MD5 fooPass@:@TODAY@:0:99999:7::: diff --git a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test deleted file mode 100755 index 2a5bfb8d86..0000000000 --- a/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "newusers ignore the number of rounds with the MD5 method" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo "newusers -c MD5 -s 3000 data/newusers.list" -newusers -c MD5 -s 3000 data/newusers.list - -echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/newusers/62_create_user_no_aging/config/etc/login.defs b/tests/newusers/62_create_user_no_aging/config/etc/login.defs index e7b348dcfb..64e424a560 100644 --- a/tests/newusers/62_create_user_no_aging/config/etc/login.defs +++ b/tests/newusers/62_create_user_no_aging/config/etc/login.defs @@ -273,12 +273,6 @@ PASS_CHANGE_TRIES 5 # PASS_ALWAYS_WARN yes -# -# Number of significant characters in the password for crypt(). -# Default is 8, don't change unless your crypt() is better. -# -#PASS_MAX_LEN 8 - # # Require password before chfn(1)/chsh(1) can make any changes. # @@ -301,18 +295,15 @@ CHFN_RESTRICT rwh # # Only works if compiled with ENCRYPTMETHOD_SELECT defined: -# If set to MD5, MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password # If set to BCRYPT, BCRYPT-based algorithm will be used for encrypting password # If set to YESCRYPT, YESCRYPT-based algorithm will be used for encrypting password -# 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. # # 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. diff --git a/tests/run_all b/tests/run_all index 7ab29d9fc2..4f3f079f64 100755 --- a/tests/run_all +++ b/tests/run_all @@ -247,8 +247,6 @@ run_test ./grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/chgpasswd.test run_test ./grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/chgpasswd.test run_test ./grouptools/chgpasswd/14_chgpasswd_password_encrypted/chgpasswd.test run_test ./grouptools/chgpasswd/16_chgpasswd_password_NONE/chgpasswd.test -run_test ./grouptools/chgpasswd/17_chgpasswd_password_MD5/chgpasswd.test -run_test ./grouptools/chgpasswd/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 @@ -665,8 +663,6 @@ if [ "$USE_PAM" = "yes" ]; then run_test ./usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/chpasswd.test run_test ./usertools/chpasswd-PAM/14_chpasswd_password_encrypted/chpasswd.test run_test ./usertools/chpasswd-PAM/16_chpasswd_password_NONE/chpasswd.test - run_test ./usertools/chpasswd-PAM/17_chpasswd_password_MD5/chpasswd.test - run_test ./usertools/chpasswd-PAM/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 @@ -899,22 +895,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 -run_test ./crypt/login.defs_MD5/02_chgpasswd.test if [ "$USE_PAM" != "yes" ]; then run_test ./crypt/login.defs_SHA256-round-max/01_chpasswd.test run_test ./crypt/login.defs_SHA256-round-min-max/01_chpasswd.test @@ -966,7 +946,6 @@ run_test ./newusers/34_update_password_no_shadow/newusers.test run_test ./newusers/35_read_from_stdin/newusers.test if [ "$USE_PAM" != "yes" ]; then run_test ./newusers/36_create_user_encrypted/newusers.test - run_test ./newusers/37_create_user_encrypt_MD5/newusers.test run_test ./newusers/38_update_password_no_shadow_encrypted/newusers.test run_test ./newusers/39_update_password_no_shadow_password_encrypted/newusers.test run_test ./newusers/40_update_password_encrypted/newusers.test @@ -975,19 +954,11 @@ if [ "$USE_PAM" != "yes" ]; then run_test ./newusers/43_create_user_encrypt_SHA256_rounds_3000/newusers.test run_test ./newusers/44_create_user_encrypt_SHA256_rounds_300/newusers.test run_test ./newusers/45_create_user_encrypt_rounds_3000/newusers.test - run_test ./newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test else - - run_test ./newusers/37_create_user_encrypt_MD5-PAM/newusers.test - - - run_test ./newusers/41_create_user_encrypt_SHA256-PAM/newusers.test run_test ./newusers/42_create_user_encrypt_SHA512-PAM/newusers.test run_test ./newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/newusers.test run_test ./newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/newusers.test - - fi run_test ./newusers/47_create_user_error_UID_4294967295/newusers.test run_test ./newusers/48_create_user_error_GID_4294967295/newusers.test diff --git a/tests/run_all.coverage b/tests/run_all.coverage index e5e9a6bcd2..37e3cf3448 100755 --- a/tests/run_all.coverage +++ b/tests/run_all.coverage @@ -263,8 +263,6 @@ run_test ./grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/chgpasswd.test run_test ./grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/chgpasswd.test run_test ./grouptools/chgpasswd/14_chgpasswd_password_encrypted/chgpasswd.test run_test ./grouptools/chgpasswd/16_chgpasswd_password_NONE/chgpasswd.test -run_test ./grouptools/chgpasswd/17_chgpasswd_password_MD5/chgpasswd.test -run_test ./grouptools/chgpasswd/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 @@ -681,8 +679,6 @@ if [ "$USE_PAM" = "yes" ]; then run_test ./usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/chpasswd.test run_test ./usertools/chpasswd-PAM/14_chpasswd_password_encrypted/chpasswd.test run_test ./usertools/chpasswd-PAM/16_chpasswd_password_NONE/chpasswd.test - run_test ./usertools/chpasswd-PAM/17_chpasswd_password_MD5/chpasswd.test - run_test ./usertools/chpasswd-PAM/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 @@ -915,22 +911,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 -run_test ./crypt/login.defs_MD5/02_chgpasswd.test if [ "$USE_PAM" != "yes" ]; then run_test ./crypt/login.defs_SHA256-round-max/01_chpasswd.test run_test ./crypt/login.defs_SHA256-round-min-max/01_chpasswd.test @@ -982,7 +962,6 @@ run_test ./newusers/34_update_password_no_shadow/newusers.test run_test ./newusers/35_read_from_stdin/newusers.test if [ "$USE_PAM" != "yes" ]; then run_test ./newusers/36_create_user_encrypted/newusers.test - run_test ./newusers/37_create_user_encrypt_MD5/newusers.test run_test ./newusers/38_update_password_no_shadow_encrypted/newusers.test run_test ./newusers/39_update_password_no_shadow_password_encrypted/newusers.test run_test ./newusers/40_update_password_encrypted/newusers.test @@ -991,19 +970,11 @@ if [ "$USE_PAM" != "yes" ]; then run_test ./newusers/43_create_user_encrypt_SHA256_rounds_3000/newusers.test run_test ./newusers/44_create_user_encrypt_SHA256_rounds_300/newusers.test run_test ./newusers/45_create_user_encrypt_rounds_3000/newusers.test - run_test ./newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test else - - run_test ./newusers/37_create_user_encrypt_MD5-PAM/newusers.test - - - run_test ./newusers/41_create_user_encrypt_SHA256-PAM/newusers.test run_test ./newusers/42_create_user_encrypt_SHA512-PAM/newusers.test run_test ./newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/newusers.test run_test ./newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/newusers.test - - fi run_test ./newusers/47_create_user_error_UID_4294967295/newusers.test run_test ./newusers/48_create_user_error_GID_4294967295/newusers.test diff --git a/tests/split_groups/01_useradd_split_group/config/etc/login.defs b/tests/split_groups/01_useradd_split_group/config/etc/login.defs index 9c6e8b63fa..cfc77a19da 100644 --- a/tests/split_groups/01_useradd_split_group/config/etc/login.defs +++ b/tests/split_groups/01_useradd_split_group/config/etc/login.defs @@ -279,7 +279,6 @@ MAX_MEMBERS_PER_GROUP 2 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/split_groups/02_useradd_no_split_group/config/etc/login.defs b/tests/split_groups/02_useradd_no_split_group/config/etc/login.defs index 1edc4addf3..e86b9e4d82 100644 --- a/tests/split_groups/02_useradd_no_split_group/config/etc/login.defs +++ b/tests/split_groups/02_useradd_no_split_group/config/etc/login.defs @@ -279,7 +279,6 @@ MAX_MEMBERS_PER_GROUP 0 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/split_groups/03_useradd_split_group_already_split/config/etc/login.defs b/tests/split_groups/03_useradd_split_group_already_split/config/etc/login.defs index 9c6e8b63fa..cfc77a19da 100644 --- a/tests/split_groups/03_useradd_split_group_already_split/config/etc/login.defs +++ b/tests/split_groups/03_useradd_split_group_already_split/config/etc/login.defs @@ -279,7 +279,6 @@ MAX_MEMBERS_PER_GROUP 2 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/split_groups/04_useradd_split_group_already_full/config/etc/login.defs b/tests/split_groups/04_useradd_split_group_already_full/config/etc/login.defs index 9c6e8b63fa..cfc77a19da 100644 --- a/tests/split_groups/04_useradd_split_group_already_full/config/etc/login.defs +++ b/tests/split_groups/04_useradd_split_group_already_full/config/etc/login.defs @@ -279,7 +279,6 @@ MAX_MEMBERS_PER_GROUP 2 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/login.defs b/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/login.defs index 9c6e8b63fa..cfc77a19da 100644 --- a/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/login.defs +++ b/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/login.defs @@ -279,7 +279,6 @@ MAX_MEMBERS_PER_GROUP 2 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/login.defs b/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/login.defs index 9c6e8b63fa..cfc77a19da 100644 --- a/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/login.defs +++ b/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/login.defs @@ -279,7 +279,6 @@ MAX_MEMBERS_PER_GROUP 2 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/login.defs b/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/login.defs index 9c6e8b63fa..cfc77a19da 100644 --- a/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/login.defs +++ b/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/login.defs @@ -279,7 +279,6 @@ MAX_MEMBERS_PER_GROUP 2 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/login.defs b/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/login.defs index 1edc4addf3..e86b9e4d82 100644 --- a/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/login.defs +++ b/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/login.defs @@ -279,7 +279,6 @@ MAX_MEMBERS_PER_GROUP 0 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/split_groups/09_groupdel_split_group_already_split/config/etc/login.defs b/tests/split_groups/09_groupdel_split_group_already_split/config/etc/login.defs index 9c6e8b63fa..cfc77a19da 100644 --- a/tests/split_groups/09_groupdel_split_group_already_split/config/etc/login.defs +++ b/tests/split_groups/09_groupdel_split_group_already_split/config/etc/login.defs @@ -279,7 +279,6 @@ MAX_MEMBERS_PER_GROUP 2 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/login.defs b/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/login.defs index 1edc4addf3..e86b9e4d82 100644 --- a/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/login.defs +++ b/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/login.defs @@ -279,7 +279,6 @@ MAX_MEMBERS_PER_GROUP 0 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/su/04/config/etc/login.defs b/tests/su/04/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/su/04/config/etc/login.defs +++ b/tests/su/04/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/su/05/config/etc/login.defs b/tests/su/05/config/etc/login.defs index 90d4e9d194..8d5e310223 100644 --- a/tests/su/05/config/etc/login.defs +++ b/tests/su/05/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/su/06/config/etc/login.defs b/tests/su/06/config/etc/login.defs index 62f9d227cb..34b968a3dc 100644 --- a/tests/su/06/config/etc/login.defs +++ b/tests/su/06/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/su/07/config/etc/login.defs b/tests/su/07/config/etc/login.defs index 90d4e9d194..8d5e310223 100644 --- a/tests/su/07/config/etc/login.defs +++ b/tests/su/07/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/su/08/config/etc/login.defs b/tests/su/08/config/etc/login.defs index f154808d92..6616085f35 100644 --- a/tests/su/08/config/etc/login.defs +++ b/tests/su/08/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/su/09/config/etc/login.defs b/tests/su/09/config/etc/login.defs index b975cad8a6..8f2ff0c3d9 100644 --- a/tests/su/09/config/etc/login.defs +++ b/tests/su/09/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/su/10_su_sulog_success/config/etc/login.defs b/tests/su/10_su_sulog_success/config/etc/login.defs index bcffde812b..ffa7045832 100644 --- a/tests/su/10_su_sulog_success/config/etc/login.defs +++ b/tests/su/10_su_sulog_success/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/su/11_su_sulog_failure/config/etc/login.defs b/tests/su/11_su_sulog_failure/config/etc/login.defs index bcffde812b..ffa7045832 100644 --- a/tests/su/11_su_sulog_failure/config/etc/login.defs +++ b/tests/su/11_su_sulog_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/su/12_su_child_failure/config/etc/login.defs b/tests/su/12_su_child_failure/config/etc/login.defs index bcffde812b..ffa7045832 100644 --- a/tests/su/12_su_child_failure/config/etc/login.defs +++ b/tests/su/12_su_child_failure/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/su/13_su_child_success/config/etc/login.defs b/tests/su/13_su_child_success/config/etc/login.defs index bcffde812b..ffa7045832 100644 --- a/tests/su/13_su_child_success/config/etc/login.defs +++ b/tests/su/13_su_child_success/config/etc/login.defs @@ -277,7 +277,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/login.defs b/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/login.defs index 670a83d57c..4fa17b3f3b 100644 --- a/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/login.defs +++ b/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/login.defs @@ -258,10 +258,8 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -305,7 +303,6 @@ ENCRYPT_METHOD SHA512 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/login.defs b/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/login.defs index 09525d715e..7977e7538f 100644 --- a/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/login.defs +++ b/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/login.defs @@ -258,10 +258,8 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -305,7 +303,6 @@ ENCRYPT_METHOD SHA512 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/login.defs b/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/login.defs index 80c44a283c..abddc691d1 100644 --- a/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/login.defs +++ b/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/login.defs @@ -258,10 +258,8 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -305,7 +303,6 @@ ENCRYPT_METHOD SHA512 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/login.defs b/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/login.defs index b4fba408d9..545859b94f 100644 --- a/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/login.defs +++ b/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/login.defs @@ -258,10 +258,8 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -305,7 +303,6 @@ ENCRYPT_METHOD SHA512 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/login.defs b/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/login.defs index d17265aa49..590510bc80 100644 --- a/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/login.defs +++ b/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/login.defs @@ -258,10 +258,8 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -305,7 +303,6 @@ ENCRYPT_METHOD SHA512 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/login.defs b/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/login.defs index b624dfa667..c0620b1ff0 100644 --- a/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/login.defs +++ b/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/login.defs @@ -258,10 +258,8 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -305,7 +303,6 @@ ENCRYPT_METHOD SHA512 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/subids/18_useradd_min=max/config/etc/login.defs b/tests/subids/18_useradd_min=max/config/etc/login.defs index 8751c510bb..34c6f55f72 100644 --- a/tests/subids/18_useradd_min=max/config/etc/login.defs +++ b/tests/subids/18_useradd_min=max/config/etc/login.defs @@ -258,10 +258,8 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -305,7 +303,6 @@ ENCRYPT_METHOD SHA512 #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/system/etc/login.defs b/tests/system/etc/login.defs index 8e68ea56d2..c01a7e9039 100644 --- a/tests/system/etc/login.defs +++ b/tests/system/etc/login.defs @@ -273,12 +273,6 @@ PASS_CHANGE_TRIES 5 # PASS_ALWAYS_WARN yes -# -# Number of significant characters in the password for crypt(). -# Default is 8, don't change unless your crypt() is better. -# -#PASS_MAX_LEN 8 - # # Require password before chfn(1)/chsh(1) can make any changes. # @@ -301,18 +295,15 @@ CHFN_RESTRICT rwh # # Only works if compiled with ENCRYPTMETHOD_SELECT defined: -# If set to MD5, MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password # If set to BCRYPT, BCRYPT-based algorithm will be used for encrypting password # If set to YESCRYPT, YESCRYPT-based algorithm will be used for encrypting password -# 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. # # 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. diff --git a/tests/usertools/chpasswd-PAM/06_chpasswd_usage/data/usage.out b/tests/usertools/chpasswd-PAM/06_chpasswd_usage/data/usage.out index 269429d534..1fd8eec89d 100644 --- a/tests/usertools/chpasswd-PAM/06_chpasswd_usage/data/usage.out +++ b/tests/usertools/chpasswd-PAM/06_chpasswd_usage/data/usage.out @@ -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 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/07_chpasswd_usage_bad_option/data/usage.out b/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/data/usage.out index 28aae640f6..2bdf29dbe6 100644 --- a/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/data/usage.out +++ b/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/data/usage.out @@ -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 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/09_chpasswd_usage-e-c_exclusive/data/usage.out b/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/data/usage.out index 22a7292071..6947d8eb9f 100644 --- a/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/data/usage.out +++ b/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/data/usage.out @@ -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 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/11_chpasswd_usage-s_without-c/chpasswd.test b/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/chpasswd.test index 29982fc147..4a2001012a 100755 --- a/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/chpasswd.test +++ b/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/chpasswd.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "Password must use md5 and another method (chpasswd --sha-rounds 12)..." +echo -n "Password hashing method (chpasswd --sha-rounds 12)..." echo 'nobody:test' | chpasswd --sha-rounds 12 2>tmp/usage.out && exit 1 || { status=$? } diff --git a/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/data/usage.out b/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/data/usage.out index ffc3cee727..04c065f295 100644 --- a/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/data/usage.out +++ b/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/data/usage.out @@ -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 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/12_chpasswd_usage-s_invalid/chpasswd.test b/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/chpasswd.test index 1b478f98b5..bbd513ba88 100755 --- a/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/chpasswd.test +++ b/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/chpasswd.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "Password must use md5 and another method (chpasswd --sha-rounds 12foo -c SHA512)..." +echo -n "Password hashing method (chpasswd --sha-rounds 12foo -c SHA512)..." echo 'nobody:test' | chpasswd --sha-rounds 12foo -c SHA512 2>tmp/usage.out && exit 1 || { status=$? } diff --git a/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/data/usage.out b/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/data/usage.out index fa20130440..e5e0b9251f 100644 --- a/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/data/usage.out +++ b/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/data/usage.out @@ -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 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/13_chpasswd_usage-c_invalid/chpasswd.test b/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/chpasswd.test index a2f653c7ae..51787dd83c 100755 --- a/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/chpasswd.test +++ b/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/chpasswd.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "Password must use md5 and another method (chpasswd --crypt-method SHA513)..." +echo -n "Password hashing method (chpasswd --crypt-method SHA513)..." echo 'nobody:test' | chpasswd --crypt-method SHA513 2>tmp/usage.out && exit 1 || { status=$? } diff --git a/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/data/usage.out b/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/data/usage.out index 79a0e12fb4..f7ee539d1a 100644 --- a/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/data/usage.out +++ b/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/data/usage.out @@ -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 SHA256 SHA512) -e, --encrypted supplied passwords are encrypted -h, --help display this help message and exit -R, --root CHROOT_DIR directory to chroot into diff --git a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/chpasswd.test b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/chpasswd.test deleted file mode 100755 index f7da2c69e0..0000000000 --- a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/chpasswd.test +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../../common/config.sh -. ../../../common/log.sh - -log_start "$0" "chpasswd can use create MD5 passwords" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo -n "Change nobody and lp's password (chpasswd --crypt-method MD5)..." -echo 'nobody:test -lp:test2' | chpasswd --crypt-method MD5 -echo "OK" - -echo -n "Check the passwd file..." -../../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/group b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/group deleted file mode 100644 index 101239088b..0000000000 --- a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/gshadow b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/gshadow deleted file mode 100644 index ae42486590..0000000000 --- a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/chpasswd deleted file mode 100644 index 552045e4d5..0000000000 --- a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/chpasswd +++ /dev/null @@ -1,6 +0,0 @@ -# -# The PAM configuration file for the Shadow `chpasswd' service -# - -@include common-password - diff --git a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/common-password deleted file mode 100644 index 06c59a74c0..0000000000 --- a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/common-password +++ /dev/null @@ -1,33 +0,0 @@ -# -# /etc/pam.d/common-password - password-related modules common to all services -# -# This file is included from other service-specific PAM config files, -# and should contain a list of modules that define the services to be -# used to change user passwords. The default is pam_unix. - -# Explanation of pam_unix options: -# -# The "md5" option enables MD5 passwords. Without this option, the -# default is Unix crypt. -# -# The "obscure" option replaces the old `OBSCURE_CHECKS_ENAB' option in -# login.defs. -# -# See the pam_unix manpage for other options. - -# As of pam 1.0.1-6, this file is managed by pam-auth-update by default. -# To take advantage of this, it is recommended that you configure any -# local modules either before or after the default block, and use -# pam-auth-update to manage selection of other modules. See -# pam-auth-update(8) for details. - -# here are the per-package modules (the "Primary" block) -password [success=1 default=ignore] pam_unix.so obscure -# here's the fallback if no module succeeds -password requisite pam_deny.so -# prime the stack with a positive return value if there isn't one already; -# this avoids us returning an error just because nothing sets a success code -# since the modules above will each just jump around -password required pam_permit.so -# and here are more per-package modules (the "Additional" block) -# end of pam-auth-update config diff --git a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/passwd b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/passwd deleted file mode 100644 index 43fc135a40..0000000000 --- a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/shadow b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/shadow deleted file mode 100644 index 5f50d1873b..0000000000 --- a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/data/shadow b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/data/shadow deleted file mode 100644 index cb54856149..0000000000 --- a/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:@PASS_MD5 test2@:@TODAY@:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:@PASS_MD5 test@:@TODAY@:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: 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 index 750b82f2a7..0000000000 --- a/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/chpasswd.test +++ /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 index 101239088b..0000000000 --- a/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/group +++ /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 index ae42486590..0000000000 --- a/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/gshadow +++ /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 index 552045e4d5..0000000000 --- a/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/pam.d/chpasswd +++ /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 index 06c59a74c0..0000000000 --- a/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/pam.d/common-password +++ /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 index 43fc135a40..0000000000 --- a/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/passwd +++ /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 index 5f50d1873b..0000000000 --- a/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/shadow +++ /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 index d69c00cd1f..0000000000 --- a/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/data/shadow +++ /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::: diff --git a/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/login.defs b/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/login.defs index bbd7adac0c..59f84548e4 100644 --- a/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/login.defs +++ b/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/login.defs @@ -256,7 +256,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 @@ -281,7 +281,6 @@ ENCRYPT_METHOD DES #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/login.defs b/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/login.defs index bbd7adac0c..59f84548e4 100644 --- a/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/login.defs +++ b/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/login.defs @@ -256,7 +256,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 @@ -281,7 +281,6 @@ ENCRYPT_METHOD DES #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/login.defs b/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/login.defs index bbd7adac0c..59f84548e4 100644 --- a/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/login.defs +++ b/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/login.defs @@ -256,7 +256,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 @@ -281,7 +281,6 @@ ENCRYPT_METHOD DES #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/login.defs b/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/login.defs index bbd7adac0c..59f84548e4 100644 --- a/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/login.defs +++ b/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/login.defs @@ -256,7 +256,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 @@ -281,7 +281,6 @@ ENCRYPT_METHOD DES #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/login.defs b/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/login.defs index bbd7adac0c..59f84548e4 100644 --- a/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/login.defs +++ b/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/login.defs @@ -256,7 +256,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 @@ -281,7 +281,6 @@ ENCRYPT_METHOD DES #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/login.defs b/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/login.defs index 03a3140534..9f2c590738 100644 --- a/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/login.defs +++ b/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB no #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB no #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/login.defs b/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/login.defs +++ b/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/login.defs b/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/login.defs +++ b/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/login.defs b/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/login.defs +++ b/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/login.defs b/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/login.defs index 4ad8c17b31..06434ebe2f 100644 --- a/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/login.defs +++ b/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/login.defs b/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/login.defs index ca6a6a31ec..ef4c078379 100644 --- a/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/login.defs +++ b/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH diff --git a/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/login.defs b/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/login.defs index dd2846e32e..00ecc6e59a 100644 --- a/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/login.defs +++ b/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/login.defs @@ -250,15 +250,13 @@ USERGROUPS_ENAB yes #CONSOLE_GROUPS floppy:audio:cdrom # -# If set to MD5 , MD5-based algorithm will be used for encrypting password # If set to SHA256, SHA256-based algorithm will be used for encrypting password # If set to SHA512, SHA512-based algorithm will be used for encrypting password -# 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. @@ -297,7 +295,6 @@ USERGROUPS_ENAB yes #NOLOGINS_FILE #ISSUE_FILE #PASS_MIN_LEN -#PASS_MAX_LEN #ULIMIT #ENV_HZ #CHFN_AUTH