diff options
Diffstat (limited to 'nis/nis_modify.c')
| -rw-r--r-- | nis/nis_modify.c | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/nis/nis_modify.c b/nis/nis_modify.c index 3f2cca4698..57efe82bf2 100644 --- a/nis/nis_modify.c +++ b/nis/nis_modify.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@uni-paderborn.de>, 1997. @@ -19,52 +19,53 @@ #include <rpcsvc/nis.h> +#include "nis_xdr.h" #include "nis_intern.h" nis_result * -nis_modify (const_nis_name name, const nis_object *obj) +nis_modify (const_nis_name name, const nis_object *obj2) { + 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]; + size_t namelen = strlen (name); + char buf1[namelen + 20]; + char buf4[namelen + 20]; res = calloc (1, sizeof (nis_result)); + if (res == NULL) + return NULL; - req.ns_name = (char *) name; + req.ns_name = (char *)name; - req.ns_object.ns_object_len = 1; - req.ns_object.ns_object_val = nis_clone_object (obj, NULL); + memcpy (&obj, obj2, sizeof (nis_object)); - p1 = req.ns_object.ns_object_val[0].zo_name; - if (p1 == NULL || strlen (p1) == 0) - req.ns_object.ns_object_val[0].zo_name = - nis_leaf_of_r (name, buf1, sizeof (buf1)); + if (obj.zo_name == NULL || obj.zo_name[0] == '\0') + obj.zo_name = nis_leaf_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 (); + if (obj.zo_owner == NULL || obj.zo_owner[0] == '\0') + obj.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 (); + if (obj.zo_group == NULL || obj.zo_group[0] == '\0') + obj.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)); + obj.zo_domain = nis_domain_of_r (name, buf4, sizeof (buf4)); - if ((status = __do_niscall (name, NIS_MODIFY, (xdrproc_t) xdr_ns_request, - (caddr_t) & req, (xdrproc_t) xdr_nis_result, - (caddr_t) res, MASTER_ONLY, - NULL)) != RPC_SUCCESS) - NIS_RES_STATUS (res) = status; + req.ns_object.ns_object_val = nis_clone_object (&obj, NULL); + if (req.ns_object.ns_object_val == NULL) + { + NIS_RES_STATUS (res) = NIS_NOMEMORY; + return res; + } + req.ns_object.ns_object_len = 1; - 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; + status = __do_niscall (name, NIS_MODIFY, (xdrproc_t) _xdr_ns_request, + (caddr_t) & req, (xdrproc_t) _xdr_nis_result, + (caddr_t) res, MASTER_ONLY, + NULL); + if (status != RPC_SUCCESS) + NIS_RES_STATUS (res) = status; nis_destroy_object (req.ns_object.ns_object_val); |