scc_read.c:

scc_gennew.c (krb5_scc_generate_new): Change _WINDOWS to _MSDOS, and
	add check for _WIN32.

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

diff --git a/src/lib/krb5/ccache/stdio/ChangeLog b/src/lib/krb5/ccache/stdio/ChangeLog
index bb5664f3920017ba40319061b8731a0147dcdfed..565e694290d367315b03f94afc216e840e750cb1 100644 (file)
--- a/src/lib/krb5/ccache/stdio/ChangeLog
+++ b/src/lib/krb5/ccache/stdio/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun 10 21:46:06 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * scc_read.c:
+       * scc_gennew.c (krb5_scc_generate_new): Change _WINDOWS to _MSDOS,
+               and add check for _WIN32.
+       
 Wed Feb 14 10:44:27 1996    <tytso@rsts-11.mit.edu>
 
        * scc_read.c (krb5_scc_read_keyblock, krb5_scc_read_data,

diff --git a/src/lib/krb5/ccache/stdio/scc_gennew.c b/src/lib/krb5/ccache/stdio/scc_gennew.c
index 9839df6e06d91f645b77f942f190f2bb871d1448..5635428faa8675c0da0c0e98b35c2e94d1df0c6a 100644 (file)
--- a/src/lib/krb5/ccache/stdio/scc_gennew.c
+++ b/src/lib/krb5/ccache/stdio/scc_gennew.c
@@ -86,7 +86,7 @@ krb5_scc_generate_new (context, id)
      strcpy(((krb5_scc_data *) lid->data)->filename, scratch);
 
      /* Make sure the file name is useable */
-#if defined(__STDC__) || defined(_WINDOWS)
+#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)
      f = fopen (((krb5_scc_data *) lid->data)->filename, "wb+");
 #else
      f = fopen (((krb5_scc_data *) lid->data)->filename, "w+");

diff --git a/src/lib/krb5/ccache/stdio/scc_read.c b/src/lib/krb5/ccache/stdio/scc_read.c
index f1bec6f34dea4ab308137cac94ae65b904b0671c..88e9e5566e7ad45047ce09d15444bc5811b682ac 100644 (file)
--- a/src/lib/krb5/ccache/stdio/scc_read.c
+++ b/src/lib/krb5/ccache/stdio/scc_read.c
@@ -208,7 +208,7 @@ krb5_scc_read_keyblock(context, id, keyblock)
 
      kret = krb5_scc_read_int32(context, id, &int32);
      CHECK(kret);
-#ifdef _WINDOWS
+#ifdef _MSDOS
      int32 &= VALID_INT_BITS;    /* Gradient does not write  correctly */     
 #else
      if ((int32 & VALID_INT_BITS) != int32)     /* Overflow size_t??? */
@@ -247,7 +247,7 @@ krb5_scc_read_data(context, id, data)
 
      kret = krb5_scc_read_int32(context, id, &len);
      CHECK(kret);
-#ifdef _WINDOWS
+#ifdef _MSDOS
      len &= VALID_INT_BITS;
 #else
      if ((len & VALID_INT_BITS) != len)
@@ -294,7 +294,7 @@ krb5_scc_read_addr(context, id, addr)
      
      kret = krb5_scc_read_int32(context, id, &int32);
      CHECK(kret);
-#ifdef _WINDOWS
+#ifdef _MSDOS
      int32 &= VALID_INT_BITS;  /* Gradient DCE does this wrong */
 #else
      if ((int32 & VALID_INT_BITS) != int32)     /* Overflow int??? */
@@ -469,7 +469,7 @@ krb5_scc_read_authdatum(context, id, a)
     a->ad_type = (krb5_authdatatype)ui2;
     kret = krb5_scc_read_int32(context, id, &int32);
     CHECK(kret);
-#ifdef _WINDOWS
+#ifdef _MSDOS
     int32 &= VALID_INT_BITS;
 #else
     if ((int32 & VALID_INT_BITS) != int32)     /* Overflow int??? */