Applied patch shadow-utils-4.0.18.2-salt.patch. Thanks to Dan Kopecek <dkopecek@redhat.com>
This commit is contained in:
@ -183,12 +183,12 @@ int main (int argc, char **argv)
|
||||
usage ();
|
||||
}
|
||||
if (cflg) {
|
||||
if (0 != strcmp (crypt_method, "DES") &&
|
||||
0 != strcmp (crypt_method, "MD5") &&
|
||||
0 != strcmp (crypt_method, "NONE") &&
|
||||
if ( 0 != strcmp (crypt_method, "DES")
|
||||
&& 0 != strcmp (crypt_method, "MD5")
|
||||
&& 0 != strcmp (crypt_method, "NONE")
|
||||
#ifdef ENCRYPTMETHOD_SELECT
|
||||
0 != strcmp (crypt_method, "SHA256") &&
|
||||
0 != strcmp (crypt_method, "SHA512")
|
||||
&& 0 != strcmp (crypt_method, "SHA256")
|
||||
&& 0 != strcmp (crypt_method, "SHA512")
|
||||
#endif
|
||||
) {
|
||||
fprintf (stderr,
|
||||
|
@ -179,12 +179,12 @@ int main (int argc, char **argv)
|
||||
usage ();
|
||||
}
|
||||
if (cflg) {
|
||||
if (0 != strcmp (crypt_method, "DES") &&
|
||||
0 != strcmp (crypt_method, "MD5") &&
|
||||
0 != strcmp (crypt_method, "NONE") &&
|
||||
if ( 0 != strcmp (crypt_method, "DES")
|
||||
&& 0 != strcmp (crypt_method, "MD5")
|
||||
&& 0 != strcmp (crypt_method, "NONE")
|
||||
#ifdef ENCRYPTMETHOD_SELECT
|
||||
0 != strcmp (crypt_method, "SHA256") &&
|
||||
0 != strcmp (crypt_method, "SHA512")
|
||||
&& 0 != strcmp (crypt_method, "SHA256")
|
||||
&& 0 != strcmp (crypt_method, "SHA512")
|
||||
#endif
|
||||
) {
|
||||
fprintf (stderr,
|
||||
|
@ -379,12 +379,12 @@ int main (int argc, char **argv)
|
||||
usage ();
|
||||
}
|
||||
if (cflg) {
|
||||
if (0 != strcmp (crypt_method, "DES") &&
|
||||
0 != strcmp (crypt_method, "MD5") &&
|
||||
0 != strcmp (crypt_method, "NONE") &&
|
||||
if ( 0 != strcmp (crypt_method, "DES")
|
||||
&& 0 != strcmp (crypt_method, "MD5")
|
||||
&& 0 != strcmp (crypt_method, "NONE")
|
||||
#ifdef ENCRYPTMETHOD_SELECT
|
||||
0 != strcmp (crypt_method, "SHA256") &&
|
||||
0 != strcmp (crypt_method, "SHA512")
|
||||
&& 0 != strcmp (crypt_method, "SHA256")
|
||||
&& 0 != strcmp (crypt_method, "SHA512")
|
||||
#endif
|
||||
) {
|
||||
fprintf (stderr,
|
||||
|
Reference in New Issue
Block a user