summaryrefslogtreecommitdiff
path: root/nis
diff options
context:
space:
mode:
Diffstat (limited to 'nis')
-rw-r--r--nis/nss_compat/compat-grp.c4
-rw-r--r--nis/nss_compat/compat-pwd.c2
-rw-r--r--nis/nss_compat/compat-spwd.c6
-rw-r--r--nis/nss_nis/nis-grp.c2
-rw-r--r--nis/nss_nis/nis-hosts.c2
-rw-r--r--nis/nss_nis/nis-netgrp.c4
-rw-r--r--nis/nss_nis/nis-network.c2
-rw-r--r--nis/nss_nis/nis-proto.c2
-rw-r--r--nis/nss_nis/nis-pwd.c2
-rw-r--r--nis/nss_nis/nis-service.c9
-rw-r--r--nis/nss_nis/nis-spwd.c2
-rw-r--r--nis/nss_nisplus/nisplus-grp.c2
-rw-r--r--nis/nss_nisplus/nisplus-hosts.c2
-rw-r--r--nis/nss_nisplus/nisplus-netgrp.c5
-rw-r--r--nis/nss_nisplus/nisplus-network.c2
-rw-r--r--nis/nss_nisplus/nisplus-proto.c2
-rw-r--r--nis/nss_nisplus/nisplus-pwd.c2
-rw-r--r--nis/nss_nisplus/nisplus-service.c2
-rw-r--r--nis/nss_nisplus/nisplus-spwd.c2
19 files changed, 28 insertions, 28 deletions
diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c
index 2de46088df..d2fec68cc3 100644
--- a/nis/nss_compat/compat-grp.c
+++ b/nis/nss_compat/compat-grp.c
@@ -169,7 +169,7 @@ internal_setgrent (ent_t *ent)
enum nss_status
-_nss_compat_setgrent (void)
+_nss_compat_setgrent (int stayopen)
{
enum nss_status result;
@@ -543,7 +543,7 @@ getgrent_next_file (struct group *result, ent_t *ent,
{
enum nss_status status;
- /* Store the group in the blacklist for the "+" at the end of
+ /* Store the group in the blacklist for the "+" at the end of
/etc/group */
blacklist_store_name (&result->gr_name[1], ent);
status = getgrnam_plusgroup (&result->gr_name[1], result, buffer,
diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c
index cb2f19482d..8540f5563a 100644
--- a/nis/nss_compat/compat-pwd.c
+++ b/nis/nss_compat/compat-pwd.c
@@ -327,7 +327,7 @@ internal_setpwent (ent_t *ent)
enum nss_status
-_nss_compat_setpwent (void)
+_nss_compat_setpwent (int stayopen)
{
enum nss_status result;
diff --git a/nis/nss_compat/compat-spwd.c b/nis/nss_compat/compat-spwd.c
index f254fadf5c..e184d79e6d 100644
--- a/nis/nss_compat/compat-spwd.c
+++ b/nis/nss_compat/compat-spwd.c
@@ -227,7 +227,7 @@ internal_setspent (ent_t *ent)
enum nss_status
-_nss_compat_setspent (void)
+_nss_compat_setspent (int stayopen)
{
enum nss_status result;
@@ -484,7 +484,7 @@ getspent_next_nisplus_netgr (const char *name, struct spwd *result,
if (parse_res)
{
- /* Store the User in the blacklist for the "+" at the end of
+ /* Store the User in the blacklist for the "+" at the end of
/etc/passwd */
blacklist_store_name (result->sp_namp, ent);
copy_spwd_changes (result, &ent->pwd, p2, p2len);
@@ -844,7 +844,7 @@ getspent_next_file (struct spwd *result, ent_t *ent,
{
/* XXX Do not use fixed length buffers. */
char buf2[1024];
- char *user, *host, *domain;
+ char *user, *host, *domain;
struct __netgrent netgrdata;
bzero (&netgrdata, sizeof (struct __netgrent));
diff --git a/nis/nss_nis/nis-grp.c b/nis/nss_nis/nis-grp.c
index 62e6b475b7..72cf1b2747 100644
--- a/nis/nss_nis/nis-grp.c
+++ b/nis/nss_nis/nis-grp.c
@@ -42,7 +42,7 @@ static char *oldkey = NULL;
static int oldkeylen = 0;
enum nss_status
-_nss_nis_setgrent (void)
+_nss_nis_setgrent (int stayopen)
{
__libc_lock_lock (lock);
diff --git a/nis/nss_nis/nis-hosts.c b/nis/nss_nis/nis-hosts.c
index 58136f2b26..303cd245c3 100644
--- a/nis/nss_nis/nis-hosts.c
+++ b/nis/nss_nis/nis-hosts.c
@@ -99,7 +99,7 @@ static char *oldkey = NULL;
static int oldkeylen = 0;
enum nss_status
-_nss_nis_sethostent (void)
+_nss_nis_sethostent (int stayopen)
{
__libc_lock_lock (lock);
diff --git a/nis/nss_nis/nis-netgrp.c b/nis/nss_nis/nis-netgrp.c
index 71f7b6e4a6..e39c282b8b 100644
--- a/nis/nss_nis/nis-netgrp.c
+++ b/nis/nss_nis/nis-netgrp.c
@@ -43,7 +43,7 @@ _nss_netgroup_parseline (char **cursor, struct __netgrent *result,
char *buffer, size_t buflen, int *errnop);
enum nss_status
-_nss_nis_setnetgrent (char *group)
+_nss_nis_setnetgrent (const char *group, struct __netgrent *dummy)
{
char *domain;
char *result;
@@ -92,7 +92,7 @@ _nss_nis_setnetgrent (char *group)
enum nss_status
-_nss_nis_endnetgrent (void)
+_nss_nis_endnetgrent (struct __netgrent *dummy)
{
__libc_lock_lock (lock);
diff --git a/nis/nss_nis/nis-network.c b/nis/nss_nis/nis-network.c
index cae0b773b8..ca02f01902 100644
--- a/nis/nss_nis/nis-network.c
+++ b/nis/nss_nis/nis-network.c
@@ -43,7 +43,7 @@ static char *oldkey = NULL;
static int oldkeylen = 0;
enum nss_status
-_nss_nis_setnetent (void)
+_nss_nis_setnetent (int stayopen)
{
__libc_lock_lock (lock);
diff --git a/nis/nss_nis/nis-proto.c b/nis/nss_nis/nis-proto.c
index 9b457ffe8a..33286df53a 100644
--- a/nis/nss_nis/nis-proto.c
+++ b/nis/nss_nis/nis-proto.c
@@ -106,7 +106,7 @@ internal_nis_setprotoent (void)
}
enum nss_status
-_nss_nis_setprotoent (void)
+_nss_nis_setprotoent (int stayopen)
{
enum nss_status status;
diff --git a/nis/nss_nis/nis-pwd.c b/nis/nss_nis/nis-pwd.c
index 0a337bb9e7..b818f08f05 100644
--- a/nis/nss_nis/nis-pwd.c
+++ b/nis/nss_nis/nis-pwd.c
@@ -42,7 +42,7 @@ static char *oldkey = NULL;
static int oldkeylen = 0;
enum nss_status
-_nss_nis_setpwent (void)
+_nss_nis_setpwent (int stayopen)
{
__libc_lock_lock (lock);
diff --git a/nis/nss_nis/nis-service.c b/nis/nss_nis/nis-service.c
index 12ae1c6151..ea1e06eab3 100644
--- a/nis/nss_nis/nis-service.c
+++ b/nis/nss_nis/nis-service.c
@@ -115,7 +115,7 @@ internal_nis_setservent (intern_t *intern)
return status;
}
enum nss_status
-_nss_nis_setservent (void)
+_nss_nis_setservent (int stayopen)
{
enum nss_status status;
@@ -207,7 +207,7 @@ _nss_nis_getservent_r (struct servent *serv, char *buffer, size_t buflen,
}
enum nss_status
-_nss_nis_getservbyname_r (const char *name, char *protocol,
+_nss_nis_getservbyname_r (const char *name, const char *protocol,
struct servent *serv, char *buffer, size_t buflen,
int *errnop)
{
@@ -312,8 +312,9 @@ _nss_nis_getservbyname_r (const char *name, char *protocol,
}
enum nss_status
-_nss_nis_getservbyport_r (int port, char *protocol, struct servent *serv,
- char *buffer, size_t buflen, int *errnop)
+_nss_nis_getservbyport_r (int port, const char *protocol,
+ struct servent *serv, char *buffer,
+ size_t buflen, int *errnop)
{
intern_t data = { NULL, NULL };
enum nss_status status;
diff --git a/nis/nss_nis/nis-spwd.c b/nis/nss_nis/nis-spwd.c
index 37ea2f9dbf..d91f624db6 100644
--- a/nis/nss_nis/nis-spwd.c
+++ b/nis/nss_nis/nis-spwd.c
@@ -42,7 +42,7 @@ static char *oldkey = NULL;
static int oldkeylen = 0;
enum nss_status
-_nss_nis_setspent (void)
+_nss_nis_setspent (int stayopen)
{
__libc_lock_lock (lock);
diff --git a/nis/nss_nisplus/nisplus-grp.c b/nis/nss_nisplus/nisplus-grp.c
index d014c8b119..662d205acd 100644
--- a/nis/nss_nisplus/nisplus-grp.c
+++ b/nis/nss_nisplus/nisplus-grp.c
@@ -82,7 +82,7 @@ internal_setgrent (void)
}
enum nss_status
-_nss_nisplus_setgrent (void)
+_nss_nisplus_setgrent (int stayopen)
{
enum nss_status status;
diff --git a/nis/nss_nisplus/nisplus-hosts.c b/nis/nss_nisplus/nisplus-hosts.c
index 8f723f3d52..b2cb7a0f65 100644
--- a/nis/nss_nisplus/nisplus-hosts.c
+++ b/nis/nss_nisplus/nisplus-hosts.c
@@ -197,7 +197,7 @@ _nss_create_tablename (int *errnop)
}
enum nss_status
-_nss_nisplus_sethostent (void)
+_nss_nisplus_sethostent (int stayopen)
{
enum nss_status status = NSS_STATUS_SUCCESS;
int err;
diff --git a/nis/nss_nisplus/nisplus-netgrp.c b/nis/nss_nisplus/nisplus-netgrp.c
index 5d5b727292..1247963f29 100644
--- a/nis/nss_nisplus/nisplus-netgrp.c
+++ b/nis/nss_nisplus/nisplus-netgrp.c
@@ -129,8 +129,7 @@ _nss_nisplus_parse_netgroup (struct __netgrent *result, char *buffer,
}
enum nss_status
-_nss_nisplus_setnetgrent (char *group)
-
+_nss_nisplus_setnetgrent (const char *group, struct __netgrent *dummy)
{
enum nss_status status;
char buf[strlen (group) + 30];
@@ -169,7 +168,7 @@ _nss_nisplus_setnetgrent (char *group)
}
enum nss_status
-_nss_nisplus_endnetgrent (void)
+_nss_nisplus_endnetgrent (struct __netgrent *dummy)
{
__libc_lock_lock (lock);
diff --git a/nis/nss_nisplus/nisplus-network.c b/nis/nss_nisplus/nisplus-network.c
index 4b2339baa2..adfb3c18e5 100644
--- a/nis/nss_nisplus/nisplus-network.c
+++ b/nis/nss_nisplus/nisplus-network.c
@@ -161,7 +161,7 @@ _nss_create_tablename (int *errnop)
}
enum nss_status
-_nss_nisplus_setnetent (void)
+_nss_nisplus_setnetent (int stayopen)
{
enum nss_status status = NSS_STATUS_SUCCESS;
int err;
diff --git a/nis/nss_nisplus/nisplus-proto.c b/nis/nss_nisplus/nisplus-proto.c
index d121b2f83c..984530dcdd 100644
--- a/nis/nss_nisplus/nisplus-proto.c
+++ b/nis/nss_nisplus/nisplus-proto.c
@@ -158,7 +158,7 @@ _nss_create_tablename (int *errnop)
}
enum nss_status
-_nss_nisplus_setprotoent (void)
+_nss_nisplus_setprotoent (int stayopen)
{
enum nss_status status = NSS_STATUS_SUCCESS;
diff --git a/nis/nss_nisplus/nisplus-pwd.c b/nis/nss_nisplus/nisplus-pwd.c
index 194b97ff65..3ead9cda0d 100644
--- a/nis/nss_nisplus/nisplus-pwd.c
+++ b/nis/nss_nisplus/nisplus-pwd.c
@@ -56,7 +56,7 @@ _nss_create_tablename (int *errnop)
enum nss_status
-_nss_nisplus_setpwent (void)
+_nss_nisplus_setpwent (int stayopen)
{
enum nss_status status = NSS_STATUS_SUCCESS;
int err;
diff --git a/nis/nss_nisplus/nisplus-service.c b/nis/nss_nisplus/nisplus-service.c
index 36bf25a22a..f3815344f6 100644
--- a/nis/nss_nisplus/nisplus-service.c
+++ b/nis/nss_nisplus/nisplus-service.c
@@ -165,7 +165,7 @@ _nss_create_tablename (int *errnop)
enum nss_status
-_nss_nisplus_setservent (void)
+_nss_nisplus_setservent (int stayopen)
{
enum nss_status status = NSS_STATUS_SUCCESS;
int err;
diff --git a/nis/nss_nisplus/nisplus-spwd.c b/nis/nss_nisplus/nisplus-spwd.c
index 094f56d255..f8a8a5a3c2 100644
--- a/nis/nss_nisplus/nisplus-spwd.c
+++ b/nis/nss_nisplus/nisplus-spwd.c
@@ -55,7 +55,7 @@ _nss_create_tablename (int *errnop)
}
enum nss_status
-_nss_nisplus_setspent (void)
+_nss_nisplus_setspent (int stayopen)
{
enum nss_status status = NSS_STATUS_SUCCESS;
int err;