From cf3383162f443111e02d16e95846c82ad360b5df Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 18 Oct 2009 02:28:54 -0400 Subject: [PATCH] Add check_nonlocal_passwd and check_nonlocal_group helper functions. Signed-off-by: Anders Kaseorg --- nonlocal-group.c | 12 +++++++++--- nonlocal-passwd.c | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/nonlocal-group.c b/nonlocal-group.c index 83e5d12..af422dd 100644 --- a/nonlocal-group.c +++ b/nonlocal-group.c @@ -126,6 +126,12 @@ check_nonlocal_gid(const char *user, gid_t gid, int *errnop) return status; } +enum nss_status +check_nonlocal_group(const char *user, struct group *grp, int *errnop) +{ + return check_nonlocal_gid(user, grp->gr_gid, errnop); +} + enum nss_status get_local_group(const char *name, struct group *grp, char **buffer, int *errnop) { @@ -280,7 +286,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; @@ -334,7 +340,7 @@ _nss_nonlocal_getgrnam_r(const char *name, struct group *grp, return NSS_STATUS_NOTFOUND; } - return check_nonlocal_gid(name, grp->gr_gid, errnop); + return check_nonlocal_group(name, grp, errnop); } enum nss_status @@ -372,7 +378,7 @@ _nss_nonlocal_getgrgid_r(gid_t gid, struct group *grp, if (status != NSS_STATUS_SUCCESS) return status; - return check_nonlocal_gid(grp->gr_name, grp->gr_gid, errnop); + return check_nonlocal_group(grp->gr_name, grp, errnop); } enum nss_status diff --git a/nonlocal-passwd.c b/nonlocal-passwd.c index 29e922b..ffd5375 100644 --- a/nonlocal-passwd.c +++ b/nonlocal-passwd.c @@ -124,6 +124,12 @@ check_nonlocal_uid(const char *user, uid_t uid, int *errnop) return status; } +enum nss_status +check_nonlocal_passwd(const char *user, struct passwd *pwd, int *errnop) +{ + return check_nonlocal_uid(user, pwd->pw_uid, errnop); +} + enum nss_status check_nonlocal_user(const char *user, int *errnop) { @@ -279,7 +285,7 @@ _nss_nonlocal_getpwent_r(struct passwd *pwd, char *buffer, size_t buflen, do status = DL_CALL_FCT(pwent_fct.l, (pwd, buffer, buflen, errnop)); while (status == NSS_STATUS_SUCCESS && - check_nonlocal_uid(pwd->pw_name, pwd->pw_uid, &nonlocal_errno) != NSS_STATUS_SUCCESS); + check_nonlocal_passwd(pwd->pw_name, pwd, &nonlocal_errno) != NSS_STATUS_SUCCESS); } if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) return status; @@ -334,7 +340,7 @@ _nss_nonlocal_getpwnam_r(const char *name, struct passwd *pwd, return NSS_STATUS_NOTFOUND; } - status = check_nonlocal_uid(name, pwd->pw_uid, errnop); + status = check_nonlocal_passwd(name, pwd, errnop); if (status != NSS_STATUS_SUCCESS) return status; @@ -380,7 +386,7 @@ _nss_nonlocal_getpwuid_r(uid_t uid, struct passwd *pwd, if (status != NSS_STATUS_SUCCESS) return status; - status = check_nonlocal_uid(pwd->pw_name, pwd->pw_uid, errnop); + status = check_nonlocal_passwd(pwd->pw_name, pwd, errnop); if (status != NSS_STATUS_SUCCESS) return status; -- 2.45.0