net_read.c (krb5_net_read):

net_write.c (krb5_net_write): In case of an error, on Windows
	machines, set errno from SOCKET_ERRNO, since the interface assumes the
	error is passed back the errno global varaible.  This really needs to
	be fixed sometime...

read_msg.c: If ECONNABORTED is not defined, try using the Winsock
	version of the error code (WSAECONNABORTED).

read_pwd.c:
promptusr.c:
lock_file.c:
kuserok.c:
ktdefname.c (krb5_kt_default_name):
init_os_ctx.c (os_init_paths):
ccdefname.c:
an_to_ln.c (db_an_to_ln): Change _WINDOWS to _MSDOS, and add check for _WIN32.

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

diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 37600779fd7139c77951e4784a7df6eba6d802f4..75d2f0d3ea5371986ab96944e060bbbe3168e740 100644 (file)
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,26 @@
+Wed Jun 12 01:12:32 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * net_read.c (krb5_net_read):
+       * net_write.c (krb5_net_write): In case of an error, on Windows
+               machines, set errno from SOCKET_ERRNO, since the interface
+               assumes the error is passed back the errno global
+               varaible.  This really needs to be fixed sometime...
+
+       * read_msg.c: If ECONNABORTED is not defined, try using the
+               Winsock version of the error code (WSAECONNABORTED).
+
+Mon Jun 10 21:48:45 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * read_pwd.c:
+       * promptusr.c:
+       * lock_file.c:
+       * kuserok.c:
+       * ktdefname.c (krb5_kt_default_name): 
+       * init_os_ctx.c (os_init_paths): 
+       * ccdefname.c: 
+       * an_to_ln.c (db_an_to_ln): Change _WINDOWS to _MSDOS, and add
+               check for _WIN32.
+
 Thu Apr 18 16:24:44 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
        * macsock.c (getsockname, getpeername): Correctly implement

diff --git a/src/lib/krb5/os/an_to_ln.c b/src/lib/krb5/os/an_to_ln.c
index 9748daf66e5731da33453ada3b857fc751f1b695..abf8d374cb9a6018d5a6cc7441a540f654275c9d 100644 (file)
--- a/src/lib/krb5/os/an_to_ln.c
+++ b/src/lib/krb5/os/an_to_ln.c
@@ -108,7 +108,7 @@ db_an_to_ln(context, dbname, aname, lnsize, lname)
     const int lnsize;
     char *lname;
 {
-#if    defined(BERK_DB_DBM) || (!defined(_WINDOWS) && !defined(_MACINTOSH))
+#if    defined(BERK_DB_DBM) || (!defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH))
     DBM *db;
     krb5_error_code retval;
     datum key, contents;
@@ -144,13 +144,13 @@ db_an_to_ln(context, dbname, aname, lnsize, lname)
     /* can't close until we copy the contents. */
     (void) KDBM_CLOSE(db);
     return retval;
-#else  /* BERK_DB_DBM && !_WINDOWS */
+#else  /* BERK_DB_DBM && !_MSDOS && !_WIN32 && !MACINTOSH */
     /*
      * If we don't have support for a database mechanism, then we can't
      * translate this now, can we?
      */
     return KRB5_LNAME_NOTRANS;
-#endif /* BERK_DB_DBM && !_WINDOWS */
+#endif /* BERK_DB_DBM && !_MSDOS && !_WIN32 && !MACINTOSH */
 }
 
 #ifdef AN_TO_LN_RULES

diff --git a/src/lib/krb5/os/ccdefname.c b/src/lib/krb5/os/ccdefname.c
index 197ab32c70ed1a55dc4ac9b57192de038e02e64a..1db1706f2efb31a092c5b867bdd894fed30dfc9c 100644 (file)
--- a/src/lib/krb5/os/ccdefname.c
+++ b/src/lib/krb5/os/ccdefname.c
@@ -107,7 +107,7 @@ char        pathbuf[255];
 //     strcpy (name_buf, "STDIO:krb5cc");
 }
 #else
-#ifdef _WINDOWS
+#if defined(_MSDOS) || defined(_WIN32)
         {
             char defname[160];                  /* Default value */
 

diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c
index ba80694bc552b13940d9a88350de2dcdbc194b61..56e5ebc9532658553bd2604372a4b744b8bab940 100644 (file)
--- a/src/lib/krb5/os/init_os_ctx.c
+++ b/src/lib/krb5/os/init_os_ctx.c
@@ -106,13 +106,13 @@ os_init_paths(ctx, secure)
        krb5_error_code retval = 0;
        char *name = 0;
 
-#if defined(_MACINTOSH) || defined(_WINDOWS)
+#if defined(_MACINTOSH) || defined(_MSDOS) || defined(_WIN32)
        const char *filenames[2];
 #endif
 
        ctx->profile_secure = secure;
 
-#ifdef _WINDOWS
+#if defined(_MSDOS) || defined(_WIN32)
     {
         char defname[160];                      /* Default value */
         char krb5conf[160];                     /* Actual value */
@@ -130,7 +130,7 @@ os_init_paths(ctx, secure)
 
        retval = profile_init(filenames, &ctx->profile);
 
-#else /* _WINDOWS */
+#else /* _MSDOS || _WIN32 */
 #ifdef _MACINTOSH
        filenames[0] = GetMacProfilePathName();
        filenames[1] = 0;
@@ -145,7 +145,7 @@ os_init_paths(ctx, secure)
 
        retval = profile_init_path(name, &ctx->profile);
 #endif /* _MACINTOSH */
-#endif /* _WINDOWS */
+#endif /* _MSDOS || _WIN32 */
 
        if (retval)
            ctx->profile = 0;

diff --git a/src/lib/krb5/os/ktdefname.c b/src/lib/krb5/os/ktdefname.c
index b431b945cc8f81a9dbe2f218ada6c6f9e2efe642..433c1c9da80061f3805e220762da1806d46495d1 100644 (file)
--- a/src/lib/krb5/os/ktdefname.c
+++ b/src/lib/krb5/os/ktdefname.c
@@ -44,7 +44,7 @@ krb5_kt_default_name(context, name, namesize)
        if (strlen(cp) >= (size_t) namesize)
            return KRB5_CONFIG_NOTENUFSPACE;
     } else {
-#if defined (_WINDOWS) || defined(WIN32)
+#if defined (_MSDOS) || defined(_WIN32)
        {
            char    defname[160];
            int     len;

diff --git a/src/lib/krb5/os/kuserok.c b/src/lib/krb5/os/kuserok.c
index 321f438cc6b56d99173cf780d86efba17da278f0..3e54fa0c1e28ef12a0f5b8b7845b1cb549f39c86 100644 (file)
--- a/src/lib/krb5/os/kuserok.c
+++ b/src/lib/krb5/os/kuserok.c
@@ -25,7 +25,7 @@
  */
 
 #include "k5-int.h"
-#if !defined(_MSDOS) && !defined(_MACINTOSH)    /* Not yet for Windows */
+#if !defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH)    /* Not yet for Windows */
 #include <stdio.h>
 #include <pwd.h>
 

diff --git a/src/lib/krb5/os/lock_file.c b/src/lib/krb5/os/lock_file.c
index 4994caf082a9028b5e569a16f21e0660b51a9576..edc4d88d20489fe1ffc50c358f7ee2e122353e3c 100644 (file)
--- a/src/lib/krb5/os/lock_file.c
+++ b/src/lib/krb5/os/lock_file.c
@@ -27,7 +27,7 @@
 #include "k5-int.h"
 #include <stdio.h>
 
-#if !defined(_MSDOS) && !defined(HAVE_MACSOCK_H)
+#if !defined(_MSDOS) && !defined(_WIN32) && !defined(HAVE_MACSOCK_H)
 
 /* Unix version...  */
 

diff --git a/src/lib/krb5/os/net_read.c b/src/lib/krb5/os/net_read.c
index 1513898600d6c30538d69f1337f759b75b4c4278..9d3f52bdf8cfcc0f94ae5681fb179e259fc82a6d 100644 (file)
--- a/src/lib/krb5/os/net_read.c
+++ b/src/lib/krb5/os/net_read.c
@@ -50,6 +50,10 @@ krb5_net_read(context, fd, buf, len)
        if (cc < 0) {
            if (SOCKET_ERRNO == SOCKET_EINTR)
                continue;
+#if defined(_MSDOS) || (_WIN32)
+            /* XXX this interface sucks! */
+            errno = SOCKET_ERRNO;
+#endif            
            return(cc);          /* errno is already set */
        }               
        else if (cc == 0) {

diff --git a/src/lib/krb5/os/net_write.c b/src/lib/krb5/os/net_write.c
index 161846fc4159cdfd81e317c4345bb72a6aec3887..bea3428800e1f696904747e74b51471f178af1d9 100644 (file)
--- a/src/lib/krb5/os/net_write.c
+++ b/src/lib/krb5/os/net_write.c
@@ -49,6 +49,10 @@ krb5_net_write(context, fd, buf, len)
        if (cc < 0) {
            if (SOCKET_ERRNO == SOCKET_EINTR)
                continue;
+#if defined(_MSDOS) || (_WIN32)
+            /* XXX this interface sucks! */
+            errno = SOCKET_ERRNO;
+#endif            
            return(cc);
        }
        else {

diff --git a/src/lib/krb5/os/promptusr.c b/src/lib/krb5/os/promptusr.c
index 90ceaccec8c9739f90cf05d86838a80169cf1d8d..f40be0ff4ece8cd3f92e1451fd5f3e3c7a8b412f 100644 (file)
--- a/src/lib/krb5/os/promptusr.c
+++ b/src/lib/krb5/os/promptusr.c
@@ -3,7 +3,7 @@
  */
 
 #include "k5-int.h"
-#if !defined(_MSDOS) && !defined(_MACINTOSH)
+#if !defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH)
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/lib/krb5/os/read_msg.c b/src/lib/krb5/os/read_msg.c
index a5dc7964c8b81759e6de760fcf70ed7fa3722226..6a93644a827bd99982df14a65c3ab160907588bc 100644 (file)
--- a/src/lib/krb5/os/read_msg.c
+++ b/src/lib/krb5/os/read_msg.c
@@ -28,6 +28,10 @@
 #include "k5-int.h"
 #include <errno.h>
 
+#ifndef ECONNABORTED
+#define ECONNABORTED WSAECONNABORTED
+#endif
+
 krb5_error_code
 krb5_read_message(context, fdp, inbuf)
     krb5_context context;

diff --git a/src/lib/krb5/os/read_pwd.c b/src/lib/krb5/os/read_pwd.c
index 5aa9055f1b5e6f53d74e1b7b8dc8496ae3bf73cb..202b1f9f403668d0a4c4f3c2e9f9b13008bb1100 100644 (file)
--- a/src/lib/krb5/os/read_pwd.c
+++ b/src/lib/krb5/os/read_pwd.c
@@ -25,7 +25,7 @@
  */
 
 #include "k5-int.h"
-#if !defined(_MSDOS) && !defined(_MACINTOSH)
+#if !defined(_MSDOS) && !defined(_WIN32) && !defined(_MACINTOSH)
 #include <stdio.h>
 #include <errno.h>
 #include <signal.h>