* cnv_tkt_skey.c, conv_creds.c, conv_princ.c, encode.c, sendmsg.c: Removed Mac-specif...

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

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 7d111ff7ebd538a95f467bd1eeef4130e1ce9f7f..672bffe8cc1298c82b6573682cbd8bb8e7f9dac1 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,17 @@
+2003-03-06  Alexandra Ellwood  <lxs@mit.edu>
+    * 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.
+
 2003-01-31  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (clean-windows): Remove $(GENS).

diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index 2006e3a9d5529c37588d4e45e91d2324178db1bf..1e5b5dc314875876b07291d11dae153a1423a5a9 100644 (file)
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -31,7 +31,7 @@ LIBMINOR=0
 RELDIR=../krb524
 STOBJLISTS=OBJS.ST
 
-DEFINES = -DUSE_MASTER
+DEFINES = -DUSE_MASTER -DKRB524_PRIVATE=1
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
 PROG_RPATH=$(KRB5_LIBDIR)
 KRB524_DEPLIB  = libkrb524.a

diff --git a/src/krb524/cnv_tkt_skey.c b/src/krb524/cnv_tkt_skey.c
index f34ea6f4405a18d329b13cf16c1489fd83e714ad..67349765c0440ba9c68c398b2b3ecf373fb3ae50 100644 (file)
--- 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,

diff --git a/src/krb524/conv_creds.c b/src/krb524/conv_creds.c
index 5e52040f305e0a36333e4e292a288409e3677de8..ba8daaae499f463a0ca7442dd191c91b83e84dbc 100644 (file)
--- 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;

diff --git a/src/krb524/conv_princ.c b/src/krb524/conv_princ.c
index 83447317a1fc4293847d69e7c27565137e49d8c4..f52c0dd133eaa561e7ea1111a60cdc906b8d76d4 100644 (file)
--- a/src/krb524/conv_princ.c
+++ b/src/krb524/conv_princ.c
@@ -21,13 +21,8 @@
  */
 
 #include "krb5.h"
-#if TARGET_OS_MAC
-#include <Kerberos/krb.h>
-#include <Kerberos/krb524.h>
-#else
 #include <krb.h>
 #include "krb524.h"
-#endif
 
 int krb524_convert_princs(context, client, server, pname, pinst, prealm, 
                          sname, sinst, srealm)

diff --git a/src/krb524/encode.c b/src/krb524/encode.c
index c20c2281b62a3e553edf0766194f9ddfad06ef02..00698cfebc1c03a09d4019e9fe2aca84ef8addcd 100644 (file)
--- a/src/krb524/encode.c
+++ b/src/krb524/encode.c
@@ -34,13 +34,8 @@
 #include <netinet/in.h>
 #endif
 
-#if TARGET_OS_MAC
-#include <Kerberos/krb.h>
-#include <Kerberos/krb524.h>
-#else
 #include <krb.h>
 #include "krb524.h"
-#endif
 
 /*
  * I'm sure that this is reinventing the wheel, but I don't know where

diff --git a/src/krb524/krb524.h b/src/krb524/krb524.h
index 803b975645c4c3b10a3874867597d79b2dace0fe..f44a6b4c9b58492096e0a366f0a7399b61938ff1 100644 (file)
--- a/src/krb524/krb524.h
+++ b/src/krb524/krb524.h
@@ -32,12 +32,13 @@
 #              define KRB524_PRIVATE 0
 #      endif
 #else
-#    include "krb524_err.h"
 #      ifndef KRB524_PRIVATE
 #              define KRB524_PRIVATE 1
 #      endif
 #endif 
 
+#include <krb524_err.h>
+
 #ifndef KRB524INT_BEGIN_DECLS
 #ifdef __cplusplus
 #define KRB524INT_BEGIN_DECLS  extern "C" {
@@ -51,7 +52,6 @@
 #if TARGET_OS_MAC
 #    if defined(__MWERKS__)
 #      pragma import on
-#      pragma enumsalwaysint on
 #    endif
 #    pragma options align=mac68k
 #endif
@@ -120,7 +120,6 @@ int krb524_sendto_kdc
 
 #if TARGET_OS_MAC
 #    if defined(__MWERKS__)
-#      pragma enumsalwaysint reset
 #      pragma import reset
 #    endif
 #      pragma options align=reset

diff --git a/src/krb524/sendmsg.c b/src/krb524/sendmsg.c
index 8cea52e01e238db3f000e7f084f7002dedd4e6bb..5cbd324ac2b8bd585f5d6190acce3971adac1209 100644 (file)
--- a/src/krb524/sendmsg.c
+++ b/src/krb524/sendmsg.c
@@ -39,13 +39,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if TARGET_OS_MAC
-#include <Kerberos/krb.h>
-#include <Kerberos/krb524.h>
-#else
 #include <krb.h>
 #include "krb524.h"
-#endif
 
 /*
  * krb524_sendto_kdc: