diff options
Diffstat (limited to 'nis')
27 files changed, 43 insertions, 43 deletions
diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c index 68f852d19a..40a190eea7 100644 --- a/nis/nss_compat/compat-grp.c +++ b/nis/nss_compat/compat-grp.c @@ -21,7 +21,7 @@ #include <nss.h> #include <grp.h> #include <ctype.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <string.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c index b47a8b13c1..d0d230bb1e 100644 --- a/nis/nss_compat/compat-pwd.c +++ b/nis/nss_compat/compat-pwd.c @@ -23,7 +23,7 @@ #include <ctype.h> #include <netdb.h> #include <string.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> #include <rpcsvc/nis.h> diff --git a/nis/nss_compat/compat-spwd.c b/nis/nss_compat/compat-spwd.c index 30c4e407d2..066f707ebb 100644 --- a/nis/nss_compat/compat-spwd.c +++ b/nis/nss_compat/compat-spwd.c @@ -23,7 +23,7 @@ #include <netdb.h> #include <shadow.h> #include <string.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> #include <rpcsvc/nis.h> diff --git a/nis/nss_nis/nis-alias.c b/nis/nss_nis/nis-alias.c index 733e1508c5..80c49ff5dd 100644 --- a/nis/nss_nis/nis-alias.c +++ b/nis/nss_nis/nis-alias.c @@ -22,7 +22,7 @@ #include <errno.h> #include <string.h> #include <aliases.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nis/nis-ethers.c b/nis/nss_nis/nis-ethers.c index 32c683415d..149910bfab 100644 --- a/nis/nss_nis/nis-ethers.c +++ b/nis/nss_nis/nis-ethers.c @@ -21,7 +21,7 @@ #include <ctype.h> #include <errno.h> #include <string.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> #include <netinet/if_ether.h> diff --git a/nis/nss_nis/nis-grp.c b/nis/nss_nis/nis-grp.c index cbe4d35555..9577499670 100644 --- a/nis/nss_nis/nis-grp.c +++ b/nis/nss_nis/nis-grp.c @@ -22,7 +22,7 @@ #include <ctype.h> #include <errno.h> #include <string.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nis/nis-hosts.c b/nis/nss_nis/nis-hosts.c index 5823c71a80..d26b4f5ccc 100644 --- a/nis/nss_nis/nis-hosts.c +++ b/nis/nss_nis/nis-hosts.c @@ -24,7 +24,7 @@ #include <netinet/in.h> #include <arpa/inet.h> #include <resolv.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nis/nis-netgrp.c b/nis/nss_nis/nis-netgrp.c index aa51c2f0df..ce8762a1e5 100644 --- a/nis/nss_nis/nis-netgrp.c +++ b/nis/nss_nis/nis-netgrp.c @@ -20,7 +20,7 @@ #include <nss.h> #include <ctype.h> #include <errno.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <netdb.h> #include <stdio.h> #include <stdlib.h> diff --git a/nis/nss_nis/nis-network.c b/nis/nss_nis/nis-network.c index 0253ac8453..284e479401 100644 --- a/nis/nss_nis/nis-network.c +++ b/nis/nss_nis/nis-network.c @@ -24,7 +24,7 @@ #include <string.h> #include <netinet/in.h> #include <arpa/inet.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nis/nis-proto.c b/nis/nss_nis/nis-proto.c index 3df99190a2..ceed40e036 100644 --- a/nis/nss_nis/nis-proto.c +++ b/nis/nss_nis/nis-proto.c @@ -22,7 +22,7 @@ #include <ctype.h> #include <errno.h> #include <string.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nis/nis-publickey.c b/nis/nss_nis/nis-publickey.c index f50f7095fc..52d1783d63 100644 --- a/nis/nss_nis/nis-publickey.c +++ b/nis/nss_nis/nis-publickey.c @@ -22,7 +22,7 @@ #include <errno.h> #include <string.h> #include <syslog.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpc/rpc.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> @@ -40,7 +40,7 @@ _nss_nis_getpublickey (const char *netname, char *pkey) enum nss_status retval; char *domain, *result; int len; - + pkey[0] = 0; if (netname == NULL) diff --git a/nis/nss_nis/nis-pwd.c b/nis/nss_nis/nis-pwd.c index b273332d03..39c2948b65 100644 --- a/nis/nss_nis/nis-pwd.c +++ b/nis/nss_nis/nis-pwd.c @@ -22,7 +22,7 @@ #include <ctype.h> #include <errno.h> #include <string.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nis/nis-rpc.c b/nis/nss_nis/nis-rpc.c index c20988312a..073284865e 100644 --- a/nis/nss_nis/nis-rpc.c +++ b/nis/nss_nis/nis-rpc.c @@ -22,7 +22,7 @@ #include <ctype.h> #include <errno.h> #include <string.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nis/nis-service.c b/nis/nss_nis/nis-service.c index ae7667f231..054bc33169 100644 --- a/nis/nss_nis/nis-service.c +++ b/nis/nss_nis/nis-service.c @@ -22,7 +22,7 @@ #include <ctype.h> #include <errno.h> #include <string.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nis/nis-spwd.c b/nis/nss_nis/nis-spwd.c index cc4cf3a0ba..21221fd7e5 100644 --- a/nis/nss_nis/nis-spwd.c +++ b/nis/nss_nis/nis-spwd.c @@ -22,7 +22,7 @@ #include <errno.h> #include <string.h> #include <shadow.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c index b27f1a87ab..1784778ca0 100644 --- a/nis/nss_nisplus/nisplus-alias.c +++ b/nis/nss_nisplus/nisplus-alias.c @@ -22,7 +22,7 @@ #include <ctype.h> #include <string.h> #include <aliases.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/nis.h> #include <rpcsvc/nislib.h> diff --git a/nis/nss_nisplus/nisplus-ethers.c b/nis/nss_nisplus/nisplus-ethers.c index 2cdc2dfd7a..d83c7b2e11 100644 --- a/nis/nss_nisplus/nisplus-ethers.c +++ b/nis/nss_nisplus/nisplus-ethers.c @@ -21,7 +21,7 @@ #include <errno.h> #include <ctype.h> #include <string.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <netdb.h> #include <netinet/ether.h> #include <rpcsvc/nis.h> diff --git a/nis/nss_nisplus/nisplus-grp.c b/nis/nss_nisplus/nisplus-grp.c index 1c73ca555b..bf851e0cea 100644 --- a/nis/nss_nisplus/nisplus-grp.c +++ b/nis/nss_nisplus/nisplus-grp.c @@ -22,7 +22,7 @@ #include <ctype.h> #include <errno.h> #include <string.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/nis.h> #include <rpcsvc/nislib.h> @@ -47,10 +47,10 @@ _nss_nisplus_parse_grent (nis_result * result, struct group *gr, size_t room_left = buflen; char *line; int count; - + if (result == NULL) return 0; - + if ((result->status != NIS_SUCCESS && result->status != NIS_S_SUCCESS) || result->objects.objects_len != 1 || result->objects.objects_val[0].zo_data.zo_type != ENTRY_OBJ || @@ -66,7 +66,7 @@ _nss_nisplus_parse_grent (nis_result * result, struct group *gr, __set_errno (ERANGE); return 0; } - + strncpy (first_unused, NISENTRYVAL (0, 0, result), NISENTRYLEN (0, 0, result)); first_unused[NISENTRYLEN (0, 0, result)] = '\0'; diff --git a/nis/nss_nisplus/nisplus-hosts.c b/nis/nss_nisplus/nisplus-hosts.c index 0fdeb8f3f1..ee87a78225 100644 --- a/nis/nss_nisplus/nisplus-hosts.c +++ b/nis/nss_nisplus/nisplus-hosts.c @@ -24,7 +24,7 @@ #include <string.h> #include <netinet/in.h> #include <arpa/inet.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/nis.h> #include <rpcsvc/nislib.h> diff --git a/nis/nss_nisplus/nisplus-netgrp.c b/nis/nss_nisplus/nisplus-netgrp.c index f2a1b301b9..5907882725 100644 --- a/nis/nss_nisplus/nisplus-netgrp.c +++ b/nis/nss_nisplus/nisplus-netgrp.c @@ -23,7 +23,7 @@ #include <netdb.h> #include <string.h> #include <netgroup.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/nis.h> #include <rpcsvc/nislib.h> @@ -42,7 +42,7 @@ static unsigned long position = 0; ((res)->objects.objects_val[(idx)].zo_data.objdata_u.en_data.en_cols.en_cols_val[(col)].ec_value.ec_value_len) static enum nss_status -_nss_nisplus_parse_netgroup (struct __netgrent *result, char *buffer, +_nss_nisplus_parse_netgroup (struct __netgrent *result, char *buffer, size_t buflen) { enum nss_status status; @@ -51,14 +51,14 @@ _nss_nisplus_parse_netgroup (struct __netgrent *result, char *buffer, if (data == NULL || data_size == 0) /* User bug. setnetgrent() wasn't called before. */ abort (); - + if (position == data_size) return result->first ? NSS_STATUS_NOTFOUND : NSS_STATUS_RETURN; - + if (NISENTRYLEN (position, 1, data) > 0) { /* We have a list of other netgroups. */ - + result->type = group_val; if (NISENTRYLEN (position, 1, data) >= buflen) { @@ -71,13 +71,13 @@ _nss_nisplus_parse_netgroup (struct __netgrent *result, char *buffer, result->val.group = buffer; ++position; result->first = 0; - + return NSS_STATUS_SUCCESS; } - /* Before we can copy the entry to the private buffer we have to make + /* Before we can copy the entry to the private buffer we have to make sure it is big enough. */ - if (NISENTRYLEN (position, 2, data) + NISENTRYLEN (position, 3, data) + + if (NISENTRYLEN (position, 2, data) + NISENTRYLEN (position, 3, data) + NISENTRYLEN (position, 4, data) + 6 > buflen) { __set_errno (ERANGE); @@ -86,9 +86,9 @@ _nss_nisplus_parse_netgroup (struct __netgrent *result, char *buffer, else { char *cp = buffer; - + result->type = triple_val; - + if (NISENTRYLEN (position, 2, data) == 0) result->val.triple.host = NULL; else @@ -166,9 +166,9 @@ _nss_nisplus_setnetgrent (char *group) } else data_size = data->objects.objects_len; - + __libc_lock_unlock (lock); - + return status; } diff --git a/nis/nss_nisplus/nisplus-network.c b/nis/nss_nisplus/nisplus-network.c index 7f849e21e9..8d6e08b2c6 100644 --- a/nis/nss_nisplus/nisplus-network.c +++ b/nis/nss_nisplus/nisplus-network.c @@ -23,7 +23,7 @@ #include <ctype.h> #include <string.h> #include <arpa/inet.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/nis.h> #include <rpcsvc/nislib.h> diff --git a/nis/nss_nisplus/nisplus-proto.c b/nis/nss_nisplus/nisplus-proto.c index 1399748846..ee0341d0b9 100644 --- a/nis/nss_nisplus/nisplus-proto.c +++ b/nis/nss_nisplus/nisplus-proto.c @@ -22,7 +22,7 @@ #include <ctype.h> #include <netdb.h> #include <string.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/nis.h> #include <rpcsvc/nislib.h> diff --git a/nis/nss_nisplus/nisplus-pwd.c b/nis/nss_nisplus/nisplus-pwd.c index b65a9fe395..89b0eff7a7 100644 --- a/nis/nss_nisplus/nisplus-pwd.c +++ b/nis/nss_nisplus/nisplus-pwd.c @@ -21,7 +21,7 @@ #include <errno.h> #include <pwd.h> #include <string.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/nis.h> #include <rpcsvc/nislib.h> diff --git a/nis/nss_nisplus/nisplus-rpc.c b/nis/nss_nisplus/nisplus-rpc.c index 435da5792c..180e9169f2 100644 --- a/nis/nss_nisplus/nisplus-rpc.c +++ b/nis/nss_nisplus/nisplus-rpc.c @@ -21,7 +21,7 @@ #include <errno.h> #include <ctype.h> #include <string.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpc/netdb.h> #include <rpcsvc/nis.h> #include <rpcsvc/nislib.h> diff --git a/nis/nss_nisplus/nisplus-service.c b/nis/nss_nisplus/nisplus-service.c index c95507a468..6cad42d4f6 100644 --- a/nis/nss_nisplus/nisplus-service.c +++ b/nis/nss_nisplus/nisplus-service.c @@ -22,7 +22,7 @@ #include <ctype.h> #include <netdb.h> #include <string.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/nis.h> #include <rpcsvc/nislib.h> diff --git a/nis/nss_nisplus/nisplus-spwd.c b/nis/nss_nisplus/nisplus-spwd.c index 568a1c4006..e6ff674f30 100644 --- a/nis/nss_nisplus/nisplus-spwd.c +++ b/nis/nss_nisplus/nisplus-spwd.c @@ -21,7 +21,7 @@ #include <errno.h> #include <shadow.h> #include <string.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpcsvc/nis.h> #include <rpcsvc/nislib.h> @@ -84,7 +84,7 @@ _nss_nisplus_parse_spent (nis_result *result, struct spwd *sp, sp->sp_lstchg = sp->sp_min = sp->sp_max = sp->sp_warn = sp->sp_inact = sp->sp_expire = sp->sp_flag = -1; - if (NISENTRYVAL (0, 7, result) > 0) + if (NISENTRYVAL (0, 7, result) != NULL) { char *line, *cp; diff --git a/nis/ypclnt.c b/nis/ypclnt.c index 01bf8bc6b0..cc510b9541 100644 --- a/nis/ypclnt.c +++ b/nis/ypclnt.c @@ -20,7 +20,7 @@ #include <string.h> #include <unistd.h> #include <fcntl.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <rpc/rpc.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> |