Relevant BUGIDs:

Purpose of commit: cleanup

Commit summary:
---------------
2007-08-30  Steve Langasek  <vorlon@debian.org>

        * modules/pam_cracklib/pam_cracklib.c:
        s/CRACKLIB_DICT/CRACKLIB_DICTS/, for consistency with existing
        #define in pam_unix

diff --git a/ChangeLog b/ChangeLog
index ec086af4dc6865e36b94cea834df59ebea172665..836a49070af5759d66a7e06c892e097e04b10c1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-30  Steve Langasek  <vorlon@debian.org>
+
+       * modules/pam_cracklib/pam_cracklib.c:
+       s/CRACKLIB_DICT/CRACKLIB_DICTS/, for consistency with existing
+       #define in pam_unix
+
 2007-08-29  Steve Langasek  <vorlon@debian.org>
 
        * libpam/pam_modutil_getgrgid.c, libpam/pam_modutil_getgrnam.c,

diff --git a/modules/pam_cracklib/pam_cracklib.c b/modules/pam_cracklib/pam_cracklib.c
index 14fa24e0c6886eb4bd8d899032df151173b57d8e..532a72b2cc80e88fc690dac914803471741fffcf 100644 (file)
--- a/modules/pam_cracklib/pam_cracklib.c
+++ b/modules/pam_cracklib/pam_cracklib.c
@@ -56,8 +56,8 @@
 extern char *FascistCheck(char *pw, const char *dictpath);
 #endif
 
-#ifndef CRACKLIB_DICT
-#define CRACKLIB_DICT NULL
+#ifndef CRACKLIB_DICTS
+#define CRACKLIB_DICTS NULL
 #endif
 
 /* For Translators: "%s%s" could be replaced with "<service> " or "". */
@@ -172,7 +172,7 @@ _pam_parse (pam_handle_t *pamh, struct cracklib_options *opt,
         } else if (!strncmp(*argv,"dictpath=",9)) {
             opt->cracklib_dictpath = *argv+9;
             if (!*(opt->cracklib_dictpath)) {
-                opt->cracklib_dictpath = CRACKLIB_DICT;
+                opt->cracklib_dictpath = CRACKLIB_DICTS;
             }
         } else {
             pam_syslog(pamh,LOG_ERR,"pam_parse: unknown option; %s",*argv);
@@ -576,7 +576,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags,
     options.use_authtok = CO_USE_AUTHTOK;
     memset(options.prompt_type, 0, BUFSIZ);
     strcpy(options.prompt_type,"UNIX");
-    options.cracklib_dictpath = CRACKLIB_DICT;
+    options.cracklib_dictpath = CRACKLIB_DICTS;
 
     ctrl = _pam_parse(pamh, &options, argc, argv);