[25557] in Source-Commits
/svn/athena r25083 - in trunk/debathena/debathena/libnss-nonlocal: . debian
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Thu Mar 31 00:33:35 2011
Date: Thu, 31 Mar 2011 00:33:28 -0400
From: Anders Kaseorg <andersk@MIT.EDU>
Message-Id: <201103310433.p2V4XSpH028577@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: andersk
Date: 2011-03-31 00:33:28 -0400 (Thu, 31 Mar 2011)
New Revision: 25083
Added:
trunk/debathena/debathena/libnss-nonlocal/walk_nss.h
Modified:
trunk/debathena/debathena/libnss-nonlocal/Makefile.am
trunk/debathena/debathena/libnss-nonlocal/README
trunk/debathena/debathena/libnss-nonlocal/configure.ac
trunk/debathena/debathena/libnss-nonlocal/debian/changelog
trunk/debathena/debathena/libnss-nonlocal/debian/control.in
trunk/debathena/debathena/libnss-nonlocal/debian/libnss-nonlocal.postrm
trunk/debathena/debathena/libnss-nonlocal/debian/libnss-nonlocal.preinst
trunk/debathena/debathena/libnss-nonlocal/debian/rules
trunk/debathena/debathena/libnss-nonlocal/nonlocal-group.c
trunk/debathena/debathena/libnss-nonlocal/nonlocal-passwd.c
trunk/debathena/debathena/libnss-nonlocal/nonlocal-shadow.c
trunk/debathena/debathena/libnss-nonlocal/nonlocal.h
Log:
In nss_nonlocal:
* New upstream release.
- Fix errno saving and restoring.
- Document nss-nonlocal-users and nss-local-users groups in README.
- Allow local whitelisting of nonlocal user and group memberships,
using the magic local ?\226?\128?\152nss-nonlocal-users?\226?\128?\153 user and group.
* Create magic ?\226?\128?\152nss-nonlocal-users?\226?\128?\153 user.
* Remove obsolete exclusion of glibc-private dependency.
* Use automake 1.10 and autoconf 2.61.
* Add multiarch support for distros from the future.
* Disable dh_buildinfo, which currently fails at multiarch.
Full history: git://andersk.mit.edu/nss_nonlocal.git debian/2.0-0debathena1
Modified: trunk/debathena/debathena/libnss-nonlocal/Makefile.am
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/Makefile.am 2011-03-30 04:28:08 UTC (rev 25082)
+++ trunk/debathena/debathena/libnss-nonlocal/Makefile.am 2011-03-31 04:33:28 UTC (rev 25083)
@@ -4,13 +4,9 @@
nonlocal.h nsswitch-internal.h
libnss_nonlocal_la_LDFLAGS = \
-version-info 2:0:0 \
- -export-symbols-regex '^_nss_nonlocal_'
+ -export-symbols-regex '^_nss_nonlocal_' \
+ -no-undefined -Wl,-z,defs
-noinst_PROGRAMS = .linktest
-_linktest_SOURCES =
-_linktest_LDADD = libnss_nonlocal.la
-_linktest_LDFLAGS = -nostdlib -entry=0
-
install-exec-hook:
rm -f $(DESTDIR)$(libdir)/libnss_nonlocal.so
rm -f $(DESTDIR)$(libdir)/libnss_nonlocal.la
Modified: trunk/debathena/debathena/libnss-nonlocal/README
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/README 2011-03-30 04:28:08 UTC (rev 25082)
+++ trunk/debathena/debathena/libnss-nonlocal/README 2011-03-31 04:33:28 UTC (rev 25083)
@@ -9,6 +9,21 @@
group: compat nonlocal
group_nonlocal: hesiod
+The module also assigns special properties to two local groups and one
+local user, if they exist:
+
+• If the local group ‘nss-nonlocal-users’ exists, then nonlocal users
+ will be automatically added to it. Furthermore, if a local user is
+ added to this group, then that user will inherit any nonlocal gids
+ from a nonlocal user of the same name, as supplementary gids.
+
+• If the local group ‘nss-local-users’ exists, then local users will
+ be automatically added to it.
+
+• If the local user ‘nss-nonlocal-users’ is added to a local group,
+ then the local group will inherit the nonlocal membership of a group
+ of the same gid.
+
Copyright © 2007–2010 Anders Kaseorg <andersk@mit.edu> and Tim Abbott
<tabbott@mit.edu>
Modified: trunk/debathena/debathena/libnss-nonlocal/configure.ac
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/configure.ac 2011-03-30 04:28:08 UTC (rev 25082)
+++ trunk/debathena/debathena/libnss-nonlocal/configure.ac 2011-03-31 04:33:28 UTC (rev 25083)
@@ -1,4 +1,4 @@
-AC_INIT([nss_nonlocal], [1.11], [andersk@mit.edu])
+AC_INIT([nss_nonlocal], [2.0], [andersk@mit.edu])
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@ -9,6 +9,8 @@
AC_PROG_INSTALL
AC_PROG_LIBTOOL
+AC_HEADER_STDBOOL
+
case "$target_cpu" in
i386 | i486 | i586 | i686 | i786)
AC_DEFINE([USE_REGPARMS], [],
Modified: trunk/debathena/debathena/libnss-nonlocal/debian/changelog
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/debian/changelog 2011-03-30 04:28:08 UTC (rev 25082)
+++ trunk/debathena/debathena/libnss-nonlocal/debian/changelog 2011-03-31 04:33:28 UTC (rev 25083)
@@ -1,3 +1,18 @@
+libnss-nonlocal (2.0-0debathena1) unstable; urgency=low
+
+ * New upstream release.
+ - Fix errno saving and restoring.
+ - Document nss-nonlocal-users and nss-local-users groups in README.
+ - Allow local whitelisting of nonlocal user and group memberships,
+ using the magic local ‘nss-nonlocal-users’ user and group.
+ * Create magic ‘nss-nonlocal-users’ user.
+ * Remove obsolete exclusion of glibc-private dependency.
+ * Use automake 1.10 and autoconf 2.61.
+ * Add multiarch support for distros from the future.
+ * Disable dh_buildinfo, which currently fails at multiarch.
+
+ -- Anders Kaseorg <andersk@mit.edu> Wed, 30 Mar 2011 04:57:36 -0400
+
libnss-nonlocal (1.11-0debathena3) unstable; urgency=low
* Remove the workaround for buggy CDBS $(CC) splitting (fixed upstream).
Modified: trunk/debathena/debathena/libnss-nonlocal/debian/control.in
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/debian/control.in 2011-03-30 04:28:08 UTC (rev 25082)
+++ trunk/debathena/debathena/libnss-nonlocal/debian/control.in 2011-03-31 04:33:28 UTC (rev 25083)
@@ -9,6 +9,7 @@
Package: libnss-nonlocal
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: nsswitch proxy module to prevent local account spoofing
This nsswitch module acts as a proxy for other nsswitch modules like
@@ -17,6 +18,7 @@
Package: lib32nss-nonlocal
Architecture: amd64
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: nsswitch proxy module to prevent local account spoofing (32-bit library)
This nsswitch module acts as a proxy for other nsswitch modules like
@@ -28,6 +30,7 @@
Package: lib64nss-nonlocal
Architecture: i386
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: nsswitch proxy module to prevent local account spoofing (64-bit library)
This nsswitch module acts as a proxy for other nsswitch modules like
Modified: trunk/debathena/debathena/libnss-nonlocal/debian/libnss-nonlocal.postrm
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/debian/libnss-nonlocal.postrm 2011-03-30 04:28:08 UTC (rev 25082)
+++ trunk/debathena/debathena/libnss-nonlocal/debian/libnss-nonlocal.postrm 2011-03-31 04:33:28 UTC (rev 25083)
@@ -21,6 +21,9 @@
case "$1" in
purge)
+ if getent passwd nss-nonlocal-users >/dev/null; then
+ deluser --system nss-nonlocal-users || :
+ fi
if getent group nss-local-users >/dev/null; then
delgroup --system nss-local-users || :
fi
Modified: trunk/debathena/debathena/libnss-nonlocal/debian/libnss-nonlocal.preinst
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/debian/libnss-nonlocal.preinst 2011-03-30 04:28:08 UTC (rev 25082)
+++ trunk/debathena/debathena/libnss-nonlocal/debian/libnss-nonlocal.preinst 2011-03-31 04:33:28 UTC (rev 25083)
@@ -16,6 +16,11 @@
case "$1" in
install|upgrade)
+ if ! getent passwd nss-nonlocal-users >/dev/null; then
+ adduser --system --no-create-home --home /nonexistent \
+ --gecos 'Magic user for local group whitelist' \
+ nss-nonlocal-users
+ fi
if ! getent group nss-local-users >/dev/null; then
addgroup --system nss-local-users
fi
Modified: trunk/debathena/debathena/libnss-nonlocal/debian/rules
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/debian/rules 2011-03-30 04:28:08 UTC (rev 25082)
+++ trunk/debathena/debathena/libnss-nonlocal/debian/rules 2011-03-31 04:33:28 UTC (rev 25083)
@@ -1,11 +1,14 @@
#!/usr/bin/make -f
-DEB_AUTO_UPDATE_AUTOCONF = 2.50
-DEB_AUTO_UPDATE_AUTOHEADER = 2.50
-DEB_AUTO_UPDATE_AUTOMAKE = 1.9
-DEB_AUTO_UPDATE_ACLOCAL = 1.9
+DEB_AUTO_UPDATE_AUTOCONF = 2.61
+DEB_AUTO_UPDATE_AUTOHEADER = 2.61
+DEB_AUTO_UPDATE_AUTOMAKE = 1.10
+DEB_AUTO_UPDATE_ACLOCAL = 1.10
DEB_AUTO_UPDATE_LIBTOOL = pre
+# dh_buildinfo fails at multiarch: http://bugs.debian.org/620104
+CDBS_BUILD_DEPENDS_rules_debhelper_buildinfo =
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
@@ -13,14 +16,17 @@
DEB_DH_INSTALL_SOURCEDIR = $(DEB_DESTDIR)
DEB_CONFIGURE_PREFIX = /
+ifneq ($(DEB_HOST_MULTIARCH),)
+ export DH_COMPAT = 9
+ DEB_CONFIGURE_EXTRA_FLAGS += $(MULTIARCH_CONFIGURE_FLAGS)
+ MULTIARCH_CONFIGURE_FLAGS = --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)'
+ DEB_DH_GENCONTROL_ARGS_libnss-nonlocal += -- -DMulti-Arch=same
+endif
+
IS_UBUNTU := $(if $(filter Ubuntu,$(shell lsb_release -is)),y)
LIBC6_VERSION := $(shell dpkg-query --showformat='$${Version}' --show libc6)
libc6_ge = $(shell dpkg --compare-versions '$(LIBC6_VERSION)' ge '$(1)' && echo y)
-ifeq ($(call libc6_ge,2.8+20080809),y)
- DEB_DH_SHLIBDEPS_ARGS = -- -xglibc-private
-endif
-
debian/stamp-autotools-files: DEB_AUTO_UPDATE_AUTOMAKE += --foreign --add-missing
debian/stamp-autotools-files: aclocal.m4
@@ -33,6 +39,7 @@
DEB_BUILDDIR_lib32nss-nonlocal = debian/build_32
cleanbuilddir/lib32nss-nonlocal:: clean/lib32nss-nonlocal
+configure/lib32nss-nonlocal:: MULTIARCH_CONFIGURE_FLAGS =
configure/lib32nss-nonlocal:: cdbs_crossbuild =
# i386_configure_target in eglibc/debian/sysdeps/amd64.mk
ifeq ($(or $(IS_UBUNTU),$(call libc6_ge,2.8+20080809)),y)
@@ -53,6 +60,7 @@
DEB_BUILDDIR_lib64nss-nonlocal = debian/build_64
cleanbuilddir/lib64nss-nonlocal:: clean/lib64nss-nonlocal
+configure/lib64nss-nonlocal:: MULTIARCH_CONFIGURE_FLAGS =
configure/lib64nss-nonlocal:: cdbs_crossbuild =
# amd64_configure_target in eglibc/debian/sysdeps/i386.mk
configure/lib64nss-nonlocal:: DEB_BUILD_GNU_TYPE = x86_64-linux
Modified: trunk/debathena/debathena/libnss-nonlocal/nonlocal-group.c
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/nonlocal-group.c 2011-03-30 04:28:08 UTC (rev 25082)
+++ trunk/debathena/debathena/libnss-nonlocal/nonlocal-group.c 2011-03-31 04:33:28 UTC (rev 25083)
@@ -33,15 +33,35 @@
#include <stdio.h>
#include <syslog.h>
#include <errno.h>
+#include <pwd.h>
#include <grp.h>
#include <nss.h>
#include "nsswitch-internal.h"
#include "nonlocal.h"
+/*
+ * If the MAGIC_NONLOCAL_GROUPNAME local group exists, then nonlocal
+ * users will be automatically added to it. Furthermore, if a local
+ * user is added to this group, then that user will inherit any
+ * nonlocal gids from a nonlocal user of the same name, as
+ * supplementary gids.
+ */
#define MAGIC_NONLOCAL_GROUPNAME "nss-nonlocal-users"
+
+/*
+ * If the MAGIC_LOCAL_GROUPNAME local group exists, then local users
+ * will be automatically added to it.
+ */
#define MAGIC_LOCAL_GROUPNAME "nss-local-users"
+/*
+ * If the MAGIC_NONLOCAL_USERNAME local user is added to a local
+ * group, then the local group will inherit the nonlocal membership of
+ * a group of the same gid.
+ */
+#define MAGIC_NONLOCAL_USERNAME "nss-nonlocal-users"
+
enum nss_status
_nss_nonlocal_getgrnam_r(const char *name, struct group *grp,
char *buffer, size_t buflen, int *errnop);
@@ -51,76 +71,65 @@
char *buffer, size_t buflen, int *errnop);
-static service_user *
-nss_group_nonlocal_database(void)
+static service_user *__nss_group_nonlocal_database;
+
+static int
+internal_function
+__nss_group_nonlocal_lookup(service_user **ni, const char *fct_name,
+ void **fctp)
{
- static service_user *nip = NULL;
- if (nip == NULL)
- __nss_database_lookup("group_nonlocal", NULL, "", &nip);
+ if (__nss_group_nonlocal_database == NULL
+ && __nss_database_lookup("group_nonlocal", NULL, NULL,
+ &__nss_group_nonlocal_database) < 0)
+ return -1;
- return nip;
+ *ni = __nss_group_nonlocal_database;
+
+ *fctp = __nss_lookup_function(*ni, fct_name);
+ return 0;
}
enum nss_status
-check_nonlocal_gid(const char *user, gid_t gid, int *errnop)
+check_nonlocal_gid(const char *user, const char *group, gid_t gid, int *errnop)
{
- static const char *fct_name = "getgrgid_r";
- static service_user *startp = NULL;
- static void *fct_start = NULL;
enum nss_status status;
- service_user *nip;
- union {
- enum nss_status (*l)(gid_t gid, struct group *grp,
- char *buffer, size_t buflen, int *errnop);
- void *ptr;
- } fct;
struct group gbuf;
- int old_errno = errno;
-
+ char *buf;
size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
- char *buf = malloc(buflen);
- if (buf == NULL) {
- *errnop = ENOMEM;
- errno = old_errno;
- return NSS_STATUS_TRYAGAIN;
- }
+ const struct walk_nss w = {
+ .lookup = &__nss_group_lookup, .fct_name = "getgrgid_r",
+ .status = &status, .errnop = errnop, .buf = &buf, .buflen = &buflen
+ };
+ const __typeof__(&_nss_nonlocal_getgrgid_r) self = &_nss_nonlocal_getgrgid_r;
+#define args (gid, &gbuf, buf, buflen, errnop)
+#include "walk_nss.h"
+#undef args
- if (fct_start == NULL &&
- __nss_group_lookup(&startp, fct_name, &fct_start) != 0) {
- free(buf);
- return NSS_STATUS_UNAVAIL;
- }
- nip = startp;
- fct.ptr = fct_start;
- do {
- morebuf:
- if (fct.l == _nss_nonlocal_getgrgid_r)
- status = NSS_STATUS_NOTFOUND;
- else
- status = DL_CALL_FCT(fct.l, (gid, &gbuf, buf, buflen, errnop));
- if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) {
- free(buf);
- buflen *= 2;
- buf = malloc(buflen);
- if (buf == NULL) {
- *errnop = ENOMEM;
- errno = old_errno;
- return NSS_STATUS_TRYAGAIN;
- }
- goto morebuf;
- }
- } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
+ if (status == NSS_STATUS_TRYAGAIN)
+ return status;
+ else if (status != NSS_STATUS_SUCCESS)
+ return NSS_STATUS_SUCCESS;
- if (status == NSS_STATUS_SUCCESS) {
- syslog(LOG_DEBUG, "nss_nonlocal: removing local group %u (%s) from non-local user %s\n", gbuf.gr_gid, gbuf.gr_name, user);
- status = NSS_STATUS_NOTFOUND;
- } else if (status != NSS_STATUS_TRYAGAIN) {
- status = NSS_STATUS_SUCCESS;
+ if (group == NULL || strcmp(gbuf.gr_name, group) == 0) {
+ char *const *mem;
+ for (mem = gbuf.gr_mem; *mem != NULL; mem++)
+ if (strcmp(*mem, MAGIC_NONLOCAL_USERNAME) == 0) {
+ status = check_nonlocal_user(*mem, errnop);
+ if (status == NSS_STATUS_TRYAGAIN) {
+ free(buf);
+ return status;
+ } else if (status == NSS_STATUS_NOTFOUND) {
+ free(buf);
+ return NSS_STATUS_SUCCESS;
+ }
+ break;
+ }
}
+ syslog(LOG_DEBUG, "nss_nonlocal: removing local group %u (%s) from non-local user %s\n", gbuf.gr_gid, gbuf.gr_name, user);
free(buf);
- return status;
+ return NSS_STATUS_NOTFOUND;
}
enum nss_status
@@ -133,75 +142,34 @@
errno = 0;
gid = strtoul(grp->gr_name, &end, 10);
- if (errno == 0 && *end == '\0' && (gid_t)gid == gid)
- status = check_nonlocal_gid(user, gid, errnop);
- errno = old_errno;
+ if (errno == 0 && *end == '\0' && (gid_t)gid == gid) {
+ errno = old_errno;
+ status = check_nonlocal_gid(user, grp->gr_name, gid, errnop);
+ } else
+ errno = old_errno;
if (status != NSS_STATUS_SUCCESS)
return status;
- return check_nonlocal_gid(user, grp->gr_gid, errnop);
+ return check_nonlocal_gid(user, grp->gr_name, grp->gr_gid, errnop);
}
enum nss_status
get_local_group(const char *name, struct group *grp, char **buffer, int *errnop)
{
- static const char *fct_name = "getgrnam_r";
- static service_user *startp = NULL;
- static void *fct_start = NULL;
enum nss_status status;
- service_user *nip;
- union {
- enum nss_status (*l)(const char *name, struct group *grp,
- char *buffer, size_t buflen, int *errnop);
- void *ptr;
- } fct;
- size_t buflen;
- int old_errno = errno;
-
- buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
- *buffer = malloc(buflen);
- if (*buffer == NULL) {
- *errnop = ENOMEM;
- errno = old_errno;
- return NSS_STATUS_TRYAGAIN;
- }
-
- if (fct_start == NULL &&
- __nss_group_lookup(&startp, fct_name, &fct_start) != 0) {
- free(*buffer);
- *buffer = NULL;
- return NSS_STATUS_UNAVAIL;
- }
- nip = startp;
- fct.ptr = fct_start;
- do {
- morebuf:
- if (fct.l == _nss_nonlocal_getgrnam_r)
- status = NSS_STATUS_NOTFOUND;
- else
- status = DL_CALL_FCT(fct.l, (name, grp, *buffer, buflen, errnop));
- if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) {
- free(*buffer);
- buflen *= 2;
- *buffer = malloc(buflen);
- if (*buffer == NULL) {
- *errnop = ENOMEM;
- errno = old_errno;
- return NSS_STATUS_TRYAGAIN;
- }
- goto morebuf;
- }
- } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
-
- if (status != NSS_STATUS_SUCCESS) {
- free(*buffer);
- *buffer = NULL;
- }
-
+ size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+ const struct walk_nss w = {
+ .lookup = &__nss_group_lookup, .fct_name = "getgrnam_r",
+ .status = &status, .errnop = errnop, .buf = buffer, .buflen = &buflen
+ };
+ const __typeof__(&_nss_nonlocal_getgrnam_r) self = &_nss_nonlocal_getgrnam_r;
+#define args (name, grp, *buffer, buflen, errnop)
+#include "walk_nss.h"
+#undef args
return status;
}
-static service_user *grent_nip = NULL;
+static service_user *grent_startp, *grent_nip;
static void *grent_fct_start;
static union {
enum nss_status (*l)(struct group *grp, char *buffer, size_t buflen,
@@ -213,33 +181,22 @@
enum nss_status
_nss_nonlocal_setgrent(int stayopen)
{
- static const char *fct_name = "setgrent";
- static void *fct_start = NULL;
enum nss_status status;
- service_user *nip;
- union {
- enum nss_status (*l)(int stayopen);
- void *ptr;
- } fct;
-
- nip = nss_group_nonlocal_database();
- if (nip == NULL)
- return NSS_STATUS_UNAVAIL;
- if (fct_start == NULL)
- fct_start = __nss_lookup_function(nip, fct_name);
- fct.ptr = fct_start;
- do {
- if (fct.ptr == NULL)
- status = NSS_STATUS_UNAVAIL;
- else
- status = DL_CALL_FCT(fct.l, (stayopen));
- } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
+ const struct walk_nss w = {
+ .lookup = &__nss_group_nonlocal_lookup, .fct_name = "setgrent",
+ .status = &status
+ };
+ const __typeof__(&_nss_nonlocal_setgrent) self = NULL;
+#define args (stayopen)
+#include "walk_nss.h"
+#undef args
if (status != NSS_STATUS_SUCCESS)
return status;
- grent_nip = nip;
if (grent_fct_start == NULL)
- grent_fct_start = __nss_lookup_function(nip, grent_fct_name);
+ __nss_group_nonlocal_lookup(&grent_startp, grent_fct_name,
+ &grent_fct_start);
+ grent_nip = grent_startp;
grent_fct.ptr = grent_fct_start;
return NSS_STATUS_SUCCESS;
}
@@ -247,29 +204,18 @@
enum nss_status
_nss_nonlocal_endgrent(void)
{
- static const char *fct_name = "endgrent";
- static void *fct_start = NULL;
enum nss_status status;
- service_user *nip;
- union {
- enum nss_status (*l)(void);
- void *ptr;
- } fct;
+ const struct walk_nss w = {
+ .lookup = &__nss_group_nonlocal_lookup, .fct_name = "endgrent",
+ .status = &status
+ };
+ const __typeof__(&_nss_nonlocal_endgrent) self = NULL;
grent_nip = NULL;
- nip = nss_group_nonlocal_database();
- if (nip == NULL)
- return NSS_STATUS_UNAVAIL;
- if (fct_start == NULL)
- fct_start = __nss_lookup_function(nip, fct_name);
- fct.ptr = fct_start;
- do {
- if (fct.ptr == NULL)
- status = NSS_STATUS_UNAVAIL;
- else
- status = DL_CALL_FCT(fct.l, ());
- } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
+#define args ()
+#include "walk_nss.h"
+#undef args
return status;
}
@@ -314,34 +260,20 @@
_nss_nonlocal_getgrnam_r(const char *name, struct group *grp,
char *buffer, size_t buflen, int *errnop)
{
- static const char *fct_name = "getgrnam_r";
- static void *fct_start = NULL;
enum nss_status status;
- service_user *nip;
- union {
- enum nss_status (*l)(const char *name, struct group *grp,
- char *buffer, size_t buflen, int *errnop);
- void *ptr;
- } fct;
+ const struct walk_nss w = {
+ .lookup = &__nss_group_nonlocal_lookup, .fct_name = "getgrnam_r",
+ .status = &status, .errnop = errnop
+ };
+ const __typeof__(&_nss_nonlocal_getgrnam_r) self = NULL;
char *nonlocal_ignore = getenv(NONLOCAL_IGNORE_ENV);
if (nonlocal_ignore != NULL && nonlocal_ignore[0] != '\0')
return NSS_STATUS_UNAVAIL;
- nip = nss_group_nonlocal_database();
- if (nip == NULL)
- return NSS_STATUS_UNAVAIL;
- if (fct_start == NULL)
- fct_start = __nss_lookup_function(nip, fct_name);
- fct.ptr = fct_start;
- do {
- if (fct.ptr == NULL)
- status = NSS_STATUS_UNAVAIL;
- else
- status = DL_CALL_FCT(fct.l, (name, grp, buffer, buflen, errnop));
- if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
- break;
- } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
+#define args (name, grp, buffer, buflen, errnop)
+#include "walk_nss.h"
+#undef args
if (status != NSS_STATUS_SUCCESS)
return status;
@@ -357,34 +289,20 @@
_nss_nonlocal_getgrgid_r(gid_t gid, struct group *grp,
char *buffer, size_t buflen, int *errnop)
{
- static const char *fct_name = "getgrgid_r";
- static void *fct_start = NULL;
enum nss_status status;
- service_user *nip;
- union {
- enum nss_status (*l)(gid_t gid, struct group *grp,
- char *buffer, size_t buflen, int *errnop);
- void *ptr;
- } fct;
+ const struct walk_nss w = {
+ .lookup = &__nss_group_nonlocal_lookup, .fct_name = "getgrgid_r",
+ .status = &status, .errnop = errnop
+ };
+ const __typeof__(&_nss_nonlocal_getgrgid_r) self = NULL;
char *nonlocal_ignore = getenv(NONLOCAL_IGNORE_ENV);
if (nonlocal_ignore != NULL && nonlocal_ignore[0] != '\0')
return NSS_STATUS_UNAVAIL;
- nip = nss_group_nonlocal_database();
- if (nip == NULL)
- return NSS_STATUS_UNAVAIL;
- if (fct_start == NULL)
- fct_start = __nss_lookup_function(nip, fct_name);
- fct.ptr = fct_start;
- do {
- if (fct.ptr == NULL)
- status = NSS_STATUS_UNAVAIL;
- else
- status = DL_CALL_FCT(fct.l, (gid, grp, buffer, buflen, errnop));
- if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
- break;
- } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
+#define args (gid, grp, buffer, buflen, errnop)
+#include "walk_nss.h"
+#undef args
if (status != NSS_STATUS_SUCCESS)
return status;
@@ -396,116 +314,136 @@
return check_nonlocal_group(grp->gr_name, grp, errnop);
}
+static bool
+add_group(gid_t group, long int *start, long int *size, gid_t **groupsp,
+ long int limit, int *errnop, enum nss_status *status)
+{
+ int i, old_errno = errno;
+ for (i = 0; i < *start; ++i)
+ if ((*groupsp)[i] == group)
+ return true;
+ if (*start + 1 > *size) {
+ gid_t *newgroups;
+ long int newsize = 2 * *size;
+ if (limit > 0) {
+ if (*size >= limit) {
+ *status = NSS_STATUS_SUCCESS;
+ return false;
+ }
+ if (newsize > limit)
+ newsize = limit;
+ }
+ newgroups = realloc(*groupsp, newsize * sizeof((*groupsp)[0]));
+ errno = old_errno;
+ if (newgroups == NULL) {
+ *errnop = ENOMEM;
+ *status = NSS_STATUS_TRYAGAIN;
+ return false;
+ }
+ *groupsp = newgroups;
+ *size = newsize;
+ }
+ (*groupsp)[(*start)++] = group;
+ return true;
+}
+
enum nss_status
_nss_nonlocal_initgroups_dyn(const char *user, gid_t group, long int *start,
long int *size, gid_t **groupsp, long int limit,
int *errnop)
{
- static const char *fct_name = "initgroups_dyn";
- static void *fct_start = NULL;
enum nss_status status;
- service_user *nip;
- union {
- enum nss_status (*l)(const char *user, gid_t group, long int *start,
- long int *size, gid_t **groupsp, long int limit,
- int *errnop);
- void *ptr;
- } fct;
+ const struct walk_nss w = {
+ .lookup = &__nss_group_nonlocal_lookup, .fct_name = "initgroups_dyn",
+ .status = &status, .errnop = errnop
+ };
+ const __typeof__(&_nss_nonlocal_initgroups_dyn) self = NULL;
struct group local_users_group, nonlocal_users_group;
- gid_t local_users_gid, gid;
- int is_local = 0;
+ bool is_nonlocal = true;
char *buffer;
- int old_errno;
int in, out, i;
- /* Check that the user is a nonlocal user before adding any groups. */
+ /* Check that the user is a nonlocal user, or a member of the
+ * MAGIC_NONLOCAL_GROUPNAME group, before adding any groups. */
status = check_nonlocal_user(user, errnop);
- if (status == NSS_STATUS_TRYAGAIN)
+ if (status == NSS_STATUS_TRYAGAIN) {
return status;
- else if (status != NSS_STATUS_SUCCESS)
- is_local = 1;
+ } else if (status != NSS_STATUS_SUCCESS) {
+ is_nonlocal = false;
- old_errno = errno;
-
- status = get_local_group(MAGIC_LOCAL_GROUPNAME,
- &local_users_group, &buffer, errnop);
- if (status == NSS_STATUS_SUCCESS) {
- local_users_gid = local_users_group.gr_gid;
- free(buffer);
- } else if (status == NSS_STATUS_TRYAGAIN) {
- return status;
- } else {
- syslog(LOG_WARNING, "nss_nonlocal: Group %s does not exist locally!",
- MAGIC_LOCAL_GROUPNAME);
- local_users_gid = -1;
- }
-
- if (is_local) {
- gid = local_users_gid;
- } else {
- status = get_local_group(MAGIC_NONLOCAL_GROUPNAME,
- &nonlocal_users_group, &buffer, errnop);
+ status = get_local_group(MAGIC_LOCAL_GROUPNAME,
+ &local_users_group, &buffer, errnop);
if (status == NSS_STATUS_SUCCESS) {
- gid = nonlocal_users_group.gr_gid;
free(buffer);
+ if (!add_group(local_users_group.gr_gid, start, size, groupsp,
+ limit, errnop, &status))
+ return status;
} else if (status == NSS_STATUS_TRYAGAIN) {
return status;
} else {
- syslog(LOG_WARNING, "nss_nonlocal: Group %s does not exist locally!",
- MAGIC_NONLOCAL_GROUPNAME);
- gid = -1;
+ syslog(LOG_WARNING,
+ "nss_nonlocal: Group %s does not exist locally!",
+ MAGIC_LOCAL_GROUPNAME);
}
}
- if (gid != -1) {
- int i;
- for (i = 0; i < *start; ++i)
- if ((*groupsp)[i] == gid)
- break;
- if (i >= *start) {
- if (*start + 1 > *size) {
- gid_t *newgroups;
- long int newsize = 2 * *size;
- if (limit > 0) {
- if (*size >= limit)
- return NSS_STATUS_SUCCESS;
- if (newsize > limit)
- newsize = limit;
+ status = get_local_group(MAGIC_NONLOCAL_GROUPNAME,
+ &nonlocal_users_group, &buffer, errnop);
+ if (status == NSS_STATUS_SUCCESS) {
+ free(buffer);
+ if (is_nonlocal) {
+ if (!add_group(nonlocal_users_group.gr_gid, start, size, groupsp,
+ limit, errnop, &status))
+ return status;
+ } else {
+ int i;
+ for (i = 0; i < *start; ++i) {
+ if ((*groupsp)[i] == nonlocal_users_group.gr_gid) {
+ is_nonlocal = true;
+ break;
}
- newgroups = realloc(*groupsp, newsize * sizeof((*groupsp)[0]));
- if (newgroups == NULL) {
- *errnop = ENOMEM;
- errno = old_errno;
- return NSS_STATUS_TRYAGAIN;
+ }
+
+ if (is_nonlocal) {
+ struct passwd pwbuf;
+ char *buf;
+ int nonlocal_errno = *errnop;
+ status = get_nonlocal_passwd(user, &pwbuf, &buf, errnop);
+
+ if (status == NSS_STATUS_SUCCESS) {
+ nonlocal_errno = *errnop;
+ status = check_nonlocal_gid(user, NULL, pwbuf.pw_gid,
+ &nonlocal_errno);
+ free(buf);
}
- *groupsp = newgroups;
- *size = newsize;
+
+ if (status == NSS_STATUS_SUCCESS) {
+ if (!add_group(pwbuf.pw_gid, start, size, groupsp, limit,
+ errnop, &status))
+ return status;
+ } else if (status == NSS_STATUS_TRYAGAIN) {
+ *errnop = nonlocal_errno;
+ return status;
+ }
}
- (*groupsp)[(*start)++] = gid;
}
+ } else if (status == NSS_STATUS_TRYAGAIN) {
+ if (is_nonlocal)
+ return status;
+ } else {
+ syslog(LOG_WARNING, "nss_nonlocal: Group %s does not exist locally!",
+ MAGIC_NONLOCAL_GROUPNAME);
}
- if (is_local)
+ if (!is_nonlocal)
return NSS_STATUS_SUCCESS;
in = out = *start;
- nip = nss_group_nonlocal_database();
- if (nip == NULL)
- return NSS_STATUS_UNAVAIL;
- if (fct_start == NULL)
- fct_start = __nss_lookup_function(nip, fct_name);
- fct.ptr = fct_start;
-
- do {
- if (fct.ptr == NULL)
- status = NSS_STATUS_UNAVAIL;
- else
- status = DL_CALL_FCT(fct.l, (user, group, start, size, groupsp, limit, errnop));
- if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
- break;
- } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
+#define args (user, group, start, size, groupsp, limit, errnop)
+#include "walk_nss.h"
+#undef args
if (status != NSS_STATUS_SUCCESS)
return status;
@@ -518,14 +456,8 @@
if (i < out)
continue;
- /* Don't let users get into MAGIC_LOCAL_GROUPNAME from nonlocal reasons. */
- if (local_users_gid == (*groupsp)[in]) {
- syslog(LOG_WARNING, "nss_nonlocal: Nonlocal user %s removed from special local users group %s",
- user, MAGIC_LOCAL_GROUPNAME);
- continue;
- }
-
- status = check_nonlocal_gid(user, (*groupsp)[in], &nonlocal_errno);
+ status = check_nonlocal_gid(user, NULL, (*groupsp)[in],
+ &nonlocal_errno);
if (status == NSS_STATUS_SUCCESS) {
(*groupsp)[out++] = (*groupsp)[in];
} else if (status == NSS_STATUS_TRYAGAIN) {
Modified: trunk/debathena/debathena/libnss-nonlocal/nonlocal-passwd.c
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/nonlocal-passwd.c 2011-03-30 04:28:08 UTC (rev 25082)
+++ trunk/debathena/debathena/libnss-nonlocal/nonlocal-passwd.c 2011-03-31 04:33:28 UTC (rev 25083)
@@ -49,75 +49,49 @@
char *buffer, size_t buflen, int *errnop);
-static service_user *
-nss_passwd_nonlocal_database(void)
+static service_user *__nss_passwd_nonlocal_database;
+
+static int
+internal_function
+__nss_passwd_nonlocal_lookup(service_user **ni, const char *fct_name,
+ void **fctp)
{
- static service_user *nip = NULL;
- if (nip == NULL)
- __nss_database_lookup("passwd_nonlocal", NULL, "", &nip);
+ if (__nss_passwd_nonlocal_database == NULL
+ && __nss_database_lookup("passwd_nonlocal", NULL, NULL,
+ &__nss_passwd_nonlocal_database) < 0)
+ return -1;
- return nip;
+ *ni = __nss_passwd_nonlocal_database;
+
+ *fctp = __nss_lookup_function(*ni, fct_name);
+ return 0;
}
enum nss_status
check_nonlocal_uid(const char *user, uid_t uid, int *errnop)
{
- static const char *fct_name = "getpwuid_r";
- static service_user *startp = NULL;
- static void *fct_start = NULL;
enum nss_status status;
- service_user *nip;
- union {
- enum nss_status (*l)(uid_t uid, struct passwd *pwd,
- char *buffer, size_t buflen, int *errnop);
- void *ptr;
- } fct;
struct passwd pwbuf;
- int old_errno = errno;
-
+ char *buf;
size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
- char *buf = malloc(buflen);
- if (buf == NULL) {
- *errnop = ENOMEM;
- errno = old_errno;
- return NSS_STATUS_TRYAGAIN;
- }
+ const struct walk_nss w = {
+ .lookup = &__nss_passwd_lookup, .fct_name = "getpwuid_r",
+ .status = &status, .errnop = errnop, .buf = &buf, .buflen = &buflen
+ };
+ const __typeof__(&_nss_nonlocal_getpwuid_r) self = &_nss_nonlocal_getpwuid_r;
+#define args (uid, &pwbuf, buf, buflen, errnop)
+#include "walk_nss.h"
+#undef args
- if (fct_start == NULL &&
- __nss_passwd_lookup(&startp, fct_name, &fct_start) != 0) {
- free(buf);
- return NSS_STATUS_UNAVAIL;
- }
- nip = startp;
- fct.ptr = fct_start;
- do {
- morebuf:
- if (fct.l == _nss_nonlocal_getpwuid_r)
- status = NSS_STATUS_NOTFOUND;
- else
- status = DL_CALL_FCT(fct.l, (uid, &pwbuf, buf, buflen, errnop));
- if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) {
- free(buf);
- buflen *= 2;
- buf = malloc(buflen);
- if (buf == NULL) {
- *errnop = ENOMEM;
- errno = old_errno;
- return NSS_STATUS_TRYAGAIN;
- }
- goto morebuf;
- }
- } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
-
if (status == NSS_STATUS_SUCCESS) {
syslog(LOG_ERR, "nss_nonlocal: possible spoofing attack: non-local user %s has same UID as local user %s!\n", user, pwbuf.pw_name);
+ free(buf);
status = NSS_STATUS_NOTFOUND;
} else if (status != NSS_STATUS_TRYAGAIN) {
status = NSS_STATUS_SUCCESS;
}
- free(buf);
return status;
}
@@ -131,9 +105,12 @@
errno = 0;
uid = strtoul(pwd->pw_name, &end, 10);
- if (errno == 0 && *end == '\0' && (uid_t)uid == uid)
+ if (errno == 0 && *end == '\0' && (uid_t)uid == uid) {
+ errno = old_errno;
status = check_nonlocal_uid(user, uid, errnop);
- errno = old_errno;
+ } else {
+ errno = old_errno;
+ }
if (status != NSS_STATUS_SUCCESS)
return status;
@@ -143,64 +120,48 @@
enum nss_status
check_nonlocal_user(const char *user, int *errnop)
{
- static const char *fct_name = "getpwnam_r";
- static service_user *startp = NULL;
- static void *fct_start = NULL;
enum nss_status status;
- service_user *nip;
- union {
- enum nss_status (*l)(const char *name, struct passwd *pwd,
- char *buffer, size_t buflen, int *errnop);
- void *ptr;
- } fct;
struct passwd pwbuf;
- int old_errno = errno;
-
+ char *buf;
size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
- char *buf = malloc(buflen);
- if (buf == NULL) {
- *errnop = ENOMEM;
- errno = old_errno;
- return NSS_STATUS_TRYAGAIN;
- }
+ const struct walk_nss w = {
+ .lookup = __nss_passwd_lookup, .fct_name = "getpwnam_r",
+ .status = &status, .errnop = errnop, .buf = &buf, .buflen = &buflen
+ };
+ const __typeof__(&_nss_nonlocal_getpwnam_r) self = &_nss_nonlocal_getpwnam_r;
+#define args (user, &pwbuf, buf, buflen, errnop)
+#include "walk_nss.h"
+#undef args
- if (fct_start == NULL &&
- __nss_passwd_lookup(&startp, fct_name, &fct_start) != 0) {
+ if (status == NSS_STATUS_SUCCESS) {
free(buf);
- return NSS_STATUS_UNAVAIL;
- }
- nip = startp;
- fct.ptr = fct_start;
- do {
- morebuf:
- if (fct.l == _nss_nonlocal_getpwnam_r)
- status = NSS_STATUS_NOTFOUND;
- else
- status = DL_CALL_FCT(fct.l, (user, &pwbuf, buf, buflen, errnop));
- if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) {
- free(buf);
- buflen *= 2;
- buf = malloc(buflen);
- if (buf == NULL) {
- *errnop = ENOMEM;
- errno = old_errno;
- return NSS_STATUS_TRYAGAIN;
- }
- goto morebuf;
- }
- } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
-
- if (status == NSS_STATUS_SUCCESS)
status = NSS_STATUS_NOTFOUND;
- else if (status != NSS_STATUS_TRYAGAIN)
+ } else if (status != NSS_STATUS_TRYAGAIN) {
status = NSS_STATUS_SUCCESS;
+ }
- free(buf);
return status;
}
+enum nss_status
+get_nonlocal_passwd(const char *name, struct passwd *pwd, char **buffer,
+ int *errnop)
+{
+ enum nss_status status;
+ size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
+ const struct walk_nss w = {
+ .lookup = __nss_passwd_nonlocal_lookup, .fct_name = "getpwnam_r",
+ .status = &status, .errnop = errnop, .buf = buffer, .buflen = &buflen
+ };
+ const __typeof__(&_nss_nonlocal_getpwnam_r) self = NULL;
+#define args (name, pwd, *buffer, buflen, errnop)
+#include "walk_nss.h"
+#undef args
+ return status;
+}
-static service_user *pwent_nip = NULL;
+
+static service_user *pwent_startp, *pwent_nip;
static void *pwent_fct_start;
static union {
enum nss_status (*l)(struct passwd *pwd, char *buffer, size_t buflen,
@@ -212,33 +173,22 @@
enum nss_status
_nss_nonlocal_setpwent(int stayopen)
{
- static const char *fct_name = "setpwent";
- static void *fct_start = NULL;
enum nss_status status;
- service_user *nip;
- union {
- enum nss_status (*l)(int stayopen);
- void *ptr;
- } fct;
-
- nip = nss_passwd_nonlocal_database();
- if (nip == NULL)
- return NSS_STATUS_UNAVAIL;
- if (fct_start == NULL)
- fct_start = __nss_lookup_function(nip, fct_name);
- fct.ptr = fct_start;
- do {
- if (fct.ptr == NULL)
- status = NSS_STATUS_UNAVAIL;
- else
- status = DL_CALL_FCT(fct.l, (stayopen));
- } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
+ const struct walk_nss w = {
+ .lookup = &__nss_passwd_nonlocal_lookup, .fct_name = "setpwent",
+ .status = &status
+ };
+ const __typeof__(&_nss_nonlocal_setpwent) self = NULL;
+#define args (stayopen)
+#include "walk_nss.h"
+#undef args
if (status != NSS_STATUS_SUCCESS)
return status;
- pwent_nip = nip;
if (pwent_fct_start == NULL)
- pwent_fct_start = __nss_lookup_function(nip, pwent_fct_name);
+ __nss_passwd_nonlocal_lookup(&pwent_startp, pwent_fct_name,
+ &pwent_fct_start);
+ pwent_nip = pwent_startp;
pwent_fct.ptr = pwent_fct_start;
return NSS_STATUS_SUCCESS;
}
@@ -246,29 +196,18 @@
enum nss_status
_nss_nonlocal_endpwent(void)
{
- static const char *fct_name = "endpwent";
- static void *fct_start = NULL;
enum nss_status status;
- service_user *nip;
- union {
- enum nss_status (*l)(void);
- void *ptr;
- } fct;
+ const struct walk_nss w = {
+ .lookup = &__nss_passwd_nonlocal_lookup, .fct_name = "endpwent",
+ .status = &status
+ };
+ const __typeof__(&_nss_nonlocal_endpwent) self = NULL;
pwent_nip = NULL;
- nip = nss_passwd_nonlocal_database();
- if (nip == NULL)
- return NSS_STATUS_UNAVAIL;
- if (fct_start == NULL)
- fct_start = __nss_lookup_function(nip, fct_name);
- fct.ptr = fct_start;
- do {
- if (fct.ptr == NULL)
- status = NSS_STATUS_UNAVAIL;
- else
- status = DL_CALL_FCT(fct.l, ());
- } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
+#define args ()
+#include "walk_nss.h"
+#undef args
return status;
}
@@ -313,35 +252,21 @@
_nss_nonlocal_getpwnam_r(const char *name, struct passwd *pwd,
char *buffer, size_t buflen, int *errnop)
{
- static const char *fct_name = "getpwnam_r";
- static void *fct_start = NULL;
enum nss_status status;
- service_user *nip;
- union {
- enum nss_status (*l)(const char *name, struct passwd *pwd,
- char *buffer, size_t buflen, int *errnop);
- void *ptr;
- } fct;
int group_errno;
+ const struct walk_nss w = {
+ .lookup = __nss_passwd_nonlocal_lookup, .fct_name = "getpwnam_r",
+ .status = &status, .errnop = errnop
+ };
+ const __typeof__(&_nss_nonlocal_getpwnam_r) self = NULL;
char *nonlocal_ignore = getenv(NONLOCAL_IGNORE_ENV);
if (nonlocal_ignore != NULL && nonlocal_ignore[0] != '\0')
return NSS_STATUS_UNAVAIL;
- nip = nss_passwd_nonlocal_database();
- if (nip == NULL)
- return NSS_STATUS_UNAVAIL;
- if (fct_start == NULL)
- fct_start = __nss_lookup_function(nip, fct_name);
- fct.ptr = fct_start;
- do {
- if (fct.ptr == NULL)
- status = NSS_STATUS_UNAVAIL;
- else
- status = DL_CALL_FCT(fct.l, (name, pwd, buffer, buflen, errnop));
- if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
- break;
- } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
+#define args (name, pwd, buffer, buflen, errnop)
+#include "walk_nss.h"
+#undef args
if (status != NSS_STATUS_SUCCESS)
return status;
@@ -354,7 +279,7 @@
if (status != NSS_STATUS_SUCCESS)
return status;
- if (check_nonlocal_gid(name, pwd->pw_gid, &group_errno) !=
+ if (check_nonlocal_gid(name, NULL, pwd->pw_gid, &group_errno) !=
NSS_STATUS_SUCCESS)
pwd->pw_gid = 65534 /* nogroup */;
return NSS_STATUS_SUCCESS;
@@ -364,35 +289,21 @@
_nss_nonlocal_getpwuid_r(uid_t uid, struct passwd *pwd,
char *buffer, size_t buflen, int *errnop)
{
- static const char *fct_name = "getpwuid_r";
- static void *fct_start = NULL;
enum nss_status status;
- service_user *nip;
- union {
- enum nss_status (*l)(uid_t uid, struct passwd *pwd,
- char *buffer, size_t buflen, int *errnop);
- void *ptr;
- } fct;
int group_errno;
+ const struct walk_nss w = {
+ .lookup = &__nss_passwd_nonlocal_lookup, .fct_name = "getpwuid_r",
+ .status = &status, .errnop = errnop
+ };
+ const __typeof__(&_nss_nonlocal_getpwuid_r) self = NULL;
char *nonlocal_ignore = getenv(NONLOCAL_IGNORE_ENV);
if (nonlocal_ignore != NULL && nonlocal_ignore[0] != '\0')
return NSS_STATUS_UNAVAIL;
- nip = nss_passwd_nonlocal_database();
- if (nip == NULL)
- return NSS_STATUS_UNAVAIL;
- if (fct_start == NULL)
- fct_start = __nss_lookup_function(nip, fct_name);
- fct.ptr = fct_start;
- do {
- if (fct.ptr == NULL)
- status = NSS_STATUS_UNAVAIL;
- else
- status = DL_CALL_FCT(fct.l, (uid, pwd, buffer, buflen, errnop));
- if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
- break;
- } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
+#define args (uid, pwd, buffer, buflen, errnop)
+#include "walk_nss.h"
+#undef args
if (status != NSS_STATUS_SUCCESS)
return status;
@@ -405,7 +316,7 @@
if (status != NSS_STATUS_SUCCESS)
return status;
- if (check_nonlocal_gid(pwd->pw_name, pwd->pw_gid, &group_errno) !=
+ if (check_nonlocal_gid(pwd->pw_name, NULL, pwd->pw_gid, &group_errno) !=
NSS_STATUS_SUCCESS)
pwd->pw_gid = 65534 /* nogroup */;
return NSS_STATUS_SUCCESS;
Modified: trunk/debathena/debathena/libnss-nonlocal/nonlocal-shadow.c
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/nonlocal-shadow.c 2011-03-30 04:28:08 UTC (rev 25082)
+++ trunk/debathena/debathena/libnss-nonlocal/nonlocal-shadow.c 2011-03-31 04:33:28 UTC (rev 25083)
@@ -39,18 +39,26 @@
#include "nonlocal.h"
-static service_user *
-nss_shadow_nonlocal_database(void)
+static service_user *__nss_shadow_nonlocal_database;
+
+static int
+internal_function
+__nss_shadow_nonlocal_lookup(service_user **ni, const char *fct_name,
+ void **fctp)
{
- static service_user *nip = NULL;
- if (nip == NULL)
- __nss_database_lookup("shadow_nonlocal", NULL, "", &nip);
+ if (__nss_shadow_nonlocal_database == NULL
+ && __nss_database_lookup("shadow_nonlocal", NULL, NULL,
+ &__nss_shadow_nonlocal_database) < 0)
+ return -1;
- return nip;
+ *ni = __nss_shadow_nonlocal_database;
+
+ *fctp = __nss_lookup_function(*ni, fct_name);
+ return 0;
}
-static service_user *spent_nip = NULL;
+static service_user *spent_startp, *spent_nip;
static void *spent_fct_start;
static union {
enum nss_status (*l)(struct spwd *pwd, char *buffer, size_t buflen,
@@ -62,33 +70,22 @@
enum nss_status
_nss_nonlocal_setspent(int stayopen)
{
- static const char *fct_name = "setspent";
- static void *fct_start = NULL;
enum nss_status status;
- service_user *nip;
- union {
- enum nss_status (*l)(int stayopen);
- void *ptr;
- } fct;
-
- nip = nss_shadow_nonlocal_database();
- if (nip == NULL)
- return NSS_STATUS_UNAVAIL;
- if (fct_start == NULL)
- fct_start = __nss_lookup_function(nip, fct_name);
- fct.ptr = fct_start;
- do {
- if (fct.ptr == NULL)
- status = NSS_STATUS_UNAVAIL;
- else
- status = DL_CALL_FCT(fct.l, (stayopen));
- } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
+ const struct walk_nss w = {
+ .lookup = &__nss_shadow_nonlocal_lookup, .fct_name = "setspent",
+ .status = &status
+ };
+ const __typeof__(&_nss_nonlocal_setspent) self = NULL;
+#define args (stayopen)
+#include "walk_nss.h"
+#undef args
if (status != NSS_STATUS_SUCCESS)
return status;
- spent_nip = nip;
if (spent_fct_start == NULL)
- spent_fct_start = __nss_lookup_function(nip, spent_fct_name);
+ __nss_shadow_nonlocal_lookup(&spent_startp, spent_fct_name,
+ &spent_fct_start);
+ spent_nip = spent_startp;
spent_fct.ptr = spent_fct_start;
return NSS_STATUS_SUCCESS;
}
@@ -96,29 +93,18 @@
enum nss_status
_nss_nonlocal_endspent(void)
{
- static const char *fct_name = "endspent";
- static void *fct_start = NULL;
enum nss_status status;
- service_user *nip;
- union {
- enum nss_status (*l)(void);
- void *ptr;
- } fct;
+ const struct walk_nss w = {
+ .lookup = &__nss_shadow_nonlocal_lookup, .fct_name = "endspent",
+ .status = &status
+ };
+ const __typeof__(&_nss_nonlocal_endspent) self = NULL;
spent_nip = NULL;
- nip = nss_shadow_nonlocal_database();
- if (nip == NULL)
- return NSS_STATUS_UNAVAIL;
- if (fct_start == NULL)
- fct_start = __nss_lookup_function(nip, fct_name);
- fct.ptr = fct_start;
- do {
- if (fct.ptr == NULL)
- status = NSS_STATUS_UNAVAIL;
- else
- status = DL_CALL_FCT(fct.l, ());
- } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
+#define args ()
+#include "walk_nss.h"
+#undef args
return status;
}
@@ -153,30 +139,15 @@
_nss_nonlocal_getspnam_r(const char *name, struct spwd *pwd,
char *buffer, size_t buflen, int *errnop)
{
- static const char *fct_name = "getspnam_r";
- static void *fct_start = NULL;
enum nss_status status;
- service_user *nip;
- union {
- enum nss_status (*l)(const char *name, struct spwd *pwd,
- char *buffer, size_t buflen, int *errnop);
- void *ptr;
- } fct;
-
- nip = nss_shadow_nonlocal_database();
- if (nip == NULL)
- return NSS_STATUS_UNAVAIL;
- if (fct_start == NULL)
- fct_start = __nss_lookup_function(nip, fct_name);
- fct.ptr = fct_start;
- do {
- if (fct.ptr == NULL)
- status = NSS_STATUS_UNAVAIL;
- else
- status = DL_CALL_FCT(fct.l, (name, pwd, buffer, buflen, errnop));
- if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
- break;
- } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
+ const struct walk_nss w = {
+ .lookup = __nss_shadow_nonlocal_lookup, .fct_name = "getspnam_r",
+ .status = &status, .errnop = errnop
+ };
+ const __typeof__(&_nss_nonlocal_getspnam_r) self = NULL;
+#define args (name, pwd, buffer, buflen, errnop)
+#include "walk_nss.h"
+#undef args
if (status != NSS_STATUS_SUCCESS)
return status;
Modified: trunk/debathena/debathena/libnss-nonlocal/nonlocal.h
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/nonlocal.h 2011-03-30 04:28:08 UTC (rev 25082)
+++ trunk/debathena/debathena/libnss-nonlocal/nonlocal.h 2011-03-31 04:33:28 UTC (rev 25083)
@@ -1,3 +1,28 @@
+/*
+ * nonlocal.h
+ * common definitions for nss_nonlocal proxy
+ *
+ * Copyright © 2007–2010 Anders Kaseorg <andersk@mit.edu> and Tim
+ * Abbott <tabbott@mit.edu>
+ *
+ * This file is part of nss_nonlocal.
+ *
+ * nss_nonlocal is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * nss_nonlocal is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with nss_nonlocal; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
#ifndef NONLOCAL_H
#define NONLOCAL_H
@@ -3,7 +28,39 @@
#include "config.h"
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
+# ifndef HAVE__BOOL
+# ifdef __cplusplus
+typedef bool _Bool;
+# else
+# define _Bool signed char
+# endif
+# endif
+# define bool _Bool
+# define false 0
+# define true 1
+# define __bool_true_false_are_defined 1
+#endif
+
+#include "nsswitch-internal.h"
+#include <pwd.h>
+
+struct walk_nss {
+ enum nss_status *status;
+ int (*lookup)(service_user **ni, const char *fct_name,
+ void **fctp) internal_function;
+ const char *fct_name;
+ int *errnop;
+ char **buf;
+ size_t *buflen;
+};
+
enum nss_status check_nonlocal_uid(const char *user, uid_t uid, int *errnop);
-enum nss_status check_nonlocal_gid(const char *user, gid_t gid, int *errnop);
+enum nss_status check_nonlocal_gid(const char *user, const char *group,
+ gid_t gid, int *errnop);
enum nss_status check_nonlocal_user(const char *user, int *errnop);
+enum nss_status get_nonlocal_passwd(const char *name, struct passwd *pwd,
+ char **buffer, int *errnop);
#define NONLOCAL_IGNORE_ENV "NSS_NONLOCAL_IGNORE"
Added: trunk/debathena/debathena/libnss-nonlocal/walk_nss.h
===================================================================
--- trunk/debathena/debathena/libnss-nonlocal/walk_nss.h (rev 0)
+++ trunk/debathena/debathena/libnss-nonlocal/walk_nss.h 2011-03-31 04:33:28 UTC (rev 25083)
@@ -0,0 +1,87 @@
+/*
+ * walk_nss.h
+ * NSS walking template for nss_nonlocal proxy
+ *
+ * Copyright © 2011 Anders Kaseorg <andersk@mit.edu> and Tim Abbott
+ * <tabbott@mit.edu>
+ *
+ * This file is part of nss_nonlocal.
+ *
+ * nss_nonlocal is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * nss_nonlocal is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with nss_nonlocal; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+{
+ static service_user *startp = NULL;
+ static void *fct_start = NULL;
+
+ service_user *nip;
+ union {
+ __typeof__(self) l;
+ void *ptr;
+ } fct;
+ int old_errno = errno;
+
+ if (fct_start == NULL &&
+ w.lookup(&startp, w.fct_name, &fct_start) != 0) {
+ *w.status = NSS_STATUS_UNAVAIL;
+ goto walk_nss_out;
+ }
+
+ nip = startp;
+ fct.ptr = fct_start;
+
+ if (w.buf != NULL) {
+ *w.buf = malloc(*w.buflen);
+ errno = old_errno;
+ if (*w.buf == NULL) {
+ *w.status = NSS_STATUS_TRYAGAIN;
+ *w.errnop = ENOMEM;
+ goto walk_nss_out;
+ }
+ }
+
+ do {
+ walk_nss_morebuf:
+ if (fct.ptr == NULL)
+ *w.status = NSS_STATUS_UNAVAIL;
+ else if (self != NULL && fct.l == self)
+ *w.status = NSS_STATUS_NOTFOUND;
+ else
+ *w.status = DL_CALL_FCT(fct.l, args);
+ if (*w.status == NSS_STATUS_TRYAGAIN &&
+ w.errnop != NULL && *w.errnop == ERANGE) {
+ if (w.buf == NULL)
+ break;
+ free(*w.buf);
+ *w.buflen *= 2;
+ *w.buf = malloc(*w.buflen);
+ errno = old_errno;
+ if (*w.buf == NULL) {
+ *w.errnop = ENOMEM;
+ goto walk_nss_out;
+ }
+ goto walk_nss_morebuf;
+ }
+ } while (__nss_next(&nip, w.fct_name, &fct.ptr, *w.status, 0) == 0);
+
+ if (w.buf != NULL && *w.status != NSS_STATUS_SUCCESS) {
+ free(*w.buf);
+ *w.buf = NULL;
+ }
+
+ walk_nss_out:
+ ;
+}
