diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2010-10-18 04:31:02 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2010-10-18 04:31:02 +0000 |
| commit | 8e2430c4a8c93d53ed1839b02674cb52c25f8463 (patch) | |
| tree | f6338656b6e3507685da397dd764dd59e4868baf /sys | |
| parent | bf274282f62a58c1648537b0cc224512e329ffcf (diff) | |
PRU_PEEREID is only used by code under COMPAT_O47, so put it there too
so that we remember to remove it all at the same time in two years.
ok deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/uipc_usrreq.c | 4 | ||||
| -rw-r--r-- | sys/sys/protosw.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 3bc4e57841f..328d799acd2 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_usrreq.c,v 1.48 2010/07/02 00:11:39 deraadt Exp $ */ +/* $OpenBSD: uipc_usrreq.c,v 1.49 2010/10/18 04:31:01 guenther Exp $ */ /* $NetBSD: uipc_usrreq.c,v 1.18 1996/02/09 19:00:50 christos Exp $ */ /* @@ -288,6 +288,7 @@ 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); @@ -296,6 +297,7 @@ uipc_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, } else nam->m_len = 0; break; +#endif /* COMPAT_O47 */ case PRU_SLOWTIMO: break; diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h index 2209a676e47..40a362e79d9 100644 --- a/sys/sys/protosw.h +++ b/sys/sys/protosw.h @@ -1,4 +1,4 @@ -/* $OpenBSD: protosw.h,v 1.13 2009/11/13 20:54:05 claudio Exp $ */ +/* $OpenBSD: protosw.h,v 1.14 2010/10/18 04:31:01 guenther Exp $ */ /* $NetBSD: protosw.h,v 1.10 1996/04/09 20:55:32 cgd Exp $ */ /*- @@ -142,7 +142,9 @@ struct protosw { #define PRU_SLOWTIMO 19 /* 500ms timeout */ #define PRU_PROTORCV 20 /* receive from below */ #define PRU_PROTOSEND 21 /* send to below */ +#ifdef COMPAT_O47 #define PRU_PEEREID 22 /* get local peer eid */ +#endif /* COMPAT_O47 */ #define PRU_NREQ 22 |