From: Theodore Tso <tytso@mit.edu>
Date: Sat, 23 Sep 1995 01:29:10 +0000 (+0000)
Subject: Added MSDOS to wherever MACINTOSH was used
X-Git-Tag: krb5-1.0-beta6~1039
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9e7f2299b0df64a27d03e1ce304b74383daba2b2;p=krb5.git

Added MSDOS to wherever MACINTOSH was used

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

diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index 6a3e64823..e1df03281 100644
--- a/src/lib/krb5/keytab/file/ChangeLog
+++ b/src/lib/krb5/keytab/file/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 13 10:57:08 1995 Keith Vetter (keithv@fusion.com)
+
+	* ser_ktf.c: Added MSDOS to wherever MACINTOSH was used.
+
 Mon Sep 11 21:22:44 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* ser_ktf.c (krb5_ktf_keytab_externalize): On Macintosh, keytab
diff --git a/src/lib/krb5/keytab/file/ser_ktf.c b/src/lib/krb5/keytab/file/ser_ktf.c
index 536dd8aec..73797a341 100644
--- a/src/lib/krb5/keytab/file/ser_ktf.c
+++ b/src/lib/krb5/keytab/file/ser_ktf.c
@@ -160,10 +160,10 @@ krb5_ktf_keytab_externalize(kcontext, arg, buffer, lenremain)
 		if (ktdata) {
 		    if (ktdata->openf) {
 			long	fpos;
-			int	fflags;
+			int	fflags = 0;
 
 			file_is_open = 1;
-#ifndef _MACINTOSH
+#if !defined( _MACINTOSH) && !defined(_MSDOS)
 			fflags = fcntl(fileno(ktdata->openf), F_GETFL, 0);
 			if (fflags > 0)
 			    file_is_open |= ((fflags & O_ACCMODE) << 1);
@@ -274,7 +274,7 @@ krb5_ktf_keytab_internalize(kcontext, argp, buffer, lenremain)
 			(void) krb5_ser_unpack_int32(&foffbuf[1],
 						     &bp, &remain);
 			(void) krb5_ser_unpack_int32(&ibuf, &bp, &remain);
-			ktdata->version = ibuf;
+			ktdata->version = (int) ibuf;
 
 			(void) krb5_ser_unpack_int32(&ibuf, &bp, &remain);
 			if (ibuf == KV5M_KEYTAB) {
@@ -282,7 +282,7 @@ krb5_ktf_keytab_internalize(kcontext, argp, buffer, lenremain)
 				int 	fmode;
 				long	fpos;
 
-#ifndef _MACINTOSH
+#if !defined( _MACINTOSH) && !defined(_MSDOS)
 				fmode = (file_is_open >> 1) & O_ACCMODE;
 #else
 				fmode = 0;