Attachment 604635 Details for Bug 848429 – Add local_users_only option

[patch] Add local_users_only option

add-local_users_only-option.patch (text/plain), 3.32 KB, created by Stef Walter on 2012-08-15 16:03:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stef Walter

Created: 2012-08-15 16:03:34 UTC

Size: 3.32 KB

patch

obsolete

>diff -r c23ca951b466 src/pam_pwquality.c
>--- a/src/pam_pwquality.c	Tue Aug 07 12:23:17 2012 +0200
>+++ b/src/pam_pwquality.c	Wed Aug 15 18:01:39 2012 +0200
>@@ -16,6 +16,9 @@
> #include <limits.h>
> #include <syslog.h>
> #include <libintl.h>
>+#include <stdio.h>
>+#include <pwd.h>
>+#include <errno.h>
> #include "pwquality.h"
> 
> /* For Translators: "%s%s" could be replaced with "<service> " or "". */
>@@ -43,11 +46,14 @@
> struct module_options {
>         int retry_times;
>         int enforce_for_root;
>+        int local_users_only;
>         pwquality_settings_t *pwq;
> };
> 
> #define CO_RETRY_TIMES  1
> 
>+#define PATH_PASSWD "/etc/passwd"
>+
> static int
> _pam_parse (pam_handle_t *pamh, struct module_options *opt,
>             int argc, const char **argv)
>@@ -82,6 +88,8 @@
>                                 opt->retry_times = CO_RETRY_TIMES;
>                 } else if (!strncmp(*argv, "enforce_for_root", 16)) {
>                         opt->enforce_for_root = 1;
>+                } else if (!strncmp(*argv, "local_users_only", 16)) {
>+                        opt->local_users_only = 1;
>                 } else if (!strncmp(*argv, "difignore=", 10)) {
>                         /* ignored for compatibility with pam_cracklib */
>                 } else if (!strncmp(*argv, "reject_username", 15)) {
>@@ -105,6 +113,44 @@
>          return ctrl;
> }
> 
>+static int
>+check_local_user (pam_handle_t *pamh,
>+                  const char *user)
>+{
>+        struct passwd pw, *pwp;
>+        char buf[4096];
>+        int found = 0;
>+        FILE *fp;
>+        int errn;
>+
>+        fp = fopen(PATH_PASSWD, "r");
>+        if (fp == NULL) {
>+                pam_syslog(pamh, LOG_ERR, "pam_pwquality: unable to open %s: %s",
>+                           PATH_PASSWD, pam_strerror(pamh, errno));
>+                return -1;
>+        }
>+
>+        for (;;) {
>+                errn = fgetpwent_r(fp, &pw, buf, sizeof (buf), &pwp);
>+                if (errn != 0)
>+                        break;
>+                if (strcmp (pwp->pw_name, user) == 0) {
>+                        found = 1;
>+                        break;
>+                }
>+        }
>+
>+        fclose (fp);
>+
>+        if (errn != 0 && errn != ENOENT) {
>+                pam_syslog(pamh, LOG_ERR, "pam_pwquality: unable to enumerate local accounts: %s",
>+                           pam_strerror(pamh, errn));
>+                return -1;
>+        } else {
>+                return found;
>+        }
>+}
>+
> PAM_EXTERN int
> pam_sm_chauthtok(pam_handle_t *pamh, int flags,
>                  int argc, const char **argv)
>@@ -169,8 +215,13 @@
>                                 return PAM_AUTHTOK_ERR;
>                         }
> 
>-                        /* now test this passwd against libpwquality */
>-                        retval = pwquality_check(options.pwq, newtoken, oldtoken, user, &auxerror);
>+                        if (options.local_users_only && check_local_user (pamh, user) == 0) {
>+                                /* Skip the check if a non-local user */
>+                                retval = 0;
>+                        } else {
>+                                /* now test this passwd against libpwquality */
>+                                retval = pwquality_check(options.pwq, newtoken, oldtoken, user, &auxerror);
>+                        }
> 
>                         if (retval < 0) {
>                                 const char *msg;
>

Actions: View | Diff

Attachments on bug 848429: 604635