Import of OpenSSH 4.9p1

[gssapi-openssh.git] / openssh / openbsd-compat / bindresvport.c

diff --git a/openssh/openbsd-compat/bindresvport.c b/openssh/openbsd-compat/bindresvport.c
index 8a273f9b5e81dd2ee8ce7962e07c1725fa046082..08a53b8cd4863898f1f1338fc9705716be70e676 100644 (file)
--- a/openssh/openbsd-compat/bindresvport.c
+++ b/openssh/openbsd-compat/bindresvport.c
@@ -1,6 +1,6 @@
 /* This file has be substantially modified from the original OpenBSD source */
 
-/*     $OpenBSD: bindresvport.c,v 1.15 2003/05/20 22:42:35 deraadt Exp $       */
+/*     $OpenBSD: bindresvport.c,v 1.17 2005/12/21 01:40:22 millert Exp $       */
 
 /*
  * Copyright 1996, Jason Downs.  All rights reserved.
@@ -28,11 +28,19 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* OPENBSD ORIGINAL: lib/libc/rpc/bindresvport.c */
+
 #include "includes.h"
 
 #ifndef HAVE_BINDRESVPORT_SA
+#include <sys/types.h>
+#include <sys/socket.h>
 
-#include "includes.h"
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <errno.h>
+#include <string.h>
 
 #define STARTPORT 600
 #define ENDPORT (IPPORT_RESERVED - 1)
@@ -42,9 +50,7 @@
  * Bind a socket to a privileged IP port
  */
 int
-bindresvport_sa(sd, sa)
-       int sd;
-       struct sockaddr *sa;
+bindresvport_sa(int sd, struct sockaddr *sa)
 {
        int error, af;
        struct sockaddr_storage myaddr;