diff options
| -rw-r--r-- | patches-applied/024_debian_cracklib_dict_path | 8 | ||||
| -rwxr-xr-x | rules | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/patches-applied/024_debian_cracklib_dict_path b/patches-applied/024_debian_cracklib_dict_path index 83163d9c..229c87e8 100644 --- a/patches-applied/024_debian_cracklib_dict_path +++ b/patches-applied/024_debian_cracklib_dict_path @@ -17,8 +17,8 @@ Index: Linux-PAM/modules/pam_cracklib/pam_cracklib.c 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 "". */ @@ -41,7 +41,7 @@ Index: Linux-PAM/modules/pam_cracklib/pam_cracklib.c - sizeof(opt->cracklib_dictpath) - 1); + 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); @@ -58,7 +58,7 @@ Index: Linux-PAM/modules/pam_cracklib/pam_cracklib.c strcpy(options.prompt_type,"UNIX"); - memset(options.cracklib_dictpath, 0, - sizeof (options.cracklib_dictpath)); -+ options.cracklib_dictpath = CRACKLIB_DICT; ++ options.cracklib_dictpath = CRACKLIB_DICTS; ctrl = _pam_parse(pamh, &options, argc, argv); @@ -5,7 +5,7 @@ # architecture-dependant package, as well as an architecture-independant # package. -CFLAGS := -g -D_GNU_SOURCE -D_REENTRANT -fPIC -DCRACKLIB_DICT=CRACKLIB_DICTPATH +CFLAGS := -g -D_GNU_SOURCE -D_REENTRANT -fPIC -DCRACKLIB_DICTS=CRACKLIB_DICTPATH LDFLAGS := -Wl,-z,defs ifeq (,$(findstring noopt, ${DEB_BUILD_OPTIONS})) |