summaryrefslogtreecommitdiff
path: root/nis
diff options
context:
space:
mode:
Diffstat (limited to 'nis')
-rw-r--r--nis/nis_intern.c8
-rw-r--r--nis/nis_intern.h2
-rw-r--r--nis/nis_names.c44
-rw-r--r--nis/nis_server.c6
-rw-r--r--nis/nis_subr.c18
-rw-r--r--nis/nis_table.c24
-rw-r--r--nis/nss_compat/compat-grp.c54
-rw-r--r--nis/nss_compat/compat-pwd.c74
-rw-r--r--nis/nss_compat/compat-spwd.c96
-rw-r--r--nis/rpcsvc/nislib.h282
10 files changed, 374 insertions, 234 deletions
diff --git a/nis/nis_intern.c b/nis/nis_intern.c
index 57019b3cfa..91522a6312 100644
--- a/nis/nis_intern.c
+++ b/nis/nis_intern.c
@@ -25,7 +25,7 @@
/* Nearly the same as nis_getnames, but nis_getnames stopped
when 2 points left */
nis_name *
-__nis_expandname (const nis_name name)
+__nis_expandname (const char *name)
{
nis_name *getnames = NULL;
char local_domain[NIS_MAXNAMELEN + 1];
@@ -145,13 +145,13 @@ __nis_expandname (const nis_name name)
}
fd_result *
-__nis_finddirectoy (nis_name dir_name)
+__nis_finddirectoy (const_nis_name name)
{
fd_args args;
nis_error status;
fd_result *res;
- args.dir_name = dir_name;
+ args.dir_name = (char *) name;
args.requester = nis_local_principal ();
res = calloc (1, sizeof (fd_result));
@@ -160,7 +160,7 @@ __nis_finddirectoy (nis_name dir_name)
if ((status = __do_niscall (NULL, 0, NIS_FINDDIRECTORY,
(xdrproc_t) xdr_fd_args,
- (caddr_t) & args,
+ (caddr_t) &args,
(xdrproc_t) xdr_fd_result,
(caddr_t) res, 0)) != RPC_SUCCESS)
res->status = status;
diff --git a/nis/nis_intern.h b/nis/nis_intern.h
index 8201ccd533..855a7cab51 100644
--- a/nis/nis_intern.h
+++ b/nis/nis_intern.h
@@ -31,7 +31,7 @@ extern nis_error __do_niscall (__const nis_server *server, int server_len,
extern AUTH *authdes_pk_create (const char *, const netobj *, u_int,
struct sockaddr *, des_block *);
#endif
-extern nis_name *__nis_expandname (__const nis_name);
+extern nis_name *__nis_expandname (const char *);
__END_DECLS
diff --git a/nis/nis_names.c b/nis/nis_names.c
index aa8c880249..bb58ad9eaf 100644
--- a/nis/nis_names.c
+++ b/nis/nis_names.c
@@ -25,7 +25,7 @@
#include "nis_intern.h"
nis_result *
-nis_lookup (const nis_name name, const u_long flags)
+nis_lookup (const_nis_name name, const u_long flags)
{
nis_result *res;
struct ns_request req;
@@ -106,7 +106,7 @@ nis_lookup (const nis_name name, const u_long flags)
}
else
{
- req.ns_name = name;
+ req.ns_name = (char *)name;
while (is_link)
{
@@ -116,7 +116,7 @@ nis_lookup (const nis_name name, const u_long flags)
if ((status = __do_niscall (NULL, 0, NIS_LOOKUP,
(xdrproc_t) xdr_ns_request,
- (caddr_t) & req,
+ (caddr_t) &req,
(xdrproc_t) xdr_nis_result,
(caddr_t) res, flags)) != RPC_SUCCESS)
{
@@ -158,31 +158,55 @@ nis_lookup (const nis_name name, const u_long flags)
}
nis_result *
-nis_add (const nis_name name, const nis_object *obj)
+nis_add (const_nis_name name, const nis_object *obj)
{
nis_result *res;
nis_error status;
struct ns_request req;
+ char *p1, *p2, *p3, *p4;
+ char buf1 [strlen (name) + 20];
+ char buf4 [strlen (name) + 20];
res = calloc (1, sizeof (nis_result));
- req.ns_name = name;
+ req.ns_name = (char *)name;
req.ns_object.ns_object_len = 1;
req.ns_object.ns_object_val = nis_clone_object (obj, NULL);
+ p1 = req.ns_object.ns_object_val[0].zo_name;
+ req.ns_object.ns_object_val[0].zo_name =
+ nis_name_of_r (name, buf1, sizeof (buf1));
+
+ p2 = req.ns_object.ns_object_val[0].zo_owner;
+ if (p2 == NULL || strlen (p2) == 0)
+ req.ns_object.ns_object_val[0].zo_owner = nis_local_principal ();
+
+ p3 = req.ns_object.ns_object_val[0].zo_group;
+ if (p3 == NULL || strlen (p3) == 0)
+ req.ns_object.ns_object_val[0].zo_group = nis_local_group ();
+
+ p4 = req.ns_object.ns_object_val[0].zo_domain;
+ req.ns_object.ns_object_val[0].zo_domain =
+ nis_domain_of_r (name, buf4, sizeof (buf4));
+
if ((status = __do_niscall (NULL, 0, NIS_ADD, (xdrproc_t) xdr_ns_request,
- (caddr_t) & req, (xdrproc_t) xdr_nis_result,
+ (caddr_t) &req, (xdrproc_t) xdr_nis_result,
(caddr_t) res, 0)) != RPC_SUCCESS)
res->status = status;
+ req.ns_object.ns_object_val[0].zo_name = p1;
+ req.ns_object.ns_object_val[0].zo_owner = p2;
+ req.ns_object.ns_object_val[0].zo_group = p3;
+ req.ns_object.ns_object_val[0].zo_domain = p4;
+
nis_destroy_object (req.ns_object.ns_object_val);
return res;
}
nis_result *
-nis_remove (const nis_name name, const nis_object *obj)
+nis_remove (const_nis_name name, const nis_object *obj)
{
nis_result *res;
nis_error status;
@@ -190,7 +214,7 @@ nis_remove (const nis_name name, const nis_object *obj)
res = calloc (1, sizeof (nis_result));
- req.ns_name = name;
+ req.ns_name = (char *)name;
if (obj != NULL)
{
@@ -214,7 +238,7 @@ nis_remove (const nis_name name, const nis_object *obj)
}
nis_result *
-nis_modify (const nis_name name, const nis_object *obj)
+nis_modify (const_nis_name name, const nis_object *obj)
{
nis_result *res;
nis_error status;
@@ -222,7 +246,7 @@ nis_modify (const nis_name name, const nis_object *obj)
res = calloc (1, sizeof (nis_result));
- req.ns_name = name;
+ req.ns_name = (char *)name;
req.ns_object.ns_object_len = 1;
req.ns_object.ns_object_val = nis_clone_object (obj, NULL);
diff --git a/nis/nis_server.c b/nis/nis_server.c
index 0ed3c81042..431fbe7f2a 100644
--- a/nis/nis_server.c
+++ b/nis/nis_server.c
@@ -22,7 +22,7 @@
#include "nis_intern.h"
nis_error
-nis_mkdir (const nis_name dir, const nis_server *server)
+nis_mkdir (const_nis_name dir, const nis_server *server)
{
nis_error res;
@@ -54,7 +54,7 @@ nis_mkdir (const nis_name dir, const nis_server *server)
}
nis_error
-nis_rmdir (const nis_name dir, const nis_server *server)
+nis_rmdir (const_nis_name dir, const nis_server *server)
{
nis_error res;
@@ -116,7 +116,7 @@ nis_freetags (nis_tag *tags, const int numtags)
}
nis_server **
-nis_getservlist (const nis_name dir)
+nis_getservlist (const_nis_name dir)
{
nis_server **serv;
diff --git a/nis/nis_subr.c b/nis/nis_subr.c
index 74eb0b5c77..479e11d175 100644
--- a/nis/nis_subr.c
+++ b/nis/nis_subr.c
@@ -23,7 +23,7 @@
#include <rpcsvc/nislib.h>
nis_name
-nis_leaf_of (const nis_name name)
+nis_leaf_of (const_nis_name name)
{
static char result[NIS_MAXNAMELEN + 1];
@@ -31,7 +31,7 @@ nis_leaf_of (const nis_name name)
}
nis_name
-nis_leaf_of_r (const nis_name name, char *buffer, size_t buflen)
+nis_leaf_of_r (const_nis_name name, char *buffer, size_t buflen)
{
size_t i = 0;
@@ -53,7 +53,7 @@ nis_leaf_of_r (const nis_name name, char *buffer, size_t buflen)
}
nis_name
-nis_name_of (const nis_name name)
+nis_name_of (const_nis_name name)
{
static char result[NIS_MAXNAMELEN + 1];
@@ -61,7 +61,7 @@ nis_name_of (const nis_name name)
}
nis_name
-nis_name_of_r (const nis_name name, char *buffer, size_t buflen)
+nis_name_of_r (const_nis_name name, char *buffer, size_t buflen)
{
char *local_domain;
int diff;
@@ -90,7 +90,7 @@ nis_name_of_r (const nis_name name, char *buffer, size_t buflen)
}
nis_name
-nis_domain_of (const nis_name name)
+nis_domain_of (const_nis_name name)
{
static char result[NIS_MAXNAMELEN + 1];
@@ -98,7 +98,7 @@ nis_domain_of (const nis_name name)
}
nis_name
-nis_domain_of_r (const nis_name name, char *buffer, size_t buflen)
+nis_domain_of_r (const_nis_name name, char *buffer, size_t buflen)
{
char *cptr;
size_t cptr_len;
@@ -122,7 +122,7 @@ nis_domain_of_r (const nis_name name, char *buffer, size_t buflen)
}
static int
-count_dots (const nis_name str)
+count_dots (const_nis_name str)
{
int count = 0;
size_t i;
@@ -135,7 +135,7 @@ count_dots (const nis_name str)
}
nis_name *
-nis_getnames (const nis_name name)
+nis_getnames (const_nis_name name)
{
nis_name *getnames = NULL;
char local_domain[NIS_MAXNAMELEN + 1];
@@ -267,7 +267,7 @@ nis_freenames (nis_name *names)
}
name_pos
-nis_dir_cmp (const nis_name n1, const nis_name n2)
+nis_dir_cmp (const_nis_name n1, const_nis_name n2)
{
int len1, len2;
diff --git a/nis/nis_table.c b/nis/nis_table.c
index a3061e1d94..268ea2f76c 100644
--- a/nis/nis_table.c
+++ b/nis/nis_table.c
@@ -23,7 +23,7 @@
#include "nis_intern.h"
static void
-splitname (const nis_name name, nis_name *ibr_name, int *srch_len,
+splitname (const_nis_name name, nis_name *ibr_name, int *srch_len,
nis_attr **srch_val)
{
char *cptr, *key, *val, *next;
@@ -138,7 +138,7 @@ splitname (const nis_name name, nis_name *ibr_name, int *srch_len,
}
static struct ib_request *
-__create_ib_request (const nis_name name, struct ib_request *ibreq,
+__create_ib_request (const_nis_name name, struct ib_request *ibreq,
u_long flags)
{
splitname (name, &ibreq->ibr_name, &ibreq->ibr_srch.ibr_srch_len,
@@ -173,8 +173,8 @@ __create_ib_request (const nis_name name, struct ib_request *ibreq,
}
nis_result *
-nis_list (const nis_name name, const u_long flags,
- int (*callback) (const nis_name name,
+nis_list (const_nis_name name, u_long flags,
+ int (*callback) (const_nis_name name,
const nis_object *object,
const void *userdata),
const void *userdata)
@@ -257,8 +257,8 @@ nis_list (const nis_name name, const u_long flags,
}
nis_result *
-nis_add_entry (const nis_name name, const nis_object *obj,
- const u_long flags)
+nis_add_entry (const_nis_name name, const nis_object *obj,
+ u_long flags)
{
nis_result *res;
struct ib_request ibreq;
@@ -289,8 +289,8 @@ nis_add_entry (const nis_name name, const nis_object *obj,
}
nis_result *
-nis_modify_entry (const nis_name name, const nis_object *obj,
- const u_long flags)
+nis_modify_entry (const_nis_name name, const nis_object *obj,
+ u_long flags)
{
nis_result *res;
struct ib_request ibreq;
@@ -320,8 +320,8 @@ nis_modify_entry (const nis_name name, const nis_object *obj,
}
nis_result *
-nis_remove_entry (const nis_name name, const nis_object *obj,
- const u_long flags)
+nis_remove_entry (const_nis_name name, const nis_object *obj,
+ u_long flags)
{
nis_result *res;
struct ib_request ibreq;
@@ -354,7 +354,7 @@ nis_remove_entry (const nis_name name, const nis_object *obj,
}
nis_result *
-nis_first_entry (const nis_name name)
+nis_first_entry (const_nis_name name)
{
nis_result *res;
struct ib_request ibreq;
@@ -379,7 +379,7 @@ nis_first_entry (const nis_name name)
}
nis_result *
-nis_next_entry (const nis_name name, const netobj *cookie)
+nis_next_entry (const_nis_name name, const netobj *cookie)
{
nis_result *res;
struct ib_request ibreq;
diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c
index 6231a1e911..372212d0a3 100644
--- a/nis/nss_compat/compat-grp.c
+++ b/nis/nss_compat/compat-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.
@@ -88,13 +88,13 @@ internal_setgrent (ent_t *ent)
ent->oldkey = NULL;
ent->oldkeylen = 0;
}
-
+
if (ent->result != NULL)
{
nis_freeresult (ent->result);
ent->result = NULL;
}
-
+
if (ent->names != NULL)
{
nis_freenames (ent->names);
@@ -104,11 +104,11 @@ internal_setgrent (ent_t *ent)
ent->blacklist.current = 0;
if (ent->blacklist.data != NULL)
ent->blacklist.data[0] = '\0';
-
+
if (ent->stream == NULL)
{
ent->stream = fopen ("/etc/group", "r");
-
+
if (ent->stream == NULL)
status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
}
@@ -163,7 +163,7 @@ internal_endgrent (ent_t *ent)
nis_freeresult (ent->result);
ent->result = NULL;
}
-
+
if (ent->names != NULL)
{
nis_freenames (ent->names);
@@ -245,15 +245,15 @@ getgrent_next_nis (struct group *result, ent_t *ent, char *buffer,
while (isspace (*p))
++p;
-
+
parse_res = _nss_files_parse_grent (p, result, data, buflen);
-
- if (parse_res &&
+
+ if (parse_res &&
in_blacklist (result->gr_name, strlen (result->gr_name), ent))
parse_res = 0; /* if result->gr_name in blacklist,search next entry */
}
while (!parse_res);
-
+
return NSS_STATUS_SUCCESS;
}
@@ -262,7 +262,7 @@ getgrent_next_nisplus (struct group *result, ent_t *ent, char *buffer,
size_t buflen)
{
int parse_res;
-
+
if (ent->names == NULL)
{
ent->names = nis_getnames ("group.org_dir");
@@ -272,7 +272,7 @@ getgrent_next_nisplus (struct group *result, ent_t *ent, char *buffer,
return NSS_STATUS_UNAVAIL;
}
}
-
+
do
{
if (ent->nis_first)
@@ -289,8 +289,8 @@ getgrent_next_nisplus (struct group *result, ent_t *ent, char *buffer,
else
{
nis_result *res;
-
- res = nis_next_entry(ent->names[ent->names_nr],
+
+ res = nis_next_entry(ent->names[ent->names_nr],
&ent->result->cookie);
nis_freeresult (ent->result);
ent->result = res;
@@ -310,14 +310,14 @@ getgrent_next_nisplus (struct group *result, ent_t *ent, char *buffer,
}
}
}
- parse_res = _nss_nisplus_parse_grent (ent->result, result, buffer,
+ parse_res = _nss_nisplus_parse_grent (ent->result, result, buffer,
buflen);
- if (parse_res &&
+ if (parse_res &&
in_blacklist (result->gr_name, strlen (result->gr_name), ent))
parse_res = 0; /* if result->gr_name in blacklist,search next entry */
}
while (!parse_res);
-
+
return NSS_STATUS_SUCCESS;
}
@@ -328,7 +328,7 @@ getgrent_next_file_plusgroup (struct group *result, char *buffer,
{
struct parser_data *data = (void *) buffer;
int parse_res;
-
+
if (use_nisplus) /* Do the NIS+ query here */
{
nis_result *res;
@@ -340,7 +340,7 @@ getgrent_next_file_plusgroup (struct group *result, char *buffer,
if (niserr2nss (res->status) != NSS_STATUS_SUCCESS)
{
enum nss_status status = niserr2nss (res->status);
-
+
nis_freeresult (res);
return status;
}
@@ -354,7 +354,7 @@ getgrent_next_file_plusgroup (struct group *result, char *buffer,
if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
return NSS_STATUS_TRYAGAIN;
-
+
if (yp_match (domain, "group.byname", &result->gr_name[1],
strlen (result->gr_name) - 1, &outval, &outvallen)
!= YPERR_SUCCESS)
@@ -420,7 +420,7 @@ getgrent_next_file (struct group *result, ent_t *ent,
&& result->gr_name[1] != '@')
{
enum nss_status status;
-
+
status = getgrent_next_file_plusgroup (result, buffer, buflen);
if (status == NSS_STATUS_SUCCESS) /* We found the entry. */
break;
@@ -506,7 +506,7 @@ _nss_compat_getgrnam_r (const char *name, struct group *grp,
__nss_database_lookup ("group_compat", NULL, "nis", &ni);
use_nisplus = (strcmp (ni->name, "nisplus") == 0);
}
-
+
__libc_lock_unlock (lock);
status = internal_setgrent (&ent);
@@ -531,13 +531,13 @@ _nss_compat_getgrgid_r (gid_t gid, struct group *grp,
enum nss_status status;
__libc_lock_lock (lock);
-
+
if (ni == NULL)
{
__nss_database_lookup ("group_compat", NULL, "nis", &ni);
use_nisplus = (strcmp (ni->name, "nisplus") == 0);
}
-
+
__libc_lock_unlock (lock);
status = internal_setgrent (&ent);
@@ -605,10 +605,14 @@ static bool_t
in_blacklist (const char *name, int namelen, ent_t *ent)
{
char buf[namelen + 3];
+ char *cp;
if (ent->blacklist.data == NULL)
return FALSE;
- stpcpy (stpcpy (stpcpy (buf, "|"), name), "|");
+ buf[0] = '|';
+ cp = stpcpy (&buf[1], name);
+ *cp++= '|';
+ *cp = '\0';
return strstr (ent->blacklist.data, buf) != NULL;
}
diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c
index 317e2d18bf..1a80355d0f 100644
--- a/nis/nss_compat/compat-pwd.c
+++ b/nis/nss_compat/compat-pwd.c
@@ -321,7 +321,7 @@ getpwent_next_nis_netgr (struct passwd *result, ent_t *ent, char *group,
char *ypdomain, *host, *user, *domain, *outval, *p, *p2;
int status, outvallen;
size_t p2len;
-
+
if (yp_get_default_domain (&ypdomain) != YPERR_SUCCESS)
{
ent->netgroup = 0;
@@ -390,8 +390,8 @@ getpwent_next_nisplus_netgr (struct passwd *result, ent_t *ent, char *group,
int status, parse_res;
size_t p2len;
nis_result *nisres;
-
- /* Maybe we should use domainname here ? We need the current
+
+ /* Maybe we should use domainname here ? We need the current
domainname for the domain field in netgroups */
if (yp_get_default_domain (&ypdomain) != YPERR_SUCCESS)
{
@@ -434,7 +434,7 @@ getpwent_next_nisplus_netgr (struct passwd *result, ent_t *ent, char *group,
}
p2 = buffer + (buflen - p2len);
buflen -= p2len;
- {
+ {
char buf[strlen (user) + 30];
sprintf(buf, "[name=%s],passwd.org_dir", user);
nisres = nis_list(buf, EXPAND_NAME, NULL, NULL);
@@ -446,7 +446,7 @@ getpwent_next_nisplus_netgr (struct passwd *result, ent_t *ent, char *group,
}
parse_res = _nss_nisplus_parse_pwent (nisres, result, buffer, buflen);
nis_freeresult (nisres);
-
+
if (parse_res)
{
copy_pwd_changes (result, &ent->pwd, p2, p2len);
@@ -484,7 +484,7 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer,
return NSS_STATUS_UNAVAIL;
}
}
-
+
p2len = pwd_need_buflen (&ent->pwd);
if (p2len > buflen)
{
@@ -510,8 +510,8 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer,
else
{
nis_result *res;
-
- res = nis_next_entry(ent->names[ent->names_nr],
+
+ res = nis_next_entry(ent->names[ent->names_nr],
&ent->result->cookie);
nis_freeresult (ent->result);
ent->result = res;
@@ -532,16 +532,16 @@ getpwent_next_nisplus (struct passwd *result, ent_t *ent, char *buffer,
}
}
}
- parse_res = _nss_nisplus_parse_pwent (ent->result, result, buffer,
+ parse_res = _nss_nisplus_parse_pwent (ent->result, result, buffer,
buflen);
- if (parse_res &&
+ if (parse_res &&
in_blacklist (result->pw_name, strlen (result->pw_name), ent))
parse_res = 0; /* if result->pw_name in blacklist,search next entry */
}
while (!parse_res);
-
+
copy_pwd_changes (result, &ent->pwd, p2, p2len);
-
+
return NSS_STATUS_SUCCESS;
}
@@ -623,7 +623,7 @@ getpwent_next_nis (struct passwd *result, ent_t *ent, char *buffer,
/* This function handle the +user entrys in /etc/passwd */
static enum nss_status
-getpwent_next_file_plususer (struct passwd *result, char *buffer,
+getpwent_next_file_plususer (struct passwd *result, char *buffer,
size_t buflen)
{
struct parser_data *data = (void *) buffer;
@@ -631,11 +631,11 @@ getpwent_next_file_plususer (struct passwd *result, char *buffer,
int parse_res;
char *p;
size_t plen;
-
+
memset (&pwd, '\0', sizeof (struct passwd));
-
+
copy_pwd_changes (&pwd, result, NULL, 0);
-
+
plen = pwd_need_buflen (&pwd);
if (plen > buflen)
{
@@ -644,19 +644,19 @@ getpwent_next_file_plususer (struct passwd *result, char *buffer,
}
p = buffer + (buflen - plen);
buflen -= plen;
-
+
if (use_nisplus) /* Do the NIS+ query here */
{
nis_result *res;
char buf[strlen (result->pw_name) + 24];
-
+
sprintf(buf, "[name=%s],passwd.org_dir",
&result->pw_name[1]);
res = nis_list(buf, EXPAND_NAME, NULL, NULL);
if (niserr2nss (res->status) != NSS_STATUS_SUCCESS)
{
enum nss_status status = niserr2nss (res->status);
-
+
nis_freeresult (res);
return status;
}
@@ -668,22 +668,22 @@ getpwent_next_file_plususer (struct passwd *result, char *buffer,
char *domain;
char *outval;
int outvallen;
-
+
if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
return NSS_STATUS_TRYAGAIN;
-
+
if (yp_match (domain, "passwd.byname", &result->pw_name[1],
strlen (result->pw_name) - 1, &outval, &outvallen)
!= YPERR_SUCCESS)
return NSS_STATUS_TRYAGAIN;
- p = strncpy (buffer, outval,
+ p = strncpy (buffer, outval,
buflen < outvallen ? buflen : outvallen);
free (outval);
while (isspace (*p))
p++;
parse_res = _nss_files_parse_pwent (p, result, data, buflen);
}
-
+
if (parse_res)
{
copy_pwd_changes (result, &pwd, p, plen);
@@ -735,15 +735,19 @@ getpwent_next_file (struct passwd *result, ent_t *ent,
if (result->pw_name[0] == '-' && result->pw_name[1] == '@'
&& result->pw_name[2] != '\0')
{
+ char buf2[1024];
char *user, *host, *domain;
+ struct __netgrent netgrdata;
- setnetgrent (&result->pw_name[2]);
- while (getnetgrent (&host, &user, &domain))
+ bzero (&netgrdata, sizeof (struct __netgrent));
+ __internal_setnetgrent (&result->pw_name[2], &netgrdata);
+ while (__internal_getnetgrent_r (&host, &user, &domain,
+ &netgrdata, buf2, sizeof (buf2)))
{
if (user != NULL && user[0] != '-')
blacklist_store_name (user, ent);
}
- endnetgrent ();
+ __internal_endnetgrent (&netgrdata);
continue;
}
@@ -778,7 +782,7 @@ getpwent_next_file (struct passwd *result, ent_t *ent,
&& result->pw_name[1] != '@')
{
enum nss_status status;
-
+
status = getpwent_next_file_plususer (result, buffer, buflen);
if (status == NSS_STATUS_SUCCESS) /* We found the entry. */
break;
@@ -879,7 +883,7 @@ _nss_compat_getpwnam_r (const char *name, struct passwd *pwd,
__nss_database_lookup ("passwd_compat", NULL, "nis", &ni);
use_nisplus = (strcmp (ni->name, "nisplus") == 0);
}
-
+
__libc_lock_unlock (lock);
status = internal_setpwent (&ent);
@@ -903,17 +907,17 @@ _nss_compat_getpwuid_r (uid_t uid, struct passwd *pwd,
ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, 0, NULL, {NULL, 0, 0},
{NULL, NULL, 0, 0, NULL, NULL, NULL}};
enum nss_status status;
-
+
__libc_lock_lock (lock);
-
+
if (ni == NULL)
{
__nss_database_lookup ("passwd_compat", NULL, "nis", &ni);
use_nisplus = (strcmp (ni->name, "nisplus") == 0);
}
-
+
__libc_lock_unlock (lock);
-
+
status = internal_setpwent (&ent);
if (status != NSS_STATUS_SUCCESS)
return status;
@@ -979,10 +983,14 @@ static bool_t
in_blacklist (const char *name, int namelen, ent_t *ent)
{
char buf[namelen + 3];
+ char *cp;
if (ent->blacklist.data == NULL)
return FALSE;
- stpcpy (stpcpy (stpcpy (buf, "|"), name), "|");
+ buf[0] = '|';
+ cp = stpcpy (&buf[1], name);
+ *cp++= '|';
+ *cp = '\0';
return strstr (ent->blacklist.data, buf) != NULL;
}
diff --git a/nis/nss_compat/compat-spwd.c b/nis/nss_compat/compat-spwd.c
index 7c0eb24fc1..74967f8fd4 100644
--- a/nis/nss_compat/compat-spwd.c
+++ b/nis/nss_compat/compat-spwd.c
@@ -147,7 +147,7 @@ internal_setspent (ent_t *ent)
/* If something was left over free it. */
if (ent->netgroup)
__internal_endnetgrent (&ent->netgrdata);
-
+
if (ent->oldkey != NULL)
{
free (ent->oldkey);
@@ -166,7 +166,7 @@ internal_setspent (ent_t *ent)
ent->names = NULL;
}
ent->names_nr = 0;
-
+
ent->blacklist.current = 0;
if (ent->blacklist.data != NULL)
ent->blacklist.data[0] = '\0';
@@ -199,7 +199,7 @@ _nss_compat_setspent (void)
__nss_database_lookup ("shadow_compat", "passwd_compat", "nis", &ni);
use_nisplus = (strcmp (ni->name, "nisplus") == 0);
}
-
+
result = internal_setspent (&ext_ent);
__libc_lock_unlock (lock);
@@ -240,11 +240,11 @@ internal_endspent (ent_t *ent)
ent->names = NULL;
}
ent->names_nr = 0;
-
+
ent->blacklist.current = 0;
if (ent->blacklist.data != NULL)
ent->blacklist.data[0] = '\0';
-
+
give_spwd_free (&ent->pwd);
return NSS_STATUS_SUCCESS;
@@ -342,8 +342,8 @@ getspent_next_nisplus_netgr (struct spwd *result, ent_t *ent, char *group,
int status, parse_res;
size_t p2len;
nis_result *nisres;
-
- /* Maybe we should use domainname here ? We need the current
+
+ /* Maybe we should use domainname here ? We need the current
domainname for the domain field in netgroups */
if (yp_get_default_domain (&ypdomain) != YPERR_SUCCESS)
{
@@ -386,7 +386,7 @@ getspent_next_nisplus_netgr (struct spwd *result, ent_t *ent, char *group,
}
p2 = buffer + (buflen - p2len);
buflen -= p2len;
- {
+ {
char buf[strlen (user) + 30];
sprintf(buf, "[name=%s],passwd.org_dir", user);
nisres = nis_list(buf, EXPAND_NAME, NULL, NULL);
@@ -398,7 +398,7 @@ getspent_next_nisplus_netgr (struct spwd *result, ent_t *ent, char *group,
}
parse_res = _nss_nisplus_parse_spent (nisres, result, buffer, buflen);
nis_freeresult (nisres);
-
+
if (parse_res)
{
copy_spwd_changes (result, &ent->pwd, p2, p2len);
@@ -414,9 +414,9 @@ getspent_next_netgr (struct spwd *result, ent_t *ent, char *group,
char *buffer, size_t buflen)
{
if (use_nisplus)
- return getpwent_next_nisplus_netgr (result, ent, group, buffer, buflen);
+ return getspent_next_nisplus_netgr (result, ent, group, buffer, buflen);
else
- return getpwent_next_nis_netgr (result, ent, group, buffer, buflen);
+ return getspent_next_nis_netgr (result, ent, group, buffer, buflen);
}
static enum nss_status
@@ -426,7 +426,7 @@ getspent_next_nisplus (struct spwd *result, ent_t *ent, char *buffer,
int parse_res;
size_t p2len;
char *p2;
-
+
if (ent->names == NULL)
{
ent->names = nis_getnames ("passwd.org_dir");
@@ -436,7 +436,7 @@ getspent_next_nisplus (struct spwd *result, ent_t *ent, char *buffer,
return NSS_STATUS_UNAVAIL;
}
}
-
+
p2len = spwd_need_buflen (&ent->pwd);
if (p2len > buflen)
{
@@ -462,8 +462,8 @@ getspent_next_nisplus (struct spwd *result, ent_t *ent, char *buffer,
else
{
nis_result *res;
-
- res = nis_next_entry(ent->names[ent->names_nr],
+
+ res = nis_next_entry(ent->names[ent->names_nr],
&ent->result->cookie);
nis_freeresult (ent->result);
ent->result = res;
@@ -484,16 +484,16 @@ getspent_next_nisplus (struct spwd *result, ent_t *ent, char *buffer,
}
}
}
- parse_res = _nss_nisplus_parse_spent (ent->result, result, buffer,
+ parse_res = _nss_nisplus_parse_spent (ent->result, result, buffer,
buflen);
- if (parse_res &&
+ if (parse_res &&
in_blacklist (result->sp_namp, strlen (result->sp_namp), ent))
parse_res = 0; /* if result->pw_name in blacklist,search next entry */
}
while (!parse_res);
-
+
copy_spwd_changes (result, &ent->pwd, p2, p2len);
-
+
return NSS_STATUS_SUCCESS;
}
@@ -576,7 +576,7 @@ getspent_next_nis (struct spwd *result, ent_t *ent,
/* This function handle the +user entrys in /etc/shadow */
static enum nss_status
-getspent_next_file_plususer (struct spwd *result, char *buffer,
+getspent_next_file_plususer (struct spwd *result, char *buffer,
size_t buflen)
{
struct parser_data *data = (void *) buffer;
@@ -584,11 +584,11 @@ getspent_next_file_plususer (struct spwd *result, char *buffer,
int parse_res;
char *p;
size_t plen;
-
+
memset (&pwd, '\0', sizeof (struct spwd));
-
+
copy_spwd_changes (&pwd, result, NULL, 0);
-
+
plen = spwd_need_buflen (&pwd);
if (plen > buflen)
{
@@ -597,19 +597,19 @@ getspent_next_file_plususer (struct spwd *result, char *buffer,
}
p = buffer + (buflen - plen);
buflen -= plen;
-
+
if (use_nisplus) /* Do the NIS+ query here */
{
nis_result *res;
char buf[strlen (result->sp_namp) + 24];
-
+
sprintf(buf, "[name=%s],passwd.org_dir",
&result->sp_namp[1]);
res = nis_list(buf, EXPAND_NAME, NULL, NULL);
if (niserr2nss (res->status) != NSS_STATUS_SUCCESS)
{
enum nss_status status = niserr2nss (res->status);
-
+
nis_freeresult (res);
return status;
}
@@ -621,22 +621,22 @@ getspent_next_file_plususer (struct spwd *result, char *buffer,
char *domain;
char *outval;
int outvallen;
-
+
if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
return NSS_STATUS_TRYAGAIN;
-
+
if (yp_match (domain, "passwd.byname", &result->sp_namp[1],
strlen (result->sp_namp) - 1, &outval, &outvallen)
!= YPERR_SUCCESS)
return NSS_STATUS_TRYAGAIN;
- p = strncpy (buffer, outval,
+ p = strncpy (buffer, outval,
buflen < outvallen ? buflen : outvallen);
free (outval);
while (isspace (*p))
p++;
parse_res = _nss_files_parse_spent (p, result, data, buflen);
}
-
+
if (parse_res)
{
copy_spwd_changes (result, &pwd, p, plen);
@@ -660,8 +660,7 @@ getspent_next_file (struct spwd *result, ent_t *ent,
struct parser_data *data = (void *) buffer;
while (1)
{
- char *p, *p2;
- size_t p2len;
+ char *p;
do
{
@@ -676,10 +675,10 @@ getspent_next_file (struct spwd *result, ent_t *ent,
while (isspace (*p))
++p;
}
- while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
+ 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, data, buflen));
+ || !_nss_files_parse_spent (p, result, data, buflen));
if (result->sp_namp[0] != '+' && result->sp_namp[0] != '-')
/* This is a real entry. */
@@ -689,15 +688,19 @@ getspent_next_file (struct spwd *result, ent_t *ent,
if (result->sp_namp[0] == '-' && result->sp_namp[1] == '@'
&& result->sp_namp[2] != '\0')
{
- char *user, *host, *domain;
-
- setnetgrent (&result->sp_namp[2]);
- while (getnetgrent (&host, &user, &domain))
+ char buf2[1024];
+ char *user, *host, *domain;
+ struct __netgrent netgrdata;
+
+ bzero (&netgrdata, sizeof (struct __netgrent));
+ __internal_setnetgrent (&result->sp_namp[2], &netgrdata);
+ while (__internal_getnetgrent_r (&host, &user, &domain,
+ &netgrdata, buf2, sizeof (buf2)))
{
if (user != NULL && user[0] != '-')
blacklist_store_name (user, ent);
}
- endnetgrent ();
+ __internal_endnetgrent (&netgrdata);
continue;
}
@@ -732,7 +735,7 @@ getspent_next_file (struct spwd *result, ent_t *ent,
&& result->sp_namp[1] != '@')
{
enum nss_status status;
-
+
status = getspent_next_file_plususer (result, buffer, buflen);
if (status == NSS_STATUS_SUCCESS) /* We found the entry. */
break;
@@ -800,7 +803,7 @@ _nss_compat_getspent_r (struct spwd *pwd, char *buffer, size_t buflen)
__nss_database_lookup ("shadow_compat", "passwd_compat", "nis", &ni);
use_nisplus = (strcmp (ni->name, "nisplus") == 0);
}
-
+
/* Be prepared that the setspent function was not called before. */
if (ext_ent.stream == NULL)
status = internal_setspent (&ext_ent);
@@ -830,7 +833,7 @@ _nss_compat_getspnam_r (const char *name, struct spwd *pwd,
__nss_database_lookup ("shadow_compat", "passwd_compat", "nis", &ni);
use_nisplus = (strcmp (ni->name, "nisplus") == 0);
}
-
+
status = internal_setspent (&ent);
if (status != NSS_STATUS_SUCCESS)
return status;
@@ -890,16 +893,19 @@ blacklist_store_name (const char *name, ent_t *ent)
return;
}
-/* returns TRUE if ent->blacklist contains name, else FALSE */
+/* Returns TRUE if ent->blacklist contains name, else FALSE. */
static bool_t
in_blacklist (const char *name, int namelen, ent_t *ent)
{
char buf[namelen + 3];
+ char *cp;
if (ent->blacklist.data == NULL)
return FALSE;
- stpcpy (stpcpy (stpcpy (buf, "|"), name), "|");
+ buf[0] = '|';
+ cp = stpcpy (&buf[1], name);
+ *cp++= '|';
+ *cp = '\0';
return strstr (ent->blacklist.data, buf) != NULL;
}
-
diff --git a/nis/rpcsvc/nislib.h b/nis/rpcsvc/nislib.h
index b01270b22d..fa3ee4f65d 100644
--- a/nis/rpcsvc/nislib.h
+++ b/nis/rpcsvc/nislib.h
@@ -24,57 +24,144 @@
__BEGIN_DECLS
-/*
-** nis_names
-*/
-extern nis_result *nis_lookup __P ((__const nis_name, const u_long));
-extern nis_result *nis_add __P ((__const nis_name, const nis_object *));
-extern nis_result *nis_remove __P ((__const nis_name, const nis_object *));
-extern nis_result *nis_modify __P ((__const nis_name, const nis_object *));
-/*
-** nis_table
-*/
-extern nis_result *nis_list __P ((__const nis_name, const u_long,
- int (*)(__const nis_name,
- __const nis_object *,
- __const void *), __const void *));
-extern nis_result *nis_add_entry __P ((__const nis_name, __const nis_object *,
- __const u_long));
-extern nis_result *nis_modify_entry __P ((__const nis_name,
- __const nis_object *,
- __const u_long));
-extern nis_result *nis_remove_entry __P ((__const nis_name,
- __const nis_object *,
- __const u_long));
-extern nis_result *nis_first_entry __P ((__const nis_name));
-extern nis_result *nis_next_entry __P ((__const nis_name, __const netobj *));
+typedef const char *const_nis_name;
+
+/* nis_names: These functions are used to locate and manipulate all NIS+
+ * objects except the NIS+ entry objects.
+ *
+ * nis_lookup (name, flags) resolves a NIS+ name and returns a copy of
+ * that object from a NIS+ server.
+ * const nis_name name: name of the object to be resolved
+ * u_long flags: logically ORing zero or more flags (FOLLOW_LINKS,
+ * HARD_LOOKUP, [NO_CACHE], MASTER_ONLY, EXPAND_NAME)
+ *
+ * nis_add (name, obj) adds objects to the NIS+ namespace.
+ * const nis_name name: fully qualified NIS+ name.
+ * const nis_object *obj: object members zo_name and zo_domain will be
+ * constructed from name.
+ *
+ * nis_remove (name, obj) removes objects from the NIS+ namespace.
+ * const nis_name name: fully qualified NIS+ name.
+ * const nis_object *obj: if not NULL, it is assumed to point to a copy
+ * of the object being removed. In this case, if
+ * the object on the server does not have the same
+ * object identifier as the object being passed,
+ * the operation will fail with the NIS_NOTSAMEOBJ
+ * error.
+ *
+ * nis_modify (name, obj) can change specific attributes of an object
+ * that already exists in the namespace.
+ */
+extern nis_result *nis_lookup __P ((const_nis_name name, u_long flags));
+extern nis_result *nis_add __P ((const_nis_name name, const nis_object *obj));
+extern nis_result *nis_remove __P ((const_nis_name name,
+ const nis_object *obj));
+extern nis_result *nis_modify __P ((const_nis_name name,
+ const nis_object *obj));
+
+/* nis_tables: These functions are used to search and modify NIS+ tables.
+ *
+ * nis_list (table_name, flags, callback(table_name, obj, userdata), userdata)
+ * search a table in the NIS+ namespace.
+ * const nis_name table_name: indexed name ([xx=yy],table.dir)
+ * u_long flags: logically ORing one or more flags (FOLLOW_LINKS,
+ * [FOLLOW_PATH], HARD_LOOKUP, [ALL_RESULTS], [NO_CACHE],
+ * MASTER_ONLY, EXPAND_NAME, RETURN_RESULT)
+ * callback(): callback is an optional pointer to a function that will
+ * process the ENTRY type objects that are returned from the
+ * search. If this pointer is NULL, then all entries that match
+ * the search criteria are returned in the nis_result structure,
+ * otherwise this function will be called once for each
+ * entry returned.
+ * void *userdata: passed to callback function along with the returned
+ * entry object.
+ *
+ * nis_add_entry (table_name, obj, flags) will add the NIS+ object to the
+ * NIS+ table_name.
+ * const nis_name table_name
+ * const nis_object *obj
+ * u_long flags: 0, ADD_OVERWRITE, RETURN_RESULT
+ *
+ * nis_modify_entry (name, obj, flags) modifies an object identified by name.
+ * const nis_name name: object identifier
+ * const nis_object *obj: should point to an entry with the EN_MODIFIED
+ * flag set in each column that contains new
+ * information.
+ * u_long flags: 0, MOD_SAMEOBJ, RETURN_RESULT
+ *
+ * nis_remove_entry (table_name, obj, flags) removes a set of entries
+ * identified by table_name from the table.
+ * const nis_name table_name: indexed NIS+ name
+ * const nis_object *obj: if obj is non-null, it is presumed to point to
+ * a cached copy of the entry. When the removal is
+ * attempted, and the object that would be removed
+ * is not the same as the cached object pointed to
+ * by object then the operation will fail with an
+ * NIS_NOTSAMEOBJ error
+ * u_long flags: 0, REM_MULTIPLE
+ *
+ * nis_first_entry (table_name) fetches entries from a table one at a time.
+ * const nis_name table_name
+ *
+ * nis_next_entry (table_name, cookie) retrieves the "next" entry from a
+ * table specified by table_name.
+ * const nis_name table_name:
+ * const netobj *cookie: The value of cookie from the nis_result structure
+ * form the previous call.
+ */
+extern nis_result *nis_list __P ((const_nis_name name, u_long flags,
+ int (*callback)(const_nis_name table_name,
+ const nis_object *obj,
+ const void *userdata),
+ const void *userdata));
+extern nis_result *nis_add_entry __P ((const_nis_name table_name,
+ const nis_object *obj, u_long flags));
+extern nis_result *nis_modify_entry __P ((const_nis_name name,
+ const nis_object *obj,
+ u_long flags));
+extern nis_result *nis_remove_entry __P ((const_nis_name table_name,
+ const nis_object *obj,
+ u_long flags));
+extern nis_result *nis_first_entry __P ((const_nis_name table_name));
+extern nis_result *nis_next_entry __P ((const_nis_name table_name,
+ const netobj *cookie));
/*
** nis_server
*/
-extern nis_error nis_mkdir __P ((__const nis_name, __const nis_server *));
-extern nis_error nis_rmdir __P ((__const nis_name, __const nis_server *));
-extern nis_error nis_servstate __P ((__const nis_server *, __const nis_tag *,
- __const int, nis_tag **));
-extern nis_error nis_stats __P ((__const nis_server *, __const nis_tag *,
- __const int, nis_tag **));
-extern void nis_freetags __P ((nis_tag *, __const int));
-extern nis_server **nis_getservlist __P ((__const nis_name));
-extern void nis_freeservlist __P ((nis_server **));
+extern nis_error nis_mkdir __P ((const_nis_name dirname,
+ const nis_server *machine));
+extern nis_error nis_rmdir __P ((const_nis_name dirname,
+ const nis_server *machine));
+extern nis_error nis_servstate __P ((const nis_server *machine,
+ const nis_tag *tags, int numtags,
+ nis_tag **result));
+extern nis_error nis_stats __P ((const nis_server *machine,
+ const nis_tag *tags, int numtags,
+ nis_tag **result));
+extern void nis_freetags __P ((nis_tag *tags, int numtags));
+extern nis_server **nis_getservlist __P ((const_nis_name dirname));
+extern void nis_freeservlist __P ((nis_server **machines));
+
/*
** nis_subr
*/
-extern nis_name nis_leaf_of __P ((__const nis_name));
-extern nis_name nis_leaf_of_r __P ((__const nis_name, char *, size_t));
-extern nis_name nis_name_of __P ((__const nis_name));
-extern nis_name nis_name_of_r __P ((__const nis_name, char *, size_t));
-extern nis_name nis_domain_of __P ((__const nis_name));
-extern nis_name nis_domain_of_r __P ((__const nis_name, char *, size_t));
-extern nis_name *nis_getnames __P ((__const nis_name));
-extern void nis_freenames __P ((nis_name *));
-extern name_pos nis_dir_cmp __P ((nis_name, nis_name));
-extern nis_object *nis_clone_object __P ((__const nis_object *, nis_object *));
-extern void nis_destroy_object __P ((nis_object *));
-extern void nis_print_object __P ((__const nis_object *));
+extern nis_name nis_leaf_of __P ((const_nis_name name));
+extern nis_name nis_leaf_of_r __P ((const_nis_name name, char *buffer,
+ size_t buflen));
+extern nis_name nis_name_of __P ((const_nis_name name));
+extern nis_name nis_name_of_r __P ((const_nis_name name, char *buffer,
+ size_t buflen));
+extern nis_name nis_domain_of __P ((const_nis_name name));
+extern nis_name nis_domain_of_r __P ((const_nis_name name, char *buffer,
+ size_t buflen));
+extern nis_name *nis_getnames __P ((const_nis_name name));
+extern void nis_freenames __P ((nis_name *namelist));
+extern name_pos nis_dir_cmp __P ((const_nis_name n1, const_nis_name n2));
+extern nis_object *nis_clone_object __P ((const nis_object *src,
+ nis_object *dest));
+extern void nis_destroy_object __P ((nis_object *obj));
+extern void nis_print_object __P ((const nis_object *obj));
+
/*
** nis_local_names
*/
@@ -82,81 +169,92 @@ extern nis_name nis_local_group __P ((void));
extern nis_name nis_local_directory __P ((void));
extern nis_name nis_local_principal __P ((void));
extern nis_name nis_local_host __P ((void));
+
/*
** nis_error
*/
-extern const char *nis_sperrno __P ((__const nis_error));
-extern void nis_perror __P ((__const nis_error, __const char *));
-extern void nis_lerror __P ((__const nis_error, __const char *));
-extern char *nis_sperror __P ((__const nis_error, __const char *));
-extern char *nis_sperror_r __P ((__const nis_error, __const char *,
- char *, size_t));
+extern const char *nis_sperrno __P ((const nis_error status));
+extern void nis_perror __P ((const nis_error status, const char *label));
+extern void nis_lerror __P ((const nis_error status, const char *label));
+extern char *nis_sperror __P ((const nis_error status, const char *label));
+extern char *nis_sperror_r __P ((const nis_error status, const char *label,
+ char *buffer, size_t buflen));
/*
** nis_groups
*/
-extern bool_t nis_ismember __P ((__const nis_name, __const nis_name));
-extern nis_error nis_addmember __P ((__const nis_name, __const nis_name));
-extern nis_error nis_removemember __P ((__const nis_name, __const nis_name));
-extern nis_error nis_creategroup __P ((__const nis_name, __const u_long));
-extern nis_error nis_destroygroup __P ((__const nis_name));
-extern void nis_print_group_entry __P ((__const nis_name));
-extern nis_error nis_verifygroup __P ((__const nis_name));
+extern bool_t nis_ismember __P ((const_nis_name principal,
+ const_nis_name group));
+extern nis_error nis_addmember __P ((const_nis_name member,
+ const_nis_name group));
+extern nis_error nis_removemember __P ((const_nis_name member,
+ const_nis_name group));
+extern nis_error nis_creategroup __P ((const_nis_name group, u_long flags));
+extern nis_error nis_destroygroup __P ((const_nis_name group));
+extern void nis_print_group_entry __P ((const_nis_name group));
+extern nis_error nis_verifygroup __P ((const_nis_name group));
+
/*
** nis_ping
*/
-extern void nis_ping __P ((__const nis_name, __const u_long,
- __const nis_object *));
-extern nis_result *nis_checkpoint __P ((__const nis_name));
+extern void nis_ping __P ((const_nis_name dirname, u_long utime,
+ const nis_object *dirobj));
+extern nis_result *nis_checkpoint __P ((const_nis_name dirname));
/*
** nis_print (XXX INTERNAL FUNCTIONS, SHOULD NOT BE USED !!)
*/
-extern void nis_print_result __P ((__const nis_result *));
-extern void nis_print_rights __P ((__const u_long));
-extern void nis_print_directory __P ((__const directory_obj *));
-extern void nis_print_group __P ((__const group_obj *));
-extern void nis_print_table __P ((__const table_obj *));
-extern void nis_print_link __P ((__const link_obj *));
-extern void nis_print_entry __P ((__const entry_obj *));
+extern void nis_print_result __P ((const nis_result *result));
+extern void nis_print_rights __P ((u_long rights));
+extern void nis_print_directory __P ((const directory_obj *dirobj));
+extern void nis_print_group __P ((const group_obj *grpobj));
+extern void nis_print_table __P ((const table_obj *tblobj));
+extern void nis_print_link __P ((const link_obj *lnkobj));
+extern void nis_print_entry __P ((const entry_obj *enobj));
+
/*
** nis_file (XXX INTERNAL FUNCTIONS, SHOULD NOT BE USED !!)
*/
extern directory_obj *readColdStartFile __P ((void));
-extern bool_t writeColdStartFile __P ((__const directory_obj *));
-extern nis_object *nis_read_obj __P ((__const char *));
-extern bool_t nis_write_obj __P ((__const char *, __const nis_object *));
+extern bool_t writeColdStartFile __P ((const directory_obj *dirobj));
+extern nis_object *nis_read_obj __P ((const char *obj));
+extern bool_t nis_write_obj __P ((const char *file, const nis_object *obj));
+
/*
** nis_clone - (XXX INTERNAL FUNCTIONS, SHOULD NOT BE USED !!)
*/
+extern directory_obj *nis_clone_directory __P ((const directory_obj *src,
+ directory_obj *dest));
+extern group_obj *nis_clone_group __P ((const group_obj *src,
+ group_obj *dest));
+extern table_obj *nis_clone_table __P ((const table_obj *src,
+ table_obj *dest));
+extern entry_obj *nis_clone_entry __P ((const entry_obj *src,
+ entry_obj *dest));
+extern link_obj *nis_clone_link __P ((const link_obj *src, link_obj *dest));
+extern objdata *nis_clone_objdata __P ((const objdata *src, objdata *dest));
+extern nis_result *nis_clone_result __P ((const nis_result *src,
+ nis_result *dest));
-extern directory_obj *nis_clone_directory __P ((__const directory_obj *,
- directory_obj *));
-extern group_obj *nis_clone_group __P ((__const group_obj *, group_obj *));
-extern table_obj *nis_clone_table __P ((__const table_obj *, table_obj *));
-extern entry_obj *nis_clone_entry __P ((__const entry_obj *, entry_obj *));
-extern link_obj *nis_clone_link __P ((__const link_obj *, link_obj *));
-extern objdata *nis_clone_objdata __P ((__const objdata *, objdata *));
-extern nis_result *nis_clone_result __P ((__const nis_result *, nis_result *));
/*
** nis_free - nis_freeresult
*/
-extern void nis_freeresult __P ((nis_result *));
-/* (XXX INTERNAL FUNCTIONS, SHOULD NOT BE USED !!) */
-extern void nis_free_attr __P ((nis_attr *));
-extern void nis_free_request __P ((ib_request *));
-extern void nis_free_endpoints __P ((endpoint *, unsigned int));
-extern void nis_free_servers __P ((nis_server *, unsigned int));
-extern void nis_free_directory __P ((directory_obj *));
-extern void nis_free_group __P ((group_obj *));
-extern void nis_free_table __P ((table_obj *));
-extern void nis_free_entry __P ((entry_obj *));
-extern void nis_free_link __P ((link_obj *));
-extern void nis_free_object __P ((nis_object *));
+extern void nis_freeresult __P ((nis_result *result));
+/* (XXX THE FOLLOWING ARE INTERNAL FUNCTIONS, SHOULD NOT BE USED !!) */
+extern void nis_free_attr __P ((nis_attr *attr));
+extern void nis_free_request __P ((ib_request *req));
+extern void nis_free_endpoints __P ((endpoint *ep, unsigned int count));
+extern void nis_free_servers __P ((nis_server *machine, unsigned int count));
+extern void nis_free_directory __P ((directory_obj *dirobj));
+extern void nis_free_group __P ((group_obj *grpobj));
+extern void nis_free_table __P ((table_obj *tblobj));
+extern void nis_free_entry __P ((entry_obj *enobj));
+extern void nis_free_link __P ((link_obj *lnkobj));
+extern void nis_free_object __P ((nis_object *obj));
/* This is the SUN definition, but I don't know for what we need
the directory_obj parameter */
/* extern fd_result *nis_finddirectory __P ((directory_obj *, nis_name)); */
-extern fd_result *__nis_finddirectory __P ((nis_name));
+extern fd_result *__nis_finddirectory __P ((const_nis_name name));
extern int __start_clock(int);
extern u_long __stop_clock(int);
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 23:54:27 +0000