diff options
Diffstat (limited to 'nis')
-rw-r--r-- | nis/nss_nis/nis-ethers.c | 2 | ||||
-rw-r--r-- | nis/nss_nis/nis-grp.c | 4 | ||||
-rw-r--r-- | nis/nss_nis/nis-hosts.c | 6 | ||||
-rw-r--r-- | nis/nss_nis/nis-network.c | 4 | ||||
-rw-r--r-- | nis/nss_nis/nis-proto.c | 24 | ||||
-rw-r--r-- | nis/nss_nis/nis-pwd.c | 4 | ||||
-rw-r--r-- | nis/nss_nis/nis-rpc.c | 20 | ||||
-rw-r--r-- | nis/nss_nis/nis-spwd.c | 4 |
8 files changed, 34 insertions, 34 deletions
diff --git a/nis/nss_nis/nis-ethers.c b/nis/nss_nis/nis-ethers.c index 2d08be7967..a9730a3744 100644 --- a/nis/nss_nis/nis-ethers.c +++ b/nis/nss_nis/nis-ethers.c @@ -41,7 +41,7 @@ struct ether #define ENTNAME etherent #define STRUCTURE ether #define EXTERN_PARSER -#include "../nss/nss_files/files-parse.c" +#include <nss/nss_files/files-parse.c> struct response { diff --git a/nis/nss_nis/nis-grp.c b/nis/nss_nis/nis-grp.c index 139edf2dd8..cbe4d35555 100644 --- a/nis/nss_nis/nis-grp.c +++ b/nis/nss_nis/nis-grp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996. @@ -32,7 +32,7 @@ #define ENTNAME grent #define STRUCTURE group #define EXTERN_PARSER -#include "../nss/nss_files/files-parse.c" +#include <nss/nss_files/files-parse.c> /* Protect global state against multiple changers */ __libc_lock_define_initialized (static, lock) diff --git a/nis/nss_nis/nis-hosts.c b/nis/nss_nis/nis-hosts.c index 42fc5aeac7..5ca24c7625 100644 --- a/nis/nss_nis/nis-hosts.c +++ b/nis/nss_nis/nis-hosts.c @@ -31,8 +31,8 @@ #include "nss-nis.h" /* Get implementation for some internal functions. */ -#include "../../resolv/mapv4v6addr.h" -#include "../../resolv/mapv4v6hostent.h" +#include <resolv/mapv4v6addr.h> +#include <resolv/mapv4v6hostent.h> #define ENTNAME hostent #define DATABASE "hosts" @@ -47,7 +47,7 @@ struct hostent_data #define TRAILING_LIST_MEMBER h_aliases #define TRAILING_LIST_SEPARATOR_P isspace -#include "../../nss/nss_files/files-parse.c" +#include <nss/nss_files/files-parse.c> LINE_PARSER ("#", { diff --git a/nis/nss_nis/nis-network.c b/nis/nss_nis/nis-network.c index 391f4c5895..0253ac8453 100644 --- a/nis/nss_nis/nis-network.c +++ b/nis/nss_nis/nis-network.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996. @@ -33,7 +33,7 @@ /* Get the declaration of the parser function. */ #define ENTNAME netent #define EXTERN_PARSER -#include "../nss/nss_files/files-parse.c" +#include <nss/nss_files/files-parse.c> __libc_lock_define_initialized (static, lock) diff --git a/nis/nss_nis/nis-proto.c b/nis/nss_nis/nis-proto.c index 92ef1c0010..d939c9d5c7 100644 --- a/nis/nss_nis/nis-proto.c +++ b/nis/nss_nis/nis-proto.c @@ -31,7 +31,7 @@ /* Get the declaration of the parser function. */ #define ENTNAME protoent #define EXTERN_PARSER -#include "../nss/nss_files/files-parse.c" +#include <nss/nss_files/files-parse.c> __libc_lock_define_initialized (static, lock) @@ -45,7 +45,7 @@ static struct response *start = NULL; static struct response *next = NULL; static int -saveit (int instatus, char *inkey, int inkeylen, char *inval, +saveit (int instatus, char *inkey, int inkeylen, char *inval, int invallen, char *indata) { if (instatus != YP_TRUE) @@ -68,7 +68,7 @@ saveit (int instatus, char *inkey, int inkeylen, char *inval, strncpy (next->val, inval, invallen); next->val[invallen] = '\0'; } - + return 0; } @@ -78,9 +78,9 @@ internal_nis_setprotoent (void) char *domainname; struct ypall_callback ypcb; enum nss_status status; - + yp_get_default_domain (&domainname); - + while (start != NULL) { if (start->val != NULL) @@ -90,12 +90,12 @@ internal_nis_setprotoent (void) free (next); } start = NULL; - + ypcb.foreach = saveit; ypcb.data = NULL; status = yperr2nss (yp_all (domainname, "protocols.bynumber", &ypcb)); next = start; - + return status; } @@ -128,9 +128,9 @@ _nss_nis_endprotoent (void) } start = NULL; next = NULL; - + __libc_lock_unlock (lock); - + return NSS_STATUS_SUCCESS; } @@ -148,12 +148,12 @@ internal_nis_getprotoent_r (struct protoent *proto, do { char *p; - + if (next == NULL) return NSS_STATUS_NOTFOUND; p = strcpy (buffer, next->val); next = next->next; - + while (isspace (*p)) ++p; @@ -162,7 +162,7 @@ internal_nis_getprotoent_r (struct protoent *proto, return NSS_STATUS_TRYAGAIN; } while (!parse_res); - + return NSS_STATUS_SUCCESS; } diff --git a/nis/nss_nis/nis-pwd.c b/nis/nss_nis/nis-pwd.c index 60a59fe4a8..b273332d03 100644 --- a/nis/nss_nis/nis-pwd.c +++ b/nis/nss_nis/nis-pwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996. @@ -32,7 +32,7 @@ #define ENTNAME pwent #define STRUCTURE passwd #define EXTERN_PARSER -#include "../nss/nss_files/files-parse.c" +#include <nss/nss_files/files-parse.c> /* Protect global state against multiple changers */ __libc_lock_define_initialized (static, lock) diff --git a/nis/nss_nis/nis-rpc.c b/nis/nss_nis/nis-rpc.c index c4c9135e3f..c20988312a 100644 --- a/nis/nss_nis/nis-rpc.c +++ b/nis/nss_nis/nis-rpc.c @@ -31,7 +31,7 @@ /* Get the declaration of the parser function. */ #define ENTNAME rpcent #define EXTERN_PARSER -#include "../nss/nss_files/files-parse.c" +#include <nss/nss_files/files-parse.c> __libc_lock_define_initialized (static, lock) @@ -51,7 +51,7 @@ typedef struct intern_t intern_t; static intern_t intern = {NULL, NULL}; static int -saveit (int instatus, char *inkey, int inkeylen, char *inval, +saveit (int instatus, char *inkey, int inkeylen, char *inval, int invallen, char *indata) { intern_t *intern = (intern_t *)indata; @@ -76,7 +76,7 @@ saveit (int instatus, char *inkey, int inkeylen, char *inval, strncpy (intern->next->val, inval, invallen); intern->next->val[invallen] = '\0'; } - + return 0; } @@ -86,10 +86,10 @@ internal_nis_setrpcent (intern_t *intern) char *domainname; struct ypall_callback ypcb; enum nss_status status; - + if (yp_get_default_domain (&domainname)) return NSS_STATUS_UNAVAIL; - + while (intern->start != NULL) { if (intern->start->val != NULL) @@ -134,7 +134,7 @@ internal_nis_endrpcent (intern_t *intern) free (intern->next); } intern->start = NULL; - + return NSS_STATUS_SUCCESS; } @@ -159,10 +159,10 @@ internal_nis_getrpcent_r (struct rpcent *rpc, char *buffer, size_t buflen, struct parser_data *pdata = (void *) buffer; int parse_res; char *p; - + if (data->start == NULL) internal_nis_setrpcent (data); - + /* Get the next entry until we found a correct one. */ do { @@ -172,13 +172,13 @@ internal_nis_getrpcent_r (struct rpcent *rpc, char *buffer, size_t buflen, data->next = data->next->next; while (isspace (*p)) ++p; - + parse_res = _nss_files_parse_rpcent (p, rpc, pdata, buflen); if (!parse_res && errno == ERANGE) return NSS_STATUS_TRYAGAIN; } while (!parse_res); - + return NSS_STATUS_SUCCESS; } diff --git a/nis/nss_nis/nis-spwd.c b/nis/nss_nis/nis-spwd.c index 193cd7190c..cc4cf3a0ba 100644 --- a/nis/nss_nis/nis-spwd.c +++ b/nis/nss_nis/nis-spwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996. @@ -32,7 +32,7 @@ #define ENTNAME spent #define STRUCTURE spwd #define EXTERN_PARSER -#include "../nss/nss_files/files-parse.c" +#include <nss/nss_files/files-parse.c> /* Protect global state against multiple changers */ __libc_lock_define_initialized (static, lock) |