Make sure method is not NULL, defaulting to DES. Thanks to Dan Kopecek <dkopecek...

diff --git a/ChangeLog b/ChangeLog
index 46cde8ea22ea29ffd635313ef8f093e6a13dcb14..e8c1ca31856c2db55306198b101a373b964e76ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-24  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * libmisc/salt.c: Make sure method is not NULL, defaulting to DES.
+       Thanks to Dan Kopecek <dkopecek@redhat.com>.
+
+
 2007-11-23  Nicolas François  <nicolas.francois@centraliens.net>
 
        * libmisc/salt.c: Move the srandom call to gensalt.

diff --git a/libmisc/salt.c b/libmisc/salt.c
index 280b860237a7f7459bd7d9723ebfd4234a7ee571..ff0970f3608543796af55ce2ea2d52c3217f9f1b 100644 (file)
--- a/libmisc/salt.c
+++ b/libmisc/salt.c
@@ -180,18 +180,18 @@ char *crypt_make_salt (char *meth, void *arg)
         */
        static char result[40];
        size_t salt_len = 8;
-       char *method = "DES";
+       char *method;
 
        result[0] = '\0';
 
        if (NULL != meth)
                method = meth;
-       else
+       else {
 #ifdef ENCRYPTMETHOD_SELECT
        if ((method = getdef_str ("ENCRYPT_METHOD")) == NULL)
 #endif
-               if (getdef_bool ("MD5_CRYPT_ENAB"))
-                       method = "MD5";
+               method = getdef_bool ("MD5_CRYPT_ENAB") ? "MD5" : "DES";
+       }
 
        if (!strcmp (method, "MD5")) {
                MAGNUM(result, '1');