Attachment 663135 Details for Bug 886995 – suggested libpwquality changes

[patch] suggested libpwquality changes

libpwquality-look.patch (text/plain), 2.45 KB, created by Nalin Dahyabhai on 2012-12-13 19:03:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nalin Dahyabhai

Created: 2012-12-13 19:03:17 UTC

Size: 2.45 KB

patch

obsolete

>Instead of FascistCheck(), which can exit if there's an error opening
>the dictionary, use PWOpen()/FascistLook()/PWClose(), which lets us
>handle the error ourselves.  FascistLook() was provided but not declared
>until cracklib 2.8.21, so we need to provide a prototype for it if the
>headers which we have don't declare it.
>
>--- libpwquality/configure.in
>+++ libpwquality/configure.in
>@@ -142,13 +142,19 @@ AC_ARG_WITH(pythonsitedir,
> AC_SUBST(PYTHONSITEDIR)
> 
> dnl Check for cracklib
>-AC_CHECK_HEADERS([crack.h],
>-      AC_CHECK_LIB([crack], [FascistCheck], LIBCRACK="-lcrack", LIBCRACK=""))
>+AC_CHECK_HEADERS([crack.h packer.h],
>+      AC_CHECK_LIB([crack], [FascistLook], LIBCRACK="-lcrack", LIBCRACK=""))
> if test x$LIBCRACK = x ; then
>     AC_MSG_ERROR([No or unusable cracklib library])
> fi
> AC_SUBST([LIBCRACK])
> 
>+AC_CHECK_DECLS([FascistLook],,,[
>+	#include <sys/types.h>
>+	#include <packer.h>
>+	#include <crack.h>
>+])
>+
> AC_ARG_WITH([randomdev], AS_HELP_STRING([--with-randomdev=(<path>|yes)],[use specified random device instead of /dev/urandom]), opt_randomdev=$withval)
> if test "$opt_randomdev" = yes -o -z "$opt_randomdev"; then
>        opt_randomdev="/dev/urandom"
>--- libpwquality/src/check.c
>+++ libpwquality/src/check.c
>@@ -10,6 +10,7 @@
> #include <string.h>
> #include <ctype.h>
> #include <crack.h>
>+#include <packer.h>
> #include <sys/types.h>
> #include <pwd.h>
> #include <unistd.h>
>@@ -17,6 +18,10 @@
> #include "pwquality.h"
> #include "pwqprivate.h"
> 
>+#if !HAVE_DECL_FASCISTLOOK
>+char *FascistLook(PWDICT *pwp, char *instring);
>+#endif
>+
> #ifdef MIN
> #undef MIN
> #endif
>@@ -644,7 +649,8 @@ int
> pwquality_check(pwquality_settings_t *pwq, const char *password,
>         const char *oldpassword, const char *user, void **auxerror)
> {
>-        const char *msg;
>+        PWDICT *pw;
>+        const char *dict_path, *msg;
>         int score;
> 
>         if (auxerror)
>@@ -663,7 +669,15 @@ pwquality_check(pwquality_settings_t *pw
>         if (score != 0)
>                 return score;
> 
>-        msg = FascistCheck(password, pwq->dict_path);
>+        dict_path = pwq->dict_path ? pwq->dict_path : GetDefaultCracklibDict();
>+        pw = PWOpen(dict_path, "r");
>+        if (pw == NULL) {
>+                if (auxerror)
>+                        *auxerror = (void *)msg;
>+                return PWQ_ERROR_CRACKLIB_CHECK;
>+        }
>+        msg = FascistLook(pw, password);
>+        PWClose(pw);
>         if (msg) {
>                 if (auxerror)
>                         *auxerror = (void *)msg;

Actions: View | Diff

Attachments on bug 886995: 663134 | 663135