diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/kadm/ChangeLog | 8 | ||||
| -rw-r--r-- | src/lib/kadm/adm_kw_dec.c | 2 | ||||
| -rw-r--r-- | src/lib/kadm/adm_kw_enc.c | 2 | ||||
| -rw-r--r-- | src/lib/krb5/posix/getuid.c | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog index ab1e6780c1..f0afd5f6d6 100644 --- a/src/lib/kadm/ChangeLog +++ b/src/lib/kadm/ChangeLog @@ -1,3 +1,11 @@ +Tue Sep 27 12:00:00 1995 <jrivlin@fusion.com> + + * adm_kw_dec.c (krb5_adm_proto_to_dbent): Routine removed for + Windows and Mac to match with the prototype. + + * adm_kw_dec.c (krb5_adm_dbent_to_proto): Routine removed for + Windows and Mac to match with the prototype. + Tue Sep 26 16:24:00 1995 <tytso@rsts-11.mit.edu> * alt_prof.c (krb5_read_realm_params): On an error, initialize the diff --git a/src/lib/kadm/adm_kw_dec.c b/src/lib/kadm/adm_kw_dec.c index 9258353757..83c9395ae5 100644 --- a/src/lib/kadm/adm_kw_dec.c +++ b/src/lib/kadm/adm_kw_dec.c @@ -226,6 +226,7 @@ decode_kw_tagged(dataentp, keyword, ntags, taglist, lenp, datap) return(kret); } +#if ! defined(_WINDOWS) && ! defined(_MACINTOSH) /* * krb5_adm_proto_to_dbent() - Convert external attribute list into a * database entry. @@ -574,3 +575,4 @@ krb5_adm_proto_to_dbent(kcontext, nent, data, validp, dbentp, pwordp) *validp |= parsed_mask; return(retval); } +#endif diff --git a/src/lib/kadm/adm_kw_enc.c b/src/lib/kadm/adm_kw_enc.c index 4e0318712e..3a0741c104 100644 --- a/src/lib/kadm/adm_kw_enc.c +++ b/src/lib/kadm/adm_kw_enc.c @@ -161,6 +161,7 @@ format_kw_tagged(datap, kwordp, ntags, taglist, vallen, val) return(retval); } +#if ! defined(_WINDOWS) && ! defined(_MACINTOSH) /* * krb5_adm_dbent_to_proto() - Convert database a database entry into * an external attribute list. @@ -428,4 +429,5 @@ krb5_adm_dbent_to_proto(kcontext, valid, dbentp, password, nentp, datap) *nentp = outindex; return(kret); } +#endif diff --git a/src/lib/krb5/posix/getuid.c b/src/lib/krb5/posix/getuid.c index 2c0109521b..a44aa743ee 100644 --- a/src/lib/krb5/posix/getuid.c +++ b/src/lib/krb5/posix/getuid.c @@ -1,5 +1,5 @@ /* Very simple getuid() for systems that don't have one. */ -#ifndef _MWERKS +#ifndef __MWERKS__ int getuid() { |