4 files changed, 6 insertions, 64 deletions
diff --git a/sys/kern/syscalls.conf b/sys/kern/syscalls.conf
index 367d6ed83f8..a38379c6265 100644
--- a/sys/kern/syscalls.conf
+++ b/sys/kern/syscalls.conf
@@ -1,11 +1,11 @@
-#	$OpenBSD: syscalls.conf,v 1.9 2010/09/20 07:20:16 deraadt Exp $
+#	$OpenBSD: syscalls.conf,v 1.10 2011/04/04 12:44:10 deraadt Exp $
 #	$NetBSD: syscalls.conf,v 1.2 1994/10/26 06:45:57 cgd Exp $
 
 sysnames="syscalls.c"
 sysnumhdr="../sys/syscall.h"
 syssw="init_sysent.c"
 sysarghdr="../sys/syscallargs.h"
-compatopts="compat_43 compat_09 compat_10 compat_25 compat_35 compat_o47"
+compatopts="compat_43 compat_09 compat_10 compat_25 compat_35"
 libcompatopts=""
 
 switchname="sysent"
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index be442ccd32c..c556a40bebc 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-;	$OpenBSD: syscalls.master,v 1.104 2010/10/28 15:02:41 millert Exp $
+;	$OpenBSD: syscalls.master,v 1.105 2011/04/04 12:44:10 deraadt Exp $
 ;	$NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -531,7 +531,7 @@
 			    const struct timespec *timeout); }
 271	STD		{ int sys_mlockall(int flags); }
 272	STD		{ int sys_munlockall(void); }
-273	COMPAT_O47	{ int sys_getpeereid(int fdes, uid_t *euid, gid_t *egid); }
+273	UNIMPL		sys_getpeereid
 274	UNIMPL		sys_extattrctl
 275	UNIMPL		sys_extattr_set_file
 276	UNIMPL		sys_extattr_get_file
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 08ee5f67778..57970027dc8 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_syscalls.c,v 1.78 2010/09/22 04:57:55 matthew Exp $	*/
+/*	$OpenBSD: uipc_syscalls.c,v 1.79 2011/04/04 12:44:10 deraadt Exp $	*/
 /*	$NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $	*/
 
 /*
@@ -993,53 +993,6 @@ bad:
 	return (error);
 }
 
-#ifdef COMPAT_O47
-/*
- * Get eid of peer for connected socket.
- */
-/* ARGSUSED */
-int
-compat_o47_sys_getpeereid(struct proc *p, void *v, register_t *retval)
-{
-	struct compat_o47_sys_getpeereid_args /* {
-		syscallarg(int) fdes;
-		syscallarg(uid_t *) euid;
-		syscallarg(gid_t *) egid;
-	} */ *uap = v;
-	struct file *fp;
-	struct socket *so;
-	struct mbuf *m = NULL;
-	struct sockpeercred *id;
-	int error;
-
-	if ((error = getsock(p->p_fd, SCARG(uap, fdes), &fp)) != 0)
-		return (error);
-	so = fp->f_data;
-	if (so->so_proto != pffindtype(AF_LOCAL, SOCK_STREAM)) {
-		FRELE(fp);
-		return (EOPNOTSUPP);
-	}
-	m = m_getclr(M_WAIT, MT_SONAME);
-	if (m == NULL) {
-		error = ENOBUFS;
-		goto bad;
-	}	
-	error = (*so->so_proto->pr_usrreq)(so, PRU_PEEREID, 0, m, 0, p);
-	if (!error && m->m_len != sizeof(struct sockpeercred))
-		error = EOPNOTSUPP;
-	if (error)
-		goto bad;
-	id = mtod(m, struct sockpeercred *);
-	error = copyout(&(id->uid), SCARG(uap, euid), sizeof(uid_t));
-	if (error == 0)
-		error = copyout(&(id->gid), SCARG(uap, egid), sizeof(gid_t));
-bad:
-	FRELE(fp);
-	m_freem(m);
-	return (error);
-}
-#endif /* COMPAT_O47 */
-
 int
 sockargs(struct mbuf **mp, const void *buf, size_t buflen, int type)
 {
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 328d799acd2..4d47ed60567 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_usrreq.c,v 1.49 2010/10/18 04:31:01 guenther Exp $	*/
+/*	$OpenBSD: uipc_usrreq.c,v 1.50 2011/04/04 12:44:10 deraadt Exp $	*/
 /*	$NetBSD: uipc_usrreq.c,v 1.18 1996/02/09 19:00:50 christos Exp $	*/
 
 /*
@@ -288,17 +288,6 @@ uipc_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
 			nam->m_len = 0;
 		break;
 
-#ifdef COMPAT_O47
-	case PRU_PEEREID:
-		if (unp->unp_flags & UNP_FEIDS) {
-			nam->m_len = sizeof(struct sockpeercred);
-			bcopy((caddr_t)(&(unp->unp_connid)),
-			    mtod(nam, caddr_t), (unsigned)nam->m_len);
-		} else
-			nam->m_len = 0;
-		break;
-#endif /* COMPAT_O47 */
-
 	case PRU_SLOWTIMO:
 		break;