diff options
| author | Alexandra Ellwood <lxs@mit.edu> | 2003-03-06 19:16:52 +0000 |
|---|---|---|
| committer | Alexandra Ellwood <lxs@mit.edu> | 2003-03-06 19:16:52 +0000 |
| commit | 51d9147fa54ccc6fec3cec833c4e922e054a4941 (patch) | |
| tree | b68ae46490ecd1a5726616973814732c01ae8631 /src/krb524/cnv_tkt_skey.c | |
| parent | ec935ec538bf84ab8990203ffa38dc711cc94711 (diff) | |
| download | krb5-51d9147fa54ccc6fec3cec833c4e922e054a4941.zip krb5-51d9147fa54ccc6fec3cec833c4e922e054a4941.tar.gz krb5-51d9147fa54ccc6fec3cec833c4e922e054a4941.tar.bz2 | |
* cnv_tkt_skey.c, conv_creds.c, conv_princ.c, encode.c, sendmsg.c: Removed Mac-specific includes. * conv_creds.c: If we are on the Mac and using the CCAPI, set the string_to_key type to MIT. * krb524.h: Removed enumsalwaysint because there are no enums in this header. Also include krb524_err with <> because on Mac OS X both are public headers and should not be included with "". * Makefile.in: set KRB524_PRIVATE while building so that Darwin builds see these prototypes. Otherwise the Darwin build will fail
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15244 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/krb524/cnv_tkt_skey.c')
| -rw-r--r-- | src/krb524/cnv_tkt_skey.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/krb524/cnv_tkt_skey.c b/src/krb524/cnv_tkt_skey.c index f34ea6f..6734976 100644 --- a/src/krb524/cnv_tkt_skey.c +++ b/src/krb524/cnv_tkt_skey.c @@ -30,14 +30,8 @@ #include <sys/time.h> #include <netinet/in.h> #endif -#if TARGET_OS_MAC -#include <Kerberos/krb.h> -#include <Kerberos/krb524.h> -#include "cr_tkt.h" -#else #include <krb.h> #include "krb524.h" -#endif static int krb524int_krb_create_ticket(KTEXT, unsigned int, char *, char *, char *, long, |