Applied patch shadow-utils-4.0.18.2-salt.patch. Thanks to Dan Kopecek <dkopecek@redhat.com>

This commit is contained in:
nekral-guest
2007-11-23 20:51:43 +00:00
parent 1cc6fd0d16
commit 43b10b311a
5 changed files with 63 additions and 33 deletions

View File

@ -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,

View File

@ -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,

View File

@ -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,