From 7e3be507eed53cfe516ec101f312dac160e43bad Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 21 Dec 1996 04:13:58 +0000 Subject: update from main archive 961220 Sat Dec 21 04:14:16 1996 Ulrich Drepper * sysdeps/unix/common/pause.c: Add missing second argument in call to __sigpause. Reported by a sun . * locale/weight.h: Correct handling of collation elements. Reported by Keld Simonsen . * manual/time.texi: Document ^ flag and %P format. * new-malloc/malloc.c: Update from Wolfram Gloger. * nss/nss.h: Reformat copyright. * posix/sched.h: Likewise. * sysdeps/i386/fpu_control.h: Likewise. * sysdeps/unix/sysv/linux/fcntlbits.h: Likewise. * sysdeps/unix/sysv/linux/ioctls.h: Likewise. * sysdeps/unix/sysv/linux/sigcontext.h: Likewise. * sysdeps/unix/sysv/linux/utsnamelen.h: Likewise. * sysdeps/unix/sysv/linux/sys/acct.h: Likewise. * sysvips/sys/msg.h: Likewise. * stdio-common/Makefile (routines): Remove fcloseall. * stdio-common/fcloseall.c: Removed. * stdlib/Makefile (distribute): Add abort-instr.h. * sysdeps/generic/abort-instr.h: New file. * sysdeps/i386/abort-instr.h: New file. * sysdeps/generic/abort.c: Use lock and stage counter to prevent any form of loop. * sysdeps/unix/sysv/linux/timebits.h: Define CLK_TCK as 100. * sysdeps/unix/sysv/linux/alpha/timebits.h: Define CLOCKS_PER_SEC as 1000000. Define CLK_TCK as 1024. * time/time.c (CLK_TCK): Define only if not already set. * time/strftime.c: Don't use `isdigit' when computing field width from string since the locale might have more than one digit block. Fri Dec 20 12:38:14 1996 Darrel Hankerson * posix/getopt.c (in -W option handling): Return when optind == argc. Thu Dec 19 14:24:50 1996 Andreas Schwab * nis/nss_nis/nis-alias.c (_nss_nis_parse_aliasent): Add const to type of KEY. * nis/nss_compat/compat-grp.c: Include the declaration of the file parser. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/nss_compat/compat-grp.c (getgrent_next_nis, getgrent_next_file): Pass the correct type for the buffer to the parser function. * nis/nss_compat/compat-pwd.c (getpwent_next_netgr, getpwent_next_nis, getpwent_next_file): Likewise. * nis/nss_compat/compat-spwd.c (getspent_next_netgr, getspent_next_nis, getspent_next_file): Likewise. * nis/nss_nis/nis-ethers.c (internal_nis_getetherent_r, _nss_nis_getethernam_r, _nss_nis_getetherbyaddr_r): Likewise. * nis/nss_nis/nis-grp.c (internal_nis_getgrent_r, _nss_nis_getgrnam_r, _nss_nis_getgrgid_r): Likewise. * nis/nss_nis/nis-network.c (internal_nis_getnetent_r, _nss_nis_getnetbyname_r, _nss_nis_getnetbyaddr_r): Likewise. * nis/nss_nis/nis-proto.c (internal_nis_getprotoent_r, _nss_nis_getprotobyname_r, _nss_nis_getprotobynumber_r): Likewise. * nis/nss_nis/nis-pwd.c (internal_nis_getpwent_r, _nss_nis_getpwnam_r, _nss_nis_getpwuid_r): Likewise. * nis/nss_nis/nis-rpc.c (internal_nis_getrpcent_r, _nss_nis_getrpcbynumber_r): Likewise. * nis/nss_nis/nis-spwd.c (internal_nis_getspent_r, _nss_nis_getspnam_r): Likewise. Thu Dec 19 13:37:16 1996 Andreas Schwab * sysdeps/unix/sysv/linux/m68k/setjmp.c: New file. --- nis/nss_compat/compat-grp.c | 14 +++++++++++--- nis/nss_compat/compat-pwd.c | 21 +++++++++++++++------ nis/nss_compat/compat-spwd.c | 17 +++++++++++++---- nis/nss_nis/nis-alias.c | 2 +- nis/nss_nis/nis-ethers.c | 17 +++++++++++++---- nis/nss_nis/nis-grp.c | 15 ++++++++++++--- nis/nss_nis/nis-network.c | 14 +++++++++++--- nis/nss_nis/nis-proto.c | 14 +++++++++++--- nis/nss_nis/nis-pwd.c | 15 ++++++++++++--- nis/nss_nis/nis-rpc.c | 11 +++++++++-- nis/nss_nis/nis-spwd.c | 12 ++++++++++-- 11 files changed, 118 insertions(+), 34 deletions(-) (limited to 'nis') 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 #include +/* 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 #include +/* 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); diff --git a/nis/nss_nis/nis-alias.c b/nis/nss_nis/nis-alias.c index df884d6faa..733e1508c5 100644 --- a/nis/nss_nis/nis-alias.c +++ b/nis/nss_nis/nis-alias.c @@ -35,7 +35,7 @@ static char *oldkey = NULL; static int oldkeylen = 0; static int -_nss_nis_parse_aliasent (char *key, char *alias, struct aliasent *result, +_nss_nis_parse_aliasent (const char *key, char *alias, struct aliasent *result, char *buffer, size_t buflen) { char *first_unused = buffer + strlen (alias) + 1; diff --git a/nis/nss_nis/nis-ethers.c b/nis/nss_nis/nis-ethers.c index ae3ba76adf..25f77f5f82 100644 --- a/nis/nss_nis/nis-ethers.c +++ b/nis/nss_nis/nis-ethers.c @@ -33,10 +33,16 @@ __libc_lock_define_initialized (static, lock) struct ether { - char *e_name; + const char *e_name; struct ether_addr e_addr; }; +/* Get the declaration of the parser function. */ +#define ENTNAME etherent +#define STRUCTURE ether +#define EXTERN_PARSER +#include "../nss/nss_files/files-parse.c" + static bool_t new_start = 1; static char *oldkey = NULL; static int oldkeylen = 0; @@ -80,6 +86,7 @@ _nss_nis_endetherent (void) static enum nss_status internal_nis_getetherent_r (struct ether *eth, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; char *domain, *result, *outkey; int len, keylen, parse_res; @@ -120,7 +127,7 @@ internal_nis_getetherent_r (struct ether *eth, char *buffer, size_t buflen) ++p; free (result); - parse_res = _nss_files_parse_etherent (p, eth, buffer, buflen); + parse_res = _nss_files_parse_etherent (p, eth, data, buflen); if (!parse_res && errno == ERANGE) return NSS_STATUS_TRYAGAIN; @@ -152,6 +159,7 @@ enum nss_status _nss_nis_getethernam_r (const char *name, struct ether *eth, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; enum nss_status retval; char *domain, *result, *p; int len, parse_res; @@ -188,7 +196,7 @@ _nss_nis_getethernam_r (const char *name, struct ether *eth, ++p; free (result); - parse_res = _nss_files_parse_etherent (p, eth, buffer, buflen); + parse_res = _nss_files_parse_etherent (p, eth, data, buflen); if (!parse_res) { @@ -205,6 +213,7 @@ enum nss_status _nss_nis_getetherbyaddr_r (struct ether_addr *addr, struct ether *eth, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; enum nss_status retval; char *domain, *result, *p; int len, nlen, parse_res; @@ -250,7 +259,7 @@ _nss_nis_getetherbyaddr_r (struct ether_addr *addr, struct ether *eth, ++p; free (result); - parse_res = _nss_files_parse_etherent (p, eth, buffer, buflen); + parse_res = _nss_files_parse_etherent (p, eth, data, buflen); if (!parse_res) { diff --git a/nis/nss_nis/nis-grp.c b/nis/nss_nis/nis-grp.c index 72de8b3c83..d727202513 100644 --- a/nis/nss_nis/nis-grp.c +++ b/nis/nss_nis/nis-grp.c @@ -28,6 +28,12 @@ #include "nss-nis.h" +/* Get the declaration of the parser function. */ +#define ENTNAME grent +#define STRUCTURE group +#define EXTERN_PARSER +#include "../nss/nss_files/files-parse.c" + /* Protect global state against multiple changers */ __libc_lock_define_initialized (static, lock) @@ -74,6 +80,7 @@ _nss_nis_endgrent (void) static enum nss_status internal_nis_getgrent_r (struct group *grp, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; char *domain, *result, *outkey; int len, keylen, parse_res; @@ -114,7 +121,7 @@ internal_nis_getgrent_r (struct group *grp, char *buffer, size_t buflen) ++p; free (result); - parse_res = _nss_files_parse_grent (p, grp, buffer, buflen); + parse_res = _nss_files_parse_grent (p, grp, data, buflen); if (!parse_res && errno == ERANGE) return NSS_STATUS_TRYAGAIN; @@ -146,6 +153,7 @@ enum nss_status _nss_nis_getgrnam_r (const char *name, struct group *grp, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; enum nss_status retval; char *domain, *result, *p; int len, parse_res; @@ -182,7 +190,7 @@ _nss_nis_getgrnam_r (const char *name, struct group *grp, ++p; free (result); - parse_res = _nss_files_parse_grent (p, grp, buffer, buflen); + parse_res = _nss_files_parse_grent (p, grp, data, buflen); if (!parse_res) { @@ -199,6 +207,7 @@ enum nss_status _nss_nis_getgrgid_r (gid_t gid, struct group *grp, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; enum nss_status retval; char *domain, *result, *p; int len, nlen, parse_res; @@ -232,7 +241,7 @@ _nss_nis_getgrgid_r (gid_t gid, struct group *grp, ++p; free (result); - parse_res = _nss_files_parse_grent (p, grp, buffer, buflen); + parse_res = _nss_files_parse_grent (p, grp, data, buflen); if (!parse_res) { diff --git a/nis/nss_nis/nis-network.c b/nis/nss_nis/nis-network.c index e82b40143e..391f4c5895 100644 --- a/nis/nss_nis/nis-network.c +++ b/nis/nss_nis/nis-network.c @@ -30,6 +30,11 @@ #include "nss-nis.h" +/* Get the declaration of the parser function. */ +#define ENTNAME netent +#define EXTERN_PARSER +#include "../nss/nss_files/files-parse.c" + __libc_lock_define_initialized (static, lock) static bool_t new_start = 1; @@ -76,6 +81,7 @@ static enum nss_status internal_nis_getnetent_r (struct netent *net, char *buffer, size_t buflen, int *herrnop) { + struct parser_data *data = (void *) buffer; char *domain, *result, *outkey; int len, keylen, parse_res; @@ -120,7 +126,7 @@ internal_nis_getnetent_r (struct netent *net, char *buffer, size_t buflen, ++p; free (result); - parse_res = _nss_files_parse_netent (p, net, buffer, buflen); + parse_res = _nss_files_parse_netent (p, net, data, buflen); if (!parse_res && errno == ERANGE) { *herrnop = NETDB_INTERNAL; @@ -157,6 +163,7 @@ _nss_nis_getnetbyname_r (const char *name, struct netent *net, char *buffer, size_t buflen, int *herrnop) { enum nss_status retval; + struct parser_data *data = (void *) buffer; char *domain, *result, *p; int len, parse_res; @@ -197,7 +204,7 @@ _nss_nis_getnetbyname_r (const char *name, struct netent *net, ++p; free (result); - parse_res = _nss_files_parse_netent (p, net, buffer, buflen); + parse_res = _nss_files_parse_netent (p, net, data, buflen); if (!parse_res) { @@ -215,6 +222,7 @@ enum nss_status _nss_nis_getnetbyaddr_r (unsigned long addr, int type, struct netent *net, char *buffer, size_t buflen, int *herrnop) { + struct parser_data *data = (void *) buffer; char *domain; char *result; int len; @@ -275,7 +283,7 @@ _nss_nis_getnetbyaddr_r (unsigned long addr, int type, struct netent *net, ++p; free (result); - parse_res = _nss_files_parse_netent (p, net, buffer, buflen); + parse_res = _nss_files_parse_netent (p, net, data, buflen); if (!parse_res) diff --git a/nis/nss_nis/nis-proto.c b/nis/nss_nis/nis-proto.c index 6feae63258..ccb95c3c41 100644 --- a/nis/nss_nis/nis-proto.c +++ b/nis/nss_nis/nis-proto.c @@ -28,6 +28,11 @@ #include "nss-nis.h" +/* Get the declaration of the parser function. */ +#define ENTNAME protoent +#define EXTERN_PARSER +#include "../nss/nss_files/files-parse.c" + __libc_lock_define_initialized (static, lock) static bool_t new_start = 1; @@ -74,6 +79,7 @@ static enum nss_status internal_nis_getprotoent_r (struct protoent *proto, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; char *domain, *result, *outkey; int len, keylen, parse_res; @@ -114,7 +120,7 @@ internal_nis_getprotoent_r (struct protoent *proto, ++p; free (result); - parse_res = _nss_files_parse_protoent (p, proto, buffer, buflen); + parse_res = _nss_files_parse_protoent (p, proto, data, buflen); if (!parse_res && errno == ERANGE) return NSS_STATUS_TRYAGAIN; @@ -146,6 +152,7 @@ enum nss_status _nss_nis_getprotobyname_r (const char *name, struct protoent *proto, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; enum nss_status retval; char *domain, *result, *p; int len, parse_res; @@ -182,7 +189,7 @@ _nss_nis_getprotobyname_r (const char *name, struct protoent *proto, ++p; free (result); - parse_res = _nss_files_parse_protoent (p, proto, buffer, buflen); + parse_res = _nss_files_parse_protoent (p, proto, data, buflen); if (!parse_res) { @@ -199,6 +206,7 @@ enum nss_status _nss_nis_getprotobynumber_r (int number, struct protoent *proto, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; enum nss_status retval; char *domain, *result, *p; int len, nlen, parse_res; @@ -232,7 +240,7 @@ _nss_nis_getprotobynumber_r (int number, struct protoent *proto, ++p; free (result); - parse_res = _nss_files_parse_protoent (p, proto, buffer, buflen); + parse_res = _nss_files_parse_protoent (p, proto, data, buflen); if (!parse_res) { diff --git a/nis/nss_nis/nis-pwd.c b/nis/nss_nis/nis-pwd.c index 752f7032a6..60a59fe4a8 100644 --- a/nis/nss_nis/nis-pwd.c +++ b/nis/nss_nis/nis-pwd.c @@ -28,6 +28,12 @@ #include "nss-nis.h" +/* Get the declaration of the parser function. */ +#define ENTNAME pwent +#define STRUCTURE passwd +#define EXTERN_PARSER +#include "../nss/nss_files/files-parse.c" + /* Protect global state against multiple changers */ __libc_lock_define_initialized (static, lock) @@ -74,6 +80,7 @@ _nss_nis_endpwent (void) static enum nss_status internal_nis_getpwent_r (struct passwd *pwd, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; char *domain, *result, *outkey; int len, keylen, parse_res; @@ -114,7 +121,7 @@ internal_nis_getpwent_r (struct passwd *pwd, char *buffer, size_t buflen) ++p; free (result); - parse_res = _nss_files_parse_pwent (p, pwd, buffer, buflen); + parse_res = _nss_files_parse_pwent (p, pwd, data, buflen); if (!parse_res && errno == ERANGE) return NSS_STATUS_TRYAGAIN; @@ -146,6 +153,7 @@ enum nss_status _nss_nis_getpwnam_r (const char *name, struct passwd *pwd, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; enum nss_status retval; char *domain, *result, *p; int len, parse_res; @@ -182,7 +190,7 @@ _nss_nis_getpwnam_r (const char *name, struct passwd *pwd, ++p; free (result); - parse_res = _nss_files_parse_pwent (p, pwd, buffer, buflen); + parse_res = _nss_files_parse_pwent (p, pwd, data, buflen); if (!parse_res) { @@ -199,6 +207,7 @@ enum nss_status _nss_nis_getpwuid_r (uid_t uid, struct passwd *pwd, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; enum nss_status retval; char *domain, *result, *p; int len, nlen, parse_res; @@ -232,7 +241,7 @@ _nss_nis_getpwuid_r (uid_t uid, struct passwd *pwd, ++p; free (result); - parse_res = _nss_files_parse_pwent (p, pwd, buffer, buflen); + parse_res = _nss_files_parse_pwent (p, pwd, data, buflen); if (!parse_res) { diff --git a/nis/nss_nis/nis-rpc.c b/nis/nss_nis/nis-rpc.c index a549076537..2dae9ea8fa 100644 --- a/nis/nss_nis/nis-rpc.c +++ b/nis/nss_nis/nis-rpc.c @@ -28,6 +28,11 @@ #include "nss-nis.h" +/* Get the declaration of the parser function. */ +#define ENTNAME rpcent +#define EXTERN_PARSER +#include "../nss/nss_files/files-parse.c" + __libc_lock_define_initialized (static, lock) struct intern_t @@ -98,6 +103,7 @@ static enum nss_status internal_nis_getrpcent_r (struct rpcent *rpc, char *buffer, size_t buflen, intern_t *data) { + struct parser_data *pdata = (void *) buffer; char *domain; char *result; int len, parse_res; @@ -141,7 +147,7 @@ internal_nis_getrpcent_r (struct rpcent *rpc, char *buffer, size_t buflen, ++p; free (result); - parse_res = _nss_files_parse_rpcent (p, rpc, buffer, buflen); + parse_res = _nss_files_parse_rpcent (p, rpc, pdata, buflen); if (!parse_res && errno == ERANGE) return NSS_STATUS_TRYAGAIN; @@ -223,6 +229,7 @@ enum nss_status _nss_nis_getrpcbynumber_r (int number, struct rpcent *rpc, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; enum nss_status retval; char *domain, *result, *p; int len, nlen, parse_res; @@ -256,7 +263,7 @@ _nss_nis_getrpcbynumber_r (int number, struct rpcent *rpc, ++p; free (result); - parse_res = _nss_files_parse_rpcent (p, rpc, buffer, buflen); + parse_res = _nss_files_parse_rpcent (p, rpc, data, buflen); if (!parse_res) { diff --git a/nis/nss_nis/nis-spwd.c b/nis/nss_nis/nis-spwd.c index b5f8c3afd2..193cd7190c 100644 --- a/nis/nss_nis/nis-spwd.c +++ b/nis/nss_nis/nis-spwd.c @@ -28,6 +28,12 @@ #include "nss-nis.h" +/* Get the declaration of the parser function. */ +#define ENTNAME spent +#define STRUCTURE spwd +#define EXTERN_PARSER +#include "../nss/nss_files/files-parse.c" + /* Protect global state against multiple changers */ __libc_lock_define_initialized (static, lock) @@ -74,6 +80,7 @@ _nss_nis_endspent (void) static enum nss_status internal_nis_getspent_r (struct spwd *sp, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; char *domain, *result, *outkey; int len, keylen, parse_res; @@ -114,7 +121,7 @@ internal_nis_getspent_r (struct spwd *sp, char *buffer, size_t buflen) ++p; free (result); - parse_res = _nss_files_parse_spent (p, sp, buffer, buflen); + parse_res = _nss_files_parse_spent (p, sp, data, buflen); if (!parse_res && errno == ERANGE) return NSS_STATUS_TRYAGAIN; @@ -146,6 +153,7 @@ enum nss_status _nss_nis_getspnam_r (const char *name, struct spwd *sp, char *buffer, size_t buflen) { + struct parser_data *data = (void *) buffer; enum nss_status retval; char *domain, *result, *p; int len, parse_res; @@ -182,7 +190,7 @@ _nss_nis_getspnam_r (const char *name, struct spwd *sp, ++p; free (result); - parse_res = _nss_files_parse_spent (p, sp, buffer, buflen); + parse_res = _nss_files_parse_spent (p, sp, data, buflen); if (!parse_res) { -- cgit v1.2.1