diff options
| author | Theodore Tso <tytso@mit.edu> | 1995-09-23 01:29:10 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1995-09-23 01:29:10 +0000 |
| commit | 9e7f2299b0df64a27d03e1ce304b74383daba2b2 (patch) | |
| tree | 7b3ef91be89c77941651606261b1e5b70f1e5a2d /src/lib | |
| parent | f0cdbbf3be1044e55e4d353310c2145e2f9145c8 (diff) | |
| download | krb5-9e7f2299b0df64a27d03e1ce304b74383daba2b2.tar.gz krb5-9e7f2299b0df64a27d03e1ce304b74383daba2b2.tar.xz krb5-9e7f2299b0df64a27d03e1ce304b74383daba2b2.zip | |
Added MSDOS to wherever MACINTOSH was used
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6825 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/keytab/file/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lib/krb5/keytab/file/ser_ktf.c | 8 |
2 files changed, 8 insertions, 4 deletions
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; |