summaryrefslogtreecommitdiff
path: root/nis/nss_nis
diff options
context:
space:
mode:
Diffstat (limited to 'nis/nss_nis')
-rw-r--r--nis/nss_nis/nis-alias.c2
-rw-r--r--nis/nss_nis/nis-ethers.c17
-rw-r--r--nis/nss_nis/nis-grp.c15
-rw-r--r--nis/nss_nis/nis-network.c14
-rw-r--r--nis/nss_nis/nis-proto.c14
-rw-r--r--nis/nss_nis/nis-pwd.c15
-rw-r--r--nis/nss_nis/nis-rpc.c11
-rw-r--r--nis/nss_nis/nis-spwd.c12
8 files changed, 79 insertions, 21 deletions
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)
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 23:55:15 +0000