diff options
Diffstat (limited to 'nis/nss_compat')
| -rw-r--r-- | nis/nss_compat/compat-grp.c | 14 | ||||
| -rw-r--r-- | nis/nss_compat/compat-pwd.c | 21 | ||||
| -rw-r--r-- | nis/nss_compat/compat-spwd.c | 17 |
3 files changed, 39 insertions, 13 deletions
diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c index 0b4ed40e59..de96dbbeb6 100644 --- a/nis/nss_compat/compat-grp.c +++ b/nis/nss_compat/compat-grp.c @@ -26,6 +26,12 @@ #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> +/* Get the declaration of the parser function. */ +#define ENTNAME grent +#define STRUCTURE group +#define EXTERN_PARSER +#include "../../nss/nss_files/files-parse.c" + /* Structure for remembering -@netgroup and -user members ... */ #define BLACKLIST_INITIAL_SIZE 512 #define BLACKLIST_INCREMENT 256 @@ -146,6 +152,7 @@ static enum nss_status getgrent_next_nis (struct group *result, ent_t *ent, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; char *domain; char *outkey, *outval; int outkeylen, outvallen; @@ -196,7 +203,7 @@ getgrent_next_nis (struct group *result, ent_t *ent, char *buffer, while (isspace (*p)) ++p; } - while (!_nss_files_parse_grent (p, result, buffer, buflen)); + while (!_nss_files_parse_grent (p, result, data, buflen)); if (!in_blacklist (result->gr_name, strlen (result->gr_name), ent)) return NSS_STATUS_SUCCESS; @@ -209,6 +216,7 @@ static enum nss_status getgrent_next_file (struct group *result, ent_t *ent, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; while (1) { char *p; @@ -230,7 +238,7 @@ getgrent_next_file (struct group *result, ent_t *ent, while (*p == '\0' || *p == '#' || /* Parse the line. If it is invalid, loop to get the next line of the file to parse. */ - !_nss_files_parse_grent (p, result, buffer, buflen)); + !_nss_files_parse_grent (p, result, data, buflen)); if (result->gr_name[0] != '+' && result->gr_name[0] != '-') /* This is a real entry. */ @@ -266,7 +274,7 @@ getgrent_next_file (struct group *result, ent_t *ent, while (isspace (*p)) p++; free (outval); - if (_nss_files_parse_grent (p, result, buffer, buflen)) + if (_nss_files_parse_grent (p, result, data, buflen)) /* We found the entry. */ break; } diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c index 39ee2c5901..56659e9ed5 100644 --- a/nis/nss_compat/compat-pwd.c +++ b/nis/nss_compat/compat-pwd.c @@ -29,6 +29,12 @@ #include "netgroup.h" +/* Get the declaration of the parser function. */ +#define ENTNAME pwent +#define STRUCTURE passwd +#define EXTERN_PARSER +#include "../../nss/nss_files/files-parse.c" + /* Structure for remembering -@netgroup and -user members ... */ #define BLACKLIST_INITIAL_SIZE 512 #define BLACKLIST_INCREMENT 256 @@ -269,6 +275,7 @@ static enum nss_status getpwent_next_netgr (struct passwd *result, ent_t *ent, char *group, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; char *ypdomain, *host, *user, *domain, *outval, *p, *p2; int status, outvallen; size_t p2len; @@ -290,8 +297,8 @@ getpwent_next_netgr (struct passwd *result, ent_t *ent, char *group, while (1) { - status = __internal_getnetgrent (&host, &user, &domain, &ent->netgrdata, - buffer, buflen); + status = __internal_getnetgrent_r (&host, &user, &domain, + &ent->netgrdata, buffer, buflen); if (status != 1) { __internal_endnetgrent (&ent->netgrdata); @@ -323,7 +330,7 @@ getpwent_next_netgr (struct passwd *result, ent_t *ent, char *group, while (isspace (*p)) p++; free (outval); - if (_nss_files_parse_pwent (p, result, buffer, buflen)) + if (_nss_files_parse_pwent (p, result, data, buflen)) { copy_pwd_changes (result, &ent->pwd, p2, p2len); break; @@ -337,6 +344,7 @@ static enum nss_status getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; char *domain, *outkey, *outval, *p, *p2; int outkeylen, outvallen; size_t p2len; @@ -397,7 +405,7 @@ getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer, while (isspace (*p)) ++p; } - while (!_nss_files_parse_pwent (p, result, buffer, buflen)); + while (!_nss_files_parse_pwent (p, result, data, buflen)); copy_pwd_changes (result, &ent->pwd, p2, p2len); @@ -412,6 +420,7 @@ static enum nss_status getpwent_next_file (struct passwd *result, ent_t *ent, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; while (1) { char *p, *p2; @@ -433,7 +442,7 @@ getpwent_next_file (struct passwd *result, ent_t *ent, while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */ /* Parse the line. If it is invalid, loop to get the next line of the file to parse. */ - !_nss_files_parse_pwent (p, result, buffer, buflen)); + !_nss_files_parse_pwent (p, result, data, buflen)); if (result->pw_name[0] != '+' && result->pw_name[0] != '-') /* This is a real entry. */ @@ -516,7 +525,7 @@ getpwent_next_file (struct passwd *result, ent_t *ent, while (isspace (*p)) p++; free (outval); - if (_nss_files_parse_pwent (p, result, buffer, buflen)) + if (_nss_files_parse_pwent (p, result, data, buflen)) { copy_pwd_changes (result, &pwd, p2, p2len); give_pwd_free (&pwd); diff --git a/nis/nss_compat/compat-spwd.c b/nis/nss_compat/compat-spwd.c index ba73b1846f..47dd22970a 100644 --- a/nis/nss_compat/compat-spwd.c +++ b/nis/nss_compat/compat-spwd.c @@ -27,6 +27,12 @@ #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> +/* Get the declaration of the parser function. */ +#define ENTNAME spent +#define STRUCTURE spwd +#define EXTERN_PARSER +#include "../../nss/nss_files/files-parse.c" + /* Structure for remembering -@netgroup and -user members ... */ #define BLACKLIST_INITIAL_SIZE 512 #define BLACKLIST_INCREMENT 256 @@ -212,6 +218,7 @@ static enum nss_status getspent_next_netgr (struct spwd *result, ent_t *ent, char *group, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; char *ypdomain, *host, *user, *domain, *outval, *p, *p2; int status, outvallen; size_t p2len; @@ -263,7 +270,7 @@ getspent_next_netgr (struct spwd *result, ent_t *ent, char *group, while (isspace (*p)) p++; free (outval); - if (_nss_files_parse_spent (p, result, buffer, buflen)) + if (_nss_files_parse_spent (p, result, data, buflen)) { copy_spwd_changes (result, &ent->pwd, p2, p2len); break; @@ -277,6 +284,7 @@ static enum nss_status getspent_next_nis (struct spwd *result, ent_t *ent, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; char *domain, *outkey, *outval, *p, *p2; int outkeylen, outvallen; size_t p2len; @@ -337,7 +345,7 @@ getspent_next_nis (struct spwd *result, ent_t *ent, while (isspace (*p)) ++p; } - while (!_nss_files_parse_spent (p, result, buffer, buflen)); + while (!_nss_files_parse_spent (p, result, data, buflen)); copy_spwd_changes (result, &ent->pwd, p2, p2len); @@ -352,6 +360,7 @@ static enum nss_status getspent_next_file (struct spwd *result, ent_t *ent, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; while (1) { char *p, *p2; @@ -373,7 +382,7 @@ getspent_next_file (struct spwd *result, ent_t *ent, while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */ /* Parse the line. If it is invalid, loop to get the next line of the file to parse. */ - !_nss_files_parse_spent (p, result, buffer, buflen)); + !_nss_files_parse_spent (p, result, data, buflen)); if (result->sp_namp[0] != '+' && result->sp_namp[0] != '-') /* This is a real entry. */ @@ -456,7 +465,7 @@ getspent_next_file (struct spwd *result, ent_t *ent, while (isspace (*p)) p++; free (outval); - if (_nss_files_parse_spent (p, result, buffer, buflen)) + if (_nss_files_parse_spent (p, result, data, buflen)) { copy_spwd_changes (result, &pwd, p2, p2len); give_spwd_free (&pwd); |