From f9a421a6b2e3ba46cc615e128091e5eacabb1dac Mon Sep 17 00:00:00 2001 From: joseph Date: Sat, 5 Mar 2011 19:39:34 +0000 Subject: Merge changes between r12752 and r13053 from /fsf/trunk. Regenerate configure scripts as part of merge. git-svn-id: svn://svn.eglibc.org/trunk@13054 7b3dc134-2b1b-0410-93df-9e9f96275f8d --- libc/nis/nis_add.c | 4 ++-- libc/nis/nis_modify.c | 4 ++-- libc/nis/nis_remove.c | 4 ++-- libc/nis/nis_server.c | 6 +++--- libc/nis/nis_table.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'libc/nis') diff --git a/libc/nis/nis_add.c b/libc/nis/nis_add.c index f5e783cc2..a06999b4e 100644 --- a/libc/nis/nis_add.c +++ b/libc/nis/nis_add.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1997,1998,2004,2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -65,7 +65,7 @@ nis_add (const_nis_name name, const nis_object *obj2) NIS_ADD, (xdrproc_t) _xdr_ns_request, (caddr_t) &req, (xdrproc_t) _xdr_nis_result, (caddr_t) res, MASTER_ONLY, NULL); - if (status != RPC_SUCCESS) + if (status != NIS_SUCCESS) NIS_RES_STATUS (res) = status; nis_destroy_object (req.ns_object.ns_object_val); diff --git a/libc/nis/nis_modify.c b/libc/nis/nis_modify.c index 0ec0ec6f4..68609fafe 100644 --- a/libc/nis/nis_modify.c +++ b/libc/nis/nis_modify.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1997,1998,2004,2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -65,7 +65,7 @@ nis_modify (const_nis_name name, const nis_object *obj2) (caddr_t) & req, (xdrproc_t) _xdr_nis_result, (caddr_t) res, MASTER_ONLY, NULL); - if (status != RPC_SUCCESS) + if (status != NIS_SUCCESS) NIS_RES_STATUS (res) = status; nis_destroy_object (req.ns_object.ns_object_val); diff --git a/libc/nis/nis_remove.c b/libc/nis/nis_remove.c index 3aefccea4..4c9179907 100644 --- a/libc/nis/nis_remove.c +++ b/libc/nis/nis_remove.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1997,1998,2004,2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -49,7 +49,7 @@ nis_remove (const_nis_name name, const nis_object *obj) if ((status = __do_niscall (name, NIS_REMOVE, (xdrproc_t) _xdr_ns_request, (caddr_t) &req, (xdrproc_t) _xdr_nis_result, (caddr_t) res, MASTER_ONLY, - NULL)) != RPC_SUCCESS) + NULL)) != NIS_SUCCESS) NIS_RES_STATUS (res) = status; nis_destroy_object (req.ns_object.ns_object_val); diff --git a/libc/nis/nis_server.c b/libc/nis/nis_server.c index c11f4b032..718d7de23 100644 --- a/libc/nis/nis_server.c +++ b/libc/nis/nis_server.c @@ -1,4 +1,4 @@ -/* Copyright (c) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (c) 1997,1998,2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -41,7 +41,7 @@ nis_servstate (const nis_server *serv, const nis_tag *tags, if (__do_niscall2 (serv, 1, NIS_SERVSTATE, (xdrproc_t) _xdr_nis_taglist, (caddr_t) &taglist, (xdrproc_t) _xdr_nis_taglist, - (caddr_t) &tagres, 0, NULL) != RPC_SUCCESS) + (caddr_t) &tagres, 0, NULL) != NIS_SUCCESS) return NIS_RPCERROR; *result = tagres.tags.tags_val; @@ -67,7 +67,7 @@ nis_stats (const nis_server *serv, const nis_tag *tags, if (__do_niscall2 (serv, 1, NIS_STATUS, (xdrproc_t) _xdr_nis_taglist, (caddr_t) &taglist, (xdrproc_t) _xdr_nis_taglist, - (caddr_t) &tagres, 0, NULL) != RPC_SUCCESS) + (caddr_t) &tagres, 0, NULL) != NIS_SUCCESS) return NIS_RPCERROR; *result = tagres.tags.tags_val; diff --git a/libc/nis/nis_table.c b/libc/nis/nis_table.c index 3704b0094..aba289732 100644 --- a/libc/nis/nis_table.c +++ b/libc/nis/nis_table.c @@ -1,5 +1,5 @@ -/* Copyright (c) 1997-1999, 2003, 2004, 2005, 2006, 2007 - Free Software Foundation, Inc. +/* Copyright (c) 1997-1999, 2003, 2004, 2005, 2006, 2007, 2011 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. -- cgit v1.2.3