From ce37fa887b0ea89614d9538e90ade7356b80f48c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 13 Jun 1997 22:46:42 +0000 Subject: Update. 1997-06-14 00:39 Ulrich Drepper * libc.map: Add more libio functions which are used in libio.h. * login/Makefile (libutil-routines): Move updwtmp to ... (routines): ...here. Suggested by Mark Kettenis . * sysdeps/stub/s_erfl.c: Add stub definition of erfcl. Reported by Andreas Jaeger . 1997-06-13 21:10 Thorsten Kukuk * nis/nis_add.c (nis_add): Create object name only if not set. * nis/nis_clone.c: Use calloc instead of malloc to prevent RPC encode errors. * nis/nis_modify.c (nis_modify): Create default object entrys if given are NULL. * nis/nis/nis_table.c (nis_add_entry, nis_modify_entry): Likewise. 1997-06-13 14:17 Andreas Jaeger * sysdeps/i386/addmul_1.S: Replace size with sizeP, otherwise the define might also replace the expanded macro ASM_SIZE_DIRECTIVE. * sysdeps/i386/submul_1.S: Likewise. 1997-06-13 12:19 Ulrich Drepper * elf/rtld.c: Print version information if LD_TRACE_LOADED_OBJECT and LD_VERBOSE are given. * elf/ldd.sh.in: Add -v|--verbose option. Add author information as per Coding Standard. * elf/ldd.bash.in: Likewise. 1997-06-12 21:22 Ulrich Drepper --- nis/nis_table.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) (limited to 'nis/nis_table.c') diff --git a/nis/nis_table.c b/nis/nis_table.c index e9e35abf3b..4cfd734173 100644 --- a/nis/nis_table.c +++ b/nis/nis_table.c @@ -261,8 +261,11 @@ nis_add_entry (const_nis_name name, const nis_object *obj, u_long flags) { nis_result *res; - struct ib_request ibreq; nis_error status; + struct ib_request ibreq; + char *p1, *p2, *p3, *p4; + char buf1 [strlen (name) + 20]; + char buf4 [strlen (name) + 20]; res = calloc (1, sizeof (nis_result)); @@ -276,6 +279,23 @@ nis_add_entry (const_nis_name name, const nis_object *obj, ibreq.ibr_obj.ibr_obj_val = nis_clone_object (obj, NULL); ibreq.ibr_obj.ibr_obj_len = 1; + p1 = ibreq.ibr_obj.ibr_obj_val[0].zo_name; + if (p1 == NULL || strlen (p1) == 0) + ibreq.ibr_obj.ibr_obj_val[0].zo_name = + nis_leaf_of_r (name, buf1, sizeof (buf1)); + + p2 = ibreq.ibr_obj.ibr_obj_val[0].zo_owner; + if (p2 == NULL || strlen (p2) == 0) + ibreq.ibr_obj.ibr_obj_val[0].zo_owner = nis_local_principal (); + + p3 = ibreq.ibr_obj.ibr_obj_val[0].zo_group; + if (p3 == NULL || strlen (p3) == 0) + ibreq.ibr_obj.ibr_obj_val[0].zo_group = nis_local_group (); + + p4 = ibreq.ibr_obj.ibr_obj_val[0].zo_domain; + ibreq.ibr_obj.ibr_obj_val[0].zo_domain = + nis_domain_of_r (name, buf4, sizeof (buf4)); + if ((status = __do_niscall (ibreq.ibr_name, NIS_IBADD, (xdrproc_t) xdr_ib_request, (caddr_t) &ibreq, @@ -283,6 +303,11 @@ nis_add_entry (const_nis_name name, const nis_object *obj, (caddr_t) res, 0)) != RPC_SUCCESS) res->status = status; + ibreq.ibr_obj.ibr_obj_val[0].zo_name = p1; + ibreq.ibr_obj.ibr_obj_val[0].zo_owner = p2; + ibreq.ibr_obj.ibr_obj_val[0].zo_group = p3; + ibreq.ibr_obj.ibr_obj_val[0].zo_domain = p4; + nis_free_request (&ibreq); return res; @@ -293,8 +318,11 @@ nis_modify_entry (const_nis_name name, const nis_object *obj, u_long flags) { nis_result *res; - struct ib_request ibreq; nis_error status; + struct ib_request ibreq; + char *p1, *p2, *p3, *p4; + char buf1 [strlen (name) + 20]; + char buf4 [strlen (name) + 20]; res = calloc (1, sizeof (nis_result)); @@ -308,12 +336,34 @@ nis_modify_entry (const_nis_name name, const nis_object *obj, ibreq.ibr_obj.ibr_obj_val = nis_clone_object (obj, NULL); ibreq.ibr_obj.ibr_obj_len = 1; + p1 = ibreq.ibr_obj.ibr_obj_val[0].zo_name; + if (p1 == NULL || strlen (p1) == 0) + ibreq.ibr_obj.ibr_obj_val[0].zo_name = + nis_leaf_of_r (name, buf1, sizeof (buf1)); + + p2 = ibreq.ibr_obj.ibr_obj_val[0].zo_owner; + if (p2 == NULL || strlen (p2) == 0) + ibreq.ibr_obj.ibr_obj_val[0].zo_owner = nis_local_principal (); + + p3 = ibreq.ibr_obj.ibr_obj_val[0].zo_group; + if (p3 == NULL || strlen (p3) == 0) + ibreq.ibr_obj.ibr_obj_val[0].zo_group = nis_local_group (); + + p4 = ibreq.ibr_obj.ibr_obj_val[0].zo_domain; + ibreq.ibr_obj.ibr_obj_val[0].zo_domain = + nis_domain_of_r (name, buf4, sizeof (buf4)); + if ((status = __do_niscall (ibreq.ibr_name, NIS_IBMODIFY, (xdrproc_t) xdr_ib_request, (caddr_t) & ibreq, (xdrproc_t) xdr_nis_result, (caddr_t) res, 0)) != RPC_SUCCESS) res->status = status; + ibreq.ibr_obj.ibr_obj_val[0].zo_name = p1; + ibreq.ibr_obj.ibr_obj_val[0].zo_owner = p2; + ibreq.ibr_obj.ibr_obj_val[0].zo_group = p3; + ibreq.ibr_obj.ibr_obj_val[0].zo_domain = p4; + nis_free_request (&ibreq); return res; -- cgit v1.2.3