diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-11-10 17:42:40 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-11-10 17:42:40 +1100 |
commit | 91b34dc18373cd403a8e25ca5ca69cddb2486edc (patch) | |
tree | 2fc2b335b23530b0c01d671c135c8cf71f01379c | |
parent | ffcd0ecf6be104caec2dbaf27460a11eb425cf52 (diff) |
- (dtucker) [openbsd-compat/rresvport.c] Update from OpenBSD 1.6 -> 1.8.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | openbsd-compat/rresvport.c | 11 |
2 files changed, 4 insertions, 10 deletions
@@ -39,6 +39,7 @@ | |||
39 | - (dtucker) [openbsd-compat/strsep.c] Update from OpenBSD 1.5 -> 1.6. | 39 | - (dtucker) [openbsd-compat/strsep.c] Update from OpenBSD 1.5 -> 1.6. |
40 | - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.10 -> 1.13. | 40 | - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.10 -> 1.13. |
41 | - (dtucker) [openbsd-compat/mktemp.c] Update from OpenBSD 1.17 -> 1.19. | 41 | - (dtucker) [openbsd-compat/mktemp.c] Update from OpenBSD 1.17 -> 1.19. |
42 | - (dtucker) [openbsd-compat/rresvport.c] Update from OpenBSD 1.6 -> 1.8. | ||
42 | 43 | ||
43 | 20051105 | 44 | 20051105 |
44 | - (djm) OpenBSD CVS Sync | 45 | - (djm) OpenBSD CVS Sync |
@@ -3281,4 +3282,4 @@ | |||
3281 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3282 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3282 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3283 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3283 | 3284 | ||
3284 | $Id: ChangeLog,v 1.3981 2005/11/10 06:37:02 dtucker Exp $ | 3285 | $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 @@ | |||
34 | 34 | ||
35 | #ifndef HAVE_RRESVPORT_AF | 35 | #ifndef HAVE_RRESVPORT_AF |
36 | 36 | ||
37 | #if defined(LIBC_SCCS) && !defined(lint) | ||
38 | static char *rcsid = "$OpenBSD: rresvport.c,v 1.6 2003/06/03 02:11:35 deraadt Exp $"; | ||
39 | #endif /* LIBC_SCCS and not lint */ | ||
40 | |||
41 | #include "includes.h" | ||
42 | |||
43 | #if 0 | 37 | #if 0 |
44 | int | 38 | int |
45 | rresvport(alport) | 39 | rresvport(int *alport) |
46 | int *alport; | ||
47 | { | 40 | { |
48 | return rresvport_af(alport, AF_INET); | 41 | return rresvport_af(alport, AF_INET); |
49 | } | 42 | } |
50 | #endif | 43 | #endif |
51 | 44 | ||
52 | int | 45 | int |
53 | rresvport_af(int *alport, sa_family_t af) | 46 | rresvport_af(int *alport, sa_family_t af) |
54 | { | 47 | { |
55 | struct sockaddr_storage ss; | 48 | struct sockaddr_storage ss; |