4 files changed, 9 insertions, 134 deletions
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 4d31ad1411c..ecfeba72cff 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.90 2010/05/18 22:24:55 tedu Exp $
+#	$OpenBSD: Makefile.inc,v 1.91 2010/07/01 19:15:30 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.35 1995/10/16 23:49:07 jtc Exp $
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/17/93
 
@@ -43,7 +43,7 @@ ASM=	accept.o access.o acct.o adjfreq.o adjtime.o bind.o chdir.o chflags.o \
 	fchflags.o fchmod.o fchown.o fcntl.o fhopen.o fhstat.o fhstatfs.o \
 	flock.o fpathconf.o fstat.o \
 	fstatfs.o fsync.o futimes.o getdirentries.o getegid.o geteuid.o \
-	getfh.o getfsstat.o getgid.o getgroups.o getitimer.o getpeereid.o \
+	getfh.o getfsstat.o getgid.o getgroups.o getitimer.o \
 	getpeername.o \
 	getpgid.o \
 	getpgrp.o getpid.o getppid.o getpriority.o getresgid.o getresuid.o \
@@ -219,7 +219,7 @@ MAN+=	accept.2 access.2 acct.2 adjfreq.2 adjtime.2 bind.2 brk.2 chdir.2 \
 	dup.2 execve.2 _exit.2 fcntl.2 fhopen.2 \
 	flock.2 fork.2 fsync.2 getdirentries.2 \
 	getfh.2 getfsstat.2 getgid.2 getgroups.2 getitimer.2 getlogin.2 \
-	getpeername.2 getpeereid.2 getpgrp.2 getrdomain.2 \
+	getpeername.2 getpgrp.2 getrdomain.2 \
 	getpid.2 getpriority.2 getrlimit.2 getrusage.2 getsid.2 getsockname.2 \
 	getsockopt.2 gettimeofday.2 getuid.2 intro.2 issetugid.2 ioctl.2 \
 	kill.2 kqueue.2 ktrace.2 link.2 \
diff --git a/lib/libc/sys/getpeereid.2 b/lib/libc/sys/getpeereid.2
deleted file mode 100644
index 6db0ff8eafa..00000000000
--- a/lib/libc/sys/getpeereid.2
+++ /dev/null
@@ -1,125 +0,0 @@
-.\"	$OpenBSD: getpeereid.2,v 1.9 2009/12/29 10:25:43 sobrado Exp $
-.\"
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. 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.
-.\" 3. Neither the name of the University 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 REGENTS 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 REGENTS 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.
-.Dd $Mdocdate: December 29 2009 $
-.Dt GETPEEREID 2
-.Os
-.Sh NAME
-.Nm getpeereid
-.Nd get effective user and group identification of locally-connected peer
-.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Ft int
-.Fn getpeereid "int s" "uid_t *euid" "gid_t *egid"
-.Sh DESCRIPTION
-.Fn getpeereid
-returns the effective user ID and group ID of the peer connected to
-a
-.Ux Ns -domain
-socket (see
-.Xr unix 4 ) .
-The argument
-.Fa s
-must be of type
-.Dv SOCK_STREAM .
-.Pp
-One common use is for
-.Ux Ns -domain
-servers to determine the credentials of clients that have connected to it.
-.Pp
-.Fn getpeereid
-takes three parameters:
-.Bl -bullet
-.It
-.Fa s
-contains the file descriptor of the socket whose peer credentials
-should be looked up.
-.It
-.Fa euid
-points to a
-.Li uid_t
-variable into which the effective user ID for the connected peer will
-be stored.
-.It
-.Fa egid
-points to a
-.Li gid_t
-variable into which the effective group ID for the connected peer will
-be stored.
-.El
-.Sh RETURN VALUES
-If the call succeeds, a 0 is returned and
-.Fa euid
-and
-.Fa egid
-are set to the effective user ID and group ID of the connected peer.
-Otherwise,
-.Va errno
-is set and a value of \-1 is returned.
-.Sh ERRORS
-On failure,
-.Va errno
-is set to one of the following:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is a file, not a socket.
-.It Bq Er EOPNOTSUPP
-The socket is not in the
-.Ux Ns -domain .
-.It Bq Er ENOTCONN
-The socket is not connected.
-.It Bq Er ENOBUFS
-Insufficient resources were available in the system
-to perform the operation.
-.It Bq Er EFAULT
-The
-.Fa euid
-or
-.Fa egid
-parameters point to memory not in a valid part of the
-process address space.
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr bind 2 ,
-.Xr getpeername 2 ,
-.Xr getsockname 2 ,
-.Xr socket 2 ,
-.Xr unix 4
-.Sh HISTORY
-The
-.Fn getpeereid
-function call appeared in
-.Ox 3.0 .
diff --git a/lib/libc/sys/getpeername.2 b/lib/libc/sys/getpeername.2
index f2a929685bd..95d089b6223 100644
--- a/lib/libc/sys/getpeername.2
+++ b/lib/libc/sys/getpeername.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getpeername.2,v 1.22 2007/05/31 19:19:32 jmc Exp $
+.\"	$OpenBSD: getpeername.2,v 1.23 2010/07/01 19:15:30 deraadt Exp $
 .\"	$NetBSD: getpeername.2,v 1.6 1995/10/12 15:40:56 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)getpeername.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: July 1 2010 $
 .Dt GETPEERNAME 2
 .Os
 .Sh NAME
@@ -129,7 +129,7 @@ process address space.
 .Sh SEE ALSO
 .Xr accept 2 ,
 .Xr bind 2 ,
-.Xr getpeereid 2 ,
+.Xr getpeereid 3 ,
 .Xr getsockname 2 ,
 .Xr socket 2
 .Sh HISTORY
diff --git a/lib/libc/sys/getsockname.2 b/lib/libc/sys/getsockname.2
index 6d6bfcd02cb..25b5f5ee45a 100644
--- a/lib/libc/sys/getsockname.2
+++ b/lib/libc/sys/getsockname.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getsockname.2,v 1.25 2009/12/29 10:25:43 sobrado Exp $
+.\"	$OpenBSD: getsockname.2,v 1.26 2010/07/01 19:15:30 deraadt Exp $
 .\"	$NetBSD: getsockname.2,v 1.6 1995/10/12 15:41:00 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)getsockname.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: December 29 2009 $
+.Dd $Mdocdate: July 1 2010 $
 .Dt GETSOCKNAME 2
 .Os
 .Sh NAME
@@ -148,7 +148,7 @@ process address space.
 .Sh SEE ALSO
 .Xr accept 2 ,
 .Xr bind 2 ,
-.Xr getpeereid 2 ,
+.Xr getpeereid 3 ,
 .Xr getpeername 2 ,
 .Xr socket 2
 .Sh HISTORY