From 91b34dc18373cd403a8e25ca5ca69cddb2486edc Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 10 Nov 2005 17:42:40 +1100 Subject: - (dtucker) [openbsd-compat/rresvport.c] Update from OpenBSD 1.6 -> 1.8. --- ChangeLog | 3 ++- openbsd-compat/rresvport.c | 11 ++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35a5cdc92..d1b4e51b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ - (dtucker) [openbsd-compat/strsep.c] Update from OpenBSD 1.5 -> 1.6. - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.10 -> 1.13. - (dtucker) [openbsd-compat/mktemp.c] Update from OpenBSD 1.17 -> 1.19. + - (dtucker) [openbsd-compat/rresvport.c] Update from OpenBSD 1.6 -> 1.8. 20051105 - (djm) OpenBSD CVS Sync @@ -3281,4 +3282,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3981 2005/11/10 06:37:02 dtucker Exp $ +$Id: ChangeLog,v 1.3982 2005/11/10 06:42:40 dtucker Exp $ diff --git a/openbsd-compat/rresvport.c b/openbsd-compat/rresvport.c index aa72f4ba2..d13047b38 100644 --- a/openbsd-compat/rresvport.c +++ b/openbsd-compat/rresvport.c @@ -34,22 +34,15 @@ #ifndef HAVE_RRESVPORT_AF -#if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: rresvport.c,v 1.6 2003/06/03 02:11:35 deraadt Exp $"; -#endif /* LIBC_SCCS and not lint */ - -#include "includes.h" - #if 0 int -rresvport(alport) - int *alport; +rresvport(int *alport) { return rresvport_af(alport, AF_INET); } #endif -int +int rresvport_af(int *alport, sa_family_t af) { struct sockaddr_storage ss; -- cgit v1.2.3