X-Git-Url: http://andersk.mit.edu/gitweb/nss_nonlocal.git/blobdiff_plain/c5e25ab7325e8783be01eebb466910f51241fb21..4893970472bd815b8dbb6f6058dd26358700110e:/nonlocal-group.c diff --git a/nonlocal-group.c b/nonlocal-group.c index f2fdae9..9bbe156 100644 --- a/nonlocal-group.c +++ b/nonlocal-group.c @@ -2,48 +2,67 @@ * nonlocal-group.c * group database for nss_nonlocal proxy * - * Copyright © 2007 Anders Kaseorg and Tim Abbott - * + * Copyright © 2007–2010 Anders Kaseorg and Tim + * Abbott * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: + * This file is part of nss_nonlocal. * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. + * 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. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. + * 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 */ #define _GNU_SOURCE + #include -#include -#include -#include -#include #include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include +#include + #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, @@ -54,149 +73,106 @@ _nss_nonlocal_getgrgid_r(gid_t gid, struct group *grp, 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; - - int buflen = sysconf(_SC_GETGR_R_SIZE_MAX); - char *buf = malloc(buflen); - if (buf == NULL) { - *errnop = ENOMEM; - errno = old_errno; - return NSS_STATUS_TRYAGAIN; - } + char *buf; + size_t buflen = sysconf(_SC_GETGR_R_SIZE_MAX); + 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 { - 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) - break; - } 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_WARNING, "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 -get_local_group(const char *name, struct group *grp, char *buffer, size_t buflen, int *errnop) +check_nonlocal_group(const char *user, struct group *grp, 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; - struct group gbuf; - int n; + enum nss_status status = NSS_STATUS_SUCCESS; int old_errno = errno; + char *end; + unsigned long gid; - int len = sysconf(_SC_GETGR_R_SIZE_MAX); - char *buf = malloc(len); - if (buf == NULL) { - *errnop = ENOMEM; + errno = 0; + gid = strtoul(grp->gr_name, &end, 10); + 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; - return NSS_STATUS_TRYAGAIN; - } - - 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 { - if (fct.l == _nss_nonlocal_getgrnam_r) - status = NSS_STATUS_NOTFOUND; - else - status = DL_CALL_FCT(fct.l, (name, &gbuf, buf, len, errnop)); - if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) - break; - } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0); - if (status != NSS_STATUS_SUCCESS) - goto get_local_group_done; - - n = snprintf(buffer, buflen, "%s", gbuf.gr_name); - if (n < 0 || n >= buflen) { - *errnop = ERANGE; - status = NSS_STATUS_TRYAGAIN; - goto get_local_group_done; - } - grp->gr_name = buffer; - buffer += n; - buflen -= n; - - n = snprintf(buffer, buflen, "%s", gbuf.gr_passwd); - if (n < 0 || n >= buflen) { - *errnop = ERANGE; - status = NSS_STATUS_TRYAGAIN; - goto get_local_group_done; - } - grp->gr_passwd = buffer; - buffer += n; - buflen -= n; - - grp->gr_gid = gbuf.gr_gid; + return status; - if (buflen < sizeof(void *)) { - *errnop = ERANGE; - status = NSS_STATUS_TRYAGAIN; - goto get_local_group_done; - } - *(void **)buffer = NULL; - buffer += sizeof(void *); - buflen -= sizeof(void *); + return check_nonlocal_gid(user, grp->gr_name, grp->gr_gid, errnop); +} - get_local_group_done: - free(buf); +enum nss_status +get_local_group(const char *name, struct group *grp, char **buffer, int *errnop) +{ + enum nss_status status; + 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 bool grent_initialized = false; +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, @@ -208,33 +184,25 @@ static const char *grent_fct_name = "getgrent_r"; 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); + if (!grent_initialized) { + __nss_group_nonlocal_lookup(&grent_startp, grent_fct_name, + &grent_fct_start); + __sync_synchronize(); + grent_initialized = true; + } + grent_nip = grent_startp; grent_fct.ptr = grent_fct_start; return NSS_STATUS_SUCCESS; } @@ -242,29 +210,18 @@ _nss_nonlocal_setgrent(int stayopen) 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; } @@ -291,7 +248,7 @@ _nss_nonlocal_getgrent_r(struct group *grp, char *buffer, size_t buflen, do status = DL_CALL_FCT(grent_fct.l, (grp, buffer, buflen, errnop)); while (status == NSS_STATUS_SUCCESS && - check_nonlocal_gid("(unknown)", grp->gr_gid, &nonlocal_errno) != NSS_STATUS_SUCCESS); + check_nonlocal_group("(unknown)", grp, &nonlocal_errno) != NSS_STATUS_SUCCESS); } if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) return status; @@ -309,76 +266,91 @@ enum nss_status _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; - return check_nonlocal_gid(name, grp->gr_gid, errnop); + if (strcmp(name, grp->gr_name) != 0) { + syslog(LOG_ERR, "nss_nonlocal: discarding group %s from lookup for group %s\n", grp->gr_name, name); + return NSS_STATUS_NOTFOUND; + } + + return check_nonlocal_group(name, grp, errnop); } enum nss_status _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; - return check_nonlocal_gid(grp->gr_name, grp->gr_gid, errnop); + if (gid != grp->gr_gid) { + syslog(LOG_ERR, "nss_nonlocal: discarding gid %d from lookup for gid %d\n", grp->gr_gid, gid); + return NSS_STATUS_NOTFOUND; + } + + 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 @@ -386,126 +358,98 @@ _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; - int buflen; + bool is_nonlocal = true; char *buffer; + 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) - return status; - else if (status != NSS_STATUS_SUCCESS) - is_local = 1; - - 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; - } - status = get_local_group(MAGIC_LOCAL_GROUPNAME, - &local_users_group, buffer, buflen, errnop); - if (status == NSS_STATUS_SUCCESS) { - local_users_gid = local_users_group.gr_gid; - } else if (status == NSS_STATUS_TRYAGAIN) { - free(buffer); + 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; - } - free(buffer); + } else if (status != NSS_STATUS_SUCCESS) { + is_nonlocal = false; - if (is_local) { - gid = local_users_gid; - } else { - buflen = sysconf(_SC_GETGR_R_SIZE_MAX); - buffer = malloc(buflen); - if (buffer == NULL) { - *errnop = ENOMEM; - errno = old_errno; - return NSS_STATUS_TRYAGAIN; - } - status = get_local_group(MAGIC_NONLOCAL_GROUPNAME, - &nonlocal_users_group, buffer, buflen, errnop); + status = get_local_group(MAGIC_LOCAL_GROUPNAME, + &local_users_group, &buffer, errnop); if (status == NSS_STATUS_SUCCESS) { - gid = nonlocal_users_group.gr_gid; - } else if (status == NSS_STATUS_TRYAGAIN) { 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); } - free(buffer); } - 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; + } + } + + 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); } - newgroups = realloc(*groupsp, newsize * sizeof((*groupsp)[0])); - if (newgroups == NULL) { - *errnop = ENOMEM; - errno = old_errno; - return NSS_STATUS_TRYAGAIN; + + 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 = newgroups; - *size = newsize; } - (*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; - int in = *start, out = *start, i; - - 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; + in = out = *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 +462,8 @@ _nss_nonlocal_initgroups_dyn(const char *user, gid_t group, long int *start, 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) {