diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-03 21:33:25 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-03 21:59:03 +0200 |
| commit | 32a0454d3c495b12824ef4a0d0341237302d148a (patch) | |
| tree | 9acc870d089b0028cecdfb1846b828ae4bd38910 /package/linux-pam/linux-pam-group.patch | |
| parent | f9686563b4fd3eed22e26105f7c440f0b74fcac1 (diff) | |
| parent | dafa32b3bd75e9d155d075c796fa5b0ecbb9b11b (diff) | |
Merge branch 'next'
Conflicts:
package/e2fsprogs/e2fsprogs.mk
package/libfuse/libfuse.mk
package/multimedia/mpd/mpd.mk
package/smartmontools/smartmontools.mk
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/linux-pam/linux-pam-group.patch')
| -rw-r--r-- | package/linux-pam/linux-pam-group.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/package/linux-pam/linux-pam-group.patch b/package/linux-pam/linux-pam-group.patch new file mode 100644 index 000000000..a94cf9e3d --- /dev/null +++ b/package/linux-pam/linux-pam-group.patch @@ -0,0 +1,26 @@ +Conditionally compile per innetgr availability + +innetgr is not available/functional in uclibc, provide conditions for compilation. + +Signed-off-by: Dmitry Golubovsky <golubovsky@gmail.com> + +Index: linux-pam-1.1.4/modules/pam_group/pam_group.c +============================================================================ +--- linux-pam-1.1.4/modules/pam_group/pam_group.c 2011-06-21 05:04:56.000000000 -0400 ++++ linux-pam-1.1.4/modules/pam_group/pam_group.c 2012-08-09 21:35:06.000000000 -0400 +@@ -655,8 +655,14 @@ + continue; + } + /* If buffer starts with @, we are using netgroups */ +- if (buffer[0] == '@') ++ if (buffer[0] == '@') { ++#ifdef HAVE_INNETGR + good &= innetgr (&buffer[1], NULL, user, NULL); ++#else ++ good = 0; ++ pam_syslog (pamh, LOG_ERR, "pam_group does not have netgroup support"); ++#endif /* HAVE_INNETGR */ ++ } + /* otherwise, if the buffer starts with %, it's a UNIX group */ + else if (buffer[0] == '%') + good &= pam_modutil_user_in_group_nam_nam(pamh, user, &buffer[1]); |