Take out calls to SOCKET_INITIALIZE and SOCKET_CLEANUP. This gets

done in win_glue.c, and we only need to do this once.  (XXX What about
Macintosh?)

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

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 088fabedc6f554fb8d45f7ca55dcee62fc457a52..84eb7bdc00320bd93ec81458ac109f69931c2f23 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,10 @@
+Thu Feb 29 16:14:46 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+       * sendto_kdc.c (krb5_sendto_kdc): Take out calls to
+               SOCKET_INITIALIZE and SOCKET_CLEANUP.  This gets done in
+               win_glue.c, and we only need to do this once.  (XXX What
+               about Macintosh?)
+
 Tue Feb 27 18:48:03 1996  Theodore Y. Ts'o  <tytso@dcl>
 
        * hostaddr.c (krb5_os_hostaddr): Use #define NEED_SOCKETS instead

diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
index c64320c417899ecde4e81642c559f091f2a63845..881066d0809d6a2bbd18c7da18a0db477762ed20 100644 (file)
--- a/src/lib/krb5/os/sendto_kdc.c
+++ b/src/lib/krb5/os/sendto_kdc.c
@@ -97,12 +97,20 @@ krb5_sendto_kdc (context, message, realm, reply)
     }
     reply->length = krb5_max_dgram_size;
 
+#if 0
+    /*
+     * Not needed for Windows, since it's done by the DLL
+     * initialization. XXX What about for the Macintosh?
+     *
+     * See below for commented out SOCKET_CLEANUP()
+     */
     if (SOCKET_INITIALIZE()) {  /* PC needs this for some tcp/ip stacks */
        krb5_xfree(addr);
        krb5_xfree(socklist);
        free(reply->data);
         return SOCKET_ERRNO;
     }
+#endif
 
     /*
      * do exponential backoff.
@@ -203,10 +211,12 @@ krb5_sendto_kdc (context, message, realm, reply)
     }
     retval = KRB5_KDC_UNREACH;
  out:
-    SOCKET_CLEANUP();                           /* Done with sockets for now */
     for (i = 0; i < naddr; i++)
        if (socklist[i] != INVALID_SOCKET)
            (void) closesocket (socklist[i]);
+#if 0
+    SOCKET_CLEANUP();                           /* Done with sockets for now */
+#endif
     krb5_xfree(addr);
     krb5_xfree(socklist);
     if (retval) {