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/conv_creds.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/conv_creds.c')
| -rw-r--r-- | src/krb524/conv_creds.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/krb524/conv_creds.c b/src/krb524/conv_creds.c index 5e52040..ba8daaa 100644 --- a/src/krb524/conv_creds.c +++ b/src/krb524/conv_creds.c @@ -26,12 +26,11 @@ #include <sys/types.h> #include "port-sockets.h" #include "socket-utils.h" -#if TARGET_OS_MAC -#include <Kerberos/krb.h> -#include <Kerberos/krb524.h> -#else #include <krb.h> #include "krb524.h" + +#ifdef USE_CCAPI +#include <CredentialsCache.h> #endif krb5_error_code krb524_convert_creds_plain @@ -61,7 +60,10 @@ krb524_convert_creds_kdc(context, v5creds, v4creds) if (ret) return ret; -#ifdef TARGET_OS_MAC +#if TARGET_OS_MAC +#ifdef USE_CCAPI + v4creds->stk_type = cc_v4_stk_des; +#endif if (slen == sizeof(struct sockaddr_in) && ss2sa(&ss)->sa_family == AF_INET) { v4creds->address = ss2sin(&ss)->sin_addr.s_addr; |