diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-06 09:53:25 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-06 09:53:25 +0100 |
| commit | 2288ec26df8e47d9b699e46eecd05eb3570f03a0 (patch) | |
| tree | 1d204b70e027fd737f6aae1b7308ae959f5bd0b9 /package/pam/patches/patch-modules_pam_group_pam_group_c | |
| parent | 45e7808c41c2e66266f738aa5eff70ce18cc04ac (diff) | |
| parent | 667bc9e981847a1d117a2fc7110948075a268bdd (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/pam/patches/patch-modules_pam_group_pam_group_c')
| -rw-r--r-- | package/pam/patches/patch-modules_pam_group_pam_group_c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/package/pam/patches/patch-modules_pam_group_pam_group_c b/package/pam/patches/patch-modules_pam_group_pam_group_c index 40c1897d2..bbf25bcfd 100644 --- a/package/pam/patches/patch-modules_pam_group_pam_group_c +++ b/package/pam/patches/patch-modules_pam_group_pam_group_c @@ -1,12 +1,17 @@ ---- Linux-PAM-1.1.4.orig/modules/pam_group/pam_group.c 2011-06-21 11:04:56.000000000 +0200 -+++ Linux-PAM-1.1.4/modules/pam_group/pam_group.c 2011-10-12 14:31:55.693559001 +0200 -@@ -656,7 +656,8 @@ static int check_account(pam_handle_t *p +--- Linux-PAM-1.1.8.orig/modules/pam_group/pam_group.c 2013-06-18 16:11:21.000000000 +0200 ++++ Linux-PAM-1.1.8/modules/pam_group/pam_group.c 2013-12-21 18:30:19.000000000 +0100 +@@ -655,10 +655,13 @@ static int check_account(pam_handle_t *p + continue; } /* If buffer starts with @, we are using netgroups */ ++#ifdef HAVE_INNETGR if (buffer[0] == '@') -- good &= innetgr (&buffer[1], NULL, user, NULL); -+ pam_syslog(pamh, LOG_ERR, "%s: no netgroup supported by C library", PAM_GROUP_CONF); -+ //good &= innetgr (&buffer[1], NULL, user, NULL); + good &= innetgr (&buffer[1], NULL, user, NULL); /* otherwise, if the buffer starts with %, it's a UNIX group */ - else if (buffer[0] == '%') +- else if (buffer[0] == '%') ++ else ++#endif ++ if (buffer[0] == '%') good &= pam_modutil_user_in_group_nam_nam(pamh, user, &buffer[1]); + else + good &= logic_field(pamh,user, buffer, count, is_same); |