summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--openbsd-compat/bindresvport.c6
2 files changed, 4 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index a6128fed8..0b0fc76ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,7 @@
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 - (dtucker) [openbsd-compat/rresvport.c] Update from OpenBSD 1.6 -> 1.8.
43 - (dtucker) [openbsd-compat/bindresvport.c] Add "OPENBSD ORIGINAL" marker. 43 - (dtucker) [openbsd-compat/bindresvport.c] Add "OPENBSD ORIGINAL" marker.
44 - (dtucker) [openbsd-compat/bindresvport.c] Update from OpenBSD 1.16 -> 1.17.
44 45
4520051105 4620051105
46 - (djm) OpenBSD CVS Sync 47 - (djm) OpenBSD CVS Sync
@@ -3283,4 +3284,4 @@
3283 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3284 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3284 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3285 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3285 3286
3286$Id: ChangeLog,v 1.3983 2005/11/10 06:52:08 dtucker Exp $ 3287$Id: ChangeLog,v 1.3984 2005/11/10 06:54:46 dtucker Exp $
diff --git a/openbsd-compat/bindresvport.c b/openbsd-compat/bindresvport.c
index 1a9000584..7f48fd03a 100644
--- a/openbsd-compat/bindresvport.c
+++ b/openbsd-compat/bindresvport.c
@@ -1,6 +1,6 @@
1/* This file has be substantially modified from the original OpenBSD source */ 1/* This file has be substantially modified from the original OpenBSD source */
2 2
3/* $OpenBSD: bindresvport.c,v 1.15 2003/05/20 22:42:35 deraadt Exp $ */ 3/* $OpenBSD: bindresvport.c,v 1.16 2005/04/01 07:44:03 otto Exp $ */
4 4
5/* 5/*
6 * Copyright 1996, Jason Downs. All rights reserved. 6 * Copyright 1996, Jason Downs. All rights reserved.
@@ -44,9 +44,7 @@
44 * Bind a socket to a privileged IP port 44 * Bind a socket to a privileged IP port
45 */ 45 */
46int 46int
47bindresvport_sa(sd, sa) 47bindresvport_sa(int sd, struct sockaddr *sa)
48 int sd;
49 struct sockaddr *sa;
50{ 48{
51 int error, af; 49 int error, af;
52 struct sockaddr_storage myaddr; 50 struct sockaddr_storage myaddr;