From: Danilo Almeida <dalmeida@mit.edu>
Date: Thu, 11 Apr 2002 03:32:03 +0000 (+0000)
Subject: * ftp.c: Include Winsock 2 instead of Winsock.
X-Git-Tag: krb5-1.3-alpha1~776
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=51c28d0b4b467eb09c845e1f0863af36351a9a27;p=krb5.git

* ftp.c: Include Winsock 2 instead of Winsock.
* ftp_var.h: Include Winsock 2 headers.
* secure.c: Include port-sockets.h on Win32.
* main.c: Include mswsock.h (MS Winsock extensions) so that we get
   some socket options we need to convert sockets to "file
   descriptors" used in posix-like routines.  We now need to pull
   this in explictly now that we are using Winsock 2.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14381 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 0cf21a989..85e69cb38 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,13 @@
+2002-04-10  Danilo Almeida  <dalmeida@mit.edu>
+
+	* ftp.c: Include Winsock 2 instead of Winsock.
+	* ftp_var.h: Include Winsock 2 headers.
+	* secure.c: Include port-sockets.h on Win32.
+	* main.c: Include mswsock.h (MS Winsock extensions) so that we get
+	some socket options we need to convert sockets to "file
+	descriptors" used in posix-like routines.  We now need to pull
+	this in explictly now that we are using Winsock 2.
+
 2002-04-04  Sam Hartman  <hartmans@mit.edu>
 
 	* radix.c (decode;):  Patch from Mark Eichin for one char buffer overflow [635]
diff --git a/src/appl/gssftp/ftp/ftp.c b/src/appl/gssftp/ftp/ftp.c
index 8433d7cdc..d7f484080 100644
--- a/src/appl/gssftp/ftp/ftp.c
+++ b/src/appl/gssftp/ftp/ftp.c
@@ -63,7 +63,7 @@ static char sccsid[] = "@(#)ftp.c	5.38 (Berkeley) 4/22/91";
 
 #ifdef _WIN32
 #include <windows.h>
-#include <winsock.h>
+#include <winsock2.h>
 #include <sys/timeb.h>
 #include <time.h>
 #include <crtdbg.h>
diff --git a/src/appl/gssftp/ftp/ftp_var.h b/src/appl/gssftp/ftp/ftp_var.h
index 469e50686..79928b3f3 100644
--- a/src/appl/gssftp/ftp/ftp_var.h
+++ b/src/appl/gssftp/ftp/ftp_var.h
@@ -35,6 +35,8 @@
 
 #ifdef _WIN32
 #include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
 #endif
 
 #ifdef _WIN32
diff --git a/src/appl/gssftp/ftp/main.c b/src/appl/gssftp/ftp/main.c
index 1b0ae8511..60171da55 100644
--- a/src/appl/gssftp/ftp/main.c
+++ b/src/appl/gssftp/ftp/main.c
@@ -78,6 +78,11 @@ static char sccsid[] = "@(#)main.c	5.18 (Berkeley) 3/1/91";
 
 #include <port-sockets.h>
 
+#ifdef _WIN32
+/* For SO_SYNCHRONOUS_NONALERT and SO_OPENTYPE: */
+#include <mswsock.h>
+#endif
+
 #ifndef _WIN32
 uid_t	getuid();
 #endif
diff --git a/src/appl/gssftp/ftp/secure.c b/src/appl/gssftp/ftp/secure.c
index d23e35872..999641b77 100644
--- a/src/appl/gssftp/ftp/secure.c
+++ b/src/appl/gssftp/ftp/secure.c
@@ -35,7 +35,9 @@ extern Key_schedule schedule;
 #include <unistd.h>
 #endif
 #include <sys/types.h>
-#ifndef _WIN32
+#ifdef _WIN32
+#include <port-sockets.h>
+#else
 #include <netinet/in.h>
 #endif
 #include <errno.h>