diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/Symbols.list | 1 | ||||
| -rw-r--r-- | lib/libc/rpc/Makefile.inc | 4 | ||||
| -rw-r--r-- | lib/libc/rpc/rpc_dtablesize.c | 50 |
3 files changed, 2 insertions, 53 deletions
diff --git a/lib/libc/Symbols.list b/lib/libc/Symbols.list index b408a1b9bdf..5f3c4b6ac6d 100644 --- a/lib/libc/Symbols.list +++ b/lib/libc/Symbols.list @@ -1192,7 +1192,6 @@ __xdrrec_setnonblock __xprt_register _authenticate _null_auth -_rpc_dtablesize _seterr_reply _svcauth_null _svcauth_short diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc index 8cccdc4f364..eec9de6f3fe 100644 --- a/lib/libc/rpc/Makefile.inc +++ b/lib/libc/rpc/Makefile.inc @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile.inc,v 1.16 2012/03/04 17:42:32 schwarze Exp $ +# $OpenBSD: Makefile.inc,v 1.17 2015/09/11 12:39:46 deraadt Exp $ # librpc sources .PATH: ${LIBCSRCDIR}/arch/${MACHINE}/rpc ${LIBCSRCDIR}/rpc SRCS+= auth_none.c auth_unix.c authunix_prot.c bindresvport.c \ clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c clnt_tcp.c \ - clnt_udp.c rpc_dtablesize.c get_myaddress.c getrpcent.c getrpcport.c \ + clnt_udp.c get_myaddress.c getrpcent.c getrpcport.c \ pmap_clnt.c pmap_getmaps.c pmap_getport.c pmap_prot.c \ pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c rpc_callmsg.c \ svc.c svc_auth.c svc_auth_unix.c svc_raw.c svc_run.c svc_simple.c \ diff --git a/lib/libc/rpc/rpc_dtablesize.c b/lib/libc/rpc/rpc_dtablesize.c deleted file mode 100644 index ff8d7a814ab..00000000000 --- a/lib/libc/rpc/rpc_dtablesize.c +++ /dev/null @@ -1,50 +0,0 @@ -/* $OpenBSD: rpc_dtablesize.c,v 1.9 2013/11/13 15:40:08 deraadt Exp $ */ - -/* - * Copyright (c) 2010, Oracle America, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials - * provided with the distribution. - * * Neither the name of the "Oracle America, Inc." nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include <unistd.h> -#include <sys/types.h> -#include <rpc/rpc.h> - -/* - * Cache the result of getdtablesize(), so we don't have to do an - * expensive system call every time. - */ -int -_rpc_dtablesize(void) -{ - static int size; - - if (size == 0) - size = getdtablesize(); - return (size); -} |