Added classic 68K glue

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

13 files changed, 166 insertions, 330 deletions

diff --git a/src/mac/CFMGlue.pl b/src/mac/CFMGlue.pl
index fe86e4279..f74a3662d 100644
--- a/src/mac/CFMGlue.pl
+++ b/src/mac/CFMGlue.pl
@@ -91,7 +91,7 @@ foreach $function (keys(%FUNCTIONS))
     print("enum {\n");
     print("  $name" . "_ProcInfo = kThinkCStackBased\n");
     if($retType ne "void") {
-	print("  | RESULT_SIZE(SIZECODE(sizeof($retType)))\n");
+	print("  | RESULT_SIZE(SIZE_CODE(sizeof($retType)))\n");
     }
     for($i = 0, $j = 1; $i <= $#args; $i++, $j++)
     {
@@ -100,6 +100,21 @@ foreach $function (keys(%FUNCTIONS))
     }    
     print("};\n\n");
     
+    # Now Generate the ProcPtr Typedef
+    # --------------------------------
+    print("typedef ");
+    print("$retType ");
+    print("(*$name" . "_ProcPtrType)(");
+    
+    for($i = 0; $i<=$#args; $i++) {
+	    $arg = $args[$i];
+	    print("$arg");
+	    if ($i ne $#args) {
+	    	print (", ");
+	    }
+    }
+    print(");\n");
+  
     
     # Now Generate the Static 68K Function Declaration:
     # -------------------------------------------------
@@ -117,7 +132,7 @@ foreach $function (keys(%FUNCTIONS))
 	}
     } 
     print("{\n");
-    print("  static $name" . "_ProcPtr = kUnresolvedCFragSymbolAddress;\n\n");
+    print("  static $name" . "_ProcPtrType $name" . "_ProcPtr = kUnresolvedCFragSymbolAddress;\n\n");
 
     print("  // if this symbol has not been setup yet...\n");
     print("  if((Ptr) $name" . "_ProcPtr == (Ptr) kUnresolvedCFragSymbolAddress)\n");
diff --git a/src/mac/CFMglue.c b/src/mac/CFMglue.c
new file mode 100644
index 000000000..b2270885d
--- /dev/null
+++ b/src/mac/CFMglue.c
@@ -0,0 +1,104 @@
+#include <CodeFragments.h>
+
+// Private function prototypes
+
+static OSErr Find_Symbol(
+	Ptr* pSymAddr,
+	Str255 pSymName,
+	ProcInfoType pProcInfo);
+
+static pascal OSErr GetSystemArchitecture(OSType *archType);
+
+/* This code is directly from Technote 1077 */
+
+/*	changed Library name to be hardcoded at the top of the file
+	instead in the middle of the code */
+
+// Private functions
+
+static pascal OSErr GetSystemArchitecture(OSType *archType)
+{
+	static long sSysArchitecture = 0; // static so we only Gestalt once.
+	OSErr tOSErr = noErr;
+
+	*archType = kAnyCFragArch;   // assume wild architecture
+
+	// If we don't know the system architecture yet...
+	if (sSysArchitecture == 0)
+	// ...Ask Gestalt what kind of machine we are running on.
+	tOSErr = Gestalt(gestaltSysArchitecture, &sSysArchitecture);
+
+	if (tOSErr == noErr) // if no errors
+	{
+		if (sSysArchitecture == gestalt68k)   // 68k?
+			*archType = kMotorola68KCFragArch;   
+		else if (sSysArchitecture == gestaltPowerPC) // PPC?
+			*archType = kPowerPCCFragArch;       
+		else
+			tOSErr = gestaltUnknownErr;  // who knows what might be next?
+	}
+	return tOSErr;
+}
+
+static OSErr Find_Symbol(
+	Ptr* pSymAddr,
+	Str255 pSymName,
+	ProcInfoType pProcInfo)
+{
+	static CFragConnectionID sCID = 0;
+	static OSType sArchType = kAnyCFragArch;
+	static OSErr sOSErr = noErr;
+
+	Str255 errMessage;
+	Ptr mainAddr;
+	CFragSymbolClass symClass;
+	ISAType tISAType;
+
+	if (sArchType == kAnyCFragArch)  // if architecture is undefined...
+	{
+		sCID = 0;     // ...force (re)connect to library
+		sOSErr = GetSystemArchitecture(&sArchType); // determine architecture
+		if (sOSErr != noErr)
+		return sOSErr; // OOPS!
+	}
+
+	if (sArchType == kMotorola68KCFragArch) // ...for CFM68K
+		tISAType = kM68kISA | kCFM68kRTA;
+	else if (sArchType == kPowerPCCFragArch)  // ...for PPC CFM
+		tISAType = kPowerPCISA | kPowerPCRTA;
+	else
+		sOSErr = gestaltUnknownErr; // who knows what might be next?
+
+	if (sCID == 0) // If we haven't connected to the library yet...
+	{
+		// NOTE: The library name is hard coded here.
+		// I try to isolate the glue code, one file per library.
+		// I have had developers pass in the Library name to allow
+		// plug-in type support. Additional code has to be added to
+		// each entry points glue routine to support multiple or
+		// switching connection IDs.
+		sOSErr = GetSharedLibrary(kLibraryName, sArchType, kLoadCFrag,
+		&sCID, &mainAddr, errMessage);
+		if (sOSErr != noErr)
+		return sOSErr; // OOPS!
+	}
+
+	// If we haven't looked up this symbol yet...
+	if ((Ptr) *pSymAddr == (Ptr) kUnresolvedCFragSymbolAddress)    
+	{
+		// ...look it up now
+		sOSErr = FindSymbol(sCID,pSymName,pSymAddr,&symClass);
+		if (sOSErr != noErr) // in case of error...
+		// ...clear the procedure pointer
+		*(Ptr*) &pSymAddr = (Ptr) kUnresolvedCFragSymbolAddress;
+#	if !GENERATINGCFM // if this is classic 68k code...
+			*pSymAddr = (Ptr)NewRoutineDescriptorTrap((ProcPtr) *pSymAddr,
+			pProcInfo, tISAType);  // ...create a routine descriptor...
+#	endif
+	}
+	return sOSErr;
+}
+
+/* --------------------------------- */
+/* Autogenerated section starts here */
+/* --------------------------------- */
diff --git a/src/mac/ChangeLog b/src/mac/ChangeLog
index 560ee3f91..aece09564 100644
--- a/src/mac/ChangeLog
+++ b/src/mac/ChangeLog
@@ -1,3 +1,7 @@
+Mon Aug 10 12:30:00 1998  Miro Jurisic <meeroh@mit.edu>
+
+	* Added sources for classic 68K glue for GSSAPI and krb5 libraries
+
 Tue Jul  7 17:00:00 1998  Miro Jurisic <meeroh@mit.edu>
 
 	* Makefile: separated krb5 and GSS libraries; also commented out MIT-specific targets,
diff --git a/src/mac/GSS.CFMGlue.h b/src/mac/GSS.CFMGlue.h
new file mode 100644
index 000000000..c3365590d
--- /dev/null
+++ b/src/mac/GSS.CFMGlue.h
@@ -0,0 +1,6 @@
+#ifndef _GSS_CFMGLUE_H_
+#define _GSS_CFMGLUE_H_
+
+Boolean GSSAPILibraryIsPresent ();
+
+#endif /* _GSS_CFMGLUE_H_ */
\ No newline at end of file
diff --git a/src/mac/GSS.CFMglue.cin b/src/mac/GSS.CFMglue.cin
new file mode 100644
index 000000000..530bef5d5
--- /dev/null
+++ b/src/mac/GSS.CFMglue.cin
@@ -0,0 +1,5 @@
+/* Include prototypes for glue functions */
+#include <gssapi.h>
+
+/* Hardcode library fragment name here */
+#define kLibraryName "\pGSSLibrary"
diff --git a/src/mac/GSS.CFMglue.proto.h b/src/mac/GSS.CFMglue.proto.h
new file mode 100644
index 000000000..ba750b871
--- /dev/null
+++ b/src/mac/GSS.CFMglue.proto.h
@@ -0,0 +1,9 @@
+OM_uint32 gss_wrap(OM_uint32 *, gss_ctx_id_t, int, gss_qop_t, gss_buffer_t, int *, gss_buffer_t);
+OM_uint32 gss_release_buffer(OM_uint32 *, gss_buffer_t);
+OM_uint32 gss_unwrap(OM_uint32 *, gss_ctx_id_t, gss_buffer_t, gss_buffer_t, int *, gss_qop_t *);
+OM_uint32 gss_delete_sec_context(OM_uint32 *, gss_ctx_id_t *, gss_buffer_t);
+OM_uint32 gss_display_status(OM_uint32 *, OM_uint32, int, gss_OID, OM_uint32 *, gss_buffer_t);
+OM_uint32 gss_init_sec_context(OM_uint32 *, gss_cred_id_t, gss_ctx_id_t *, gss_name_t, gss_OID, OM_uint32, OM_uint32, gss_channel_bindings_t, gss_buffer_t, gss_OID *, gss_buffer_t, OM_uint32 *, OM_uint32 *);
+OM_uint32 gss_import_name(OM_uint32 *, gss_buffer_t, gss_OID, gss_name_t *);
+OM_uint32 gss_release_name(OM_uint32 *, gss_name_t *);
+OM_uint32 gss_wrap_size_limit(OM_uint32 *, gss_ctx_id_t, int, gss_qop_t, OM_uint32, OM_uint32 *);
diff --git a/src/mac/GSS.moreCFMglue.cin b/src/mac/GSS.moreCFMglue.cin
new file mode 100644
index 000000000..e4491b72c
--- /dev/null
+++ b/src/mac/GSS.moreCFMglue.cin
@@ -0,0 +1,7 @@
+#include <GSS.CFMglue.h>
+
+Boolean GSSAPILibraryIsPresent ()
+{
+	Ptr	symAddr;
+	return (Find_Symbol (&symAddr, "\pgss_init_sec_context", gss_init_sec_context_ProcInfo)) == noErr;
+}
\ No newline at end of file
diff --git a/src/mac/K5.CFMGlue.h b/src/mac/K5.CFMGlue.h
new file mode 100644
index 000000000..0c9478c60
--- /dev/null
+++ b/src/mac/K5.CFMGlue.h
@@ -0,0 +1,6 @@
+#ifndef _K5_CFMGLUE_H_
+#define _K5_CFMGLUE_H_
+
+Boolean KerberosV5LibraryIsPresent ();
+
+#endif /* _K5_CFMGLUE_H_ */
\ No newline at end of file
diff --git a/src/mac/K5.CFMglue.c b/src/mac/K5.CFMglue.c
deleted file mode 100644
index f23b229ce..000000000
--- a/src/mac/K5.CFMglue.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* Include prototypes for glue functions */
-#include <krb5.h>
-
-/* Hardcode library fragment name here */
-#define kLibraryName "\pK5Library"
-#include <CodeFragments.h>
-
-// Private function prototypes
-
-static OSErr Find_Symbol(
-	Ptr* pSymAddr,
-	Str255 pSymName,
-	ProcInfoType pProcInfo);
-
-static pascal OSErr GetSystemArchitecture(OSType *archType);
-
-/* Public functions & globals */
-
-/* We are providing glue for the following functions, for the benefit of the
-	Kerberos v5 telnet plugin:
-		krb5_auth_con_free
-		krb5_auth_con_genaddrs
-		krb5_auth_con_getlocalsubkey
-		krb5_auth_con_init
-
-		krb5_auth_con_setaddrs
-		krb5_auth_con_setports
-		krb5_init_ets
-
-		com_err
-
-		mit_des_ecb_encrypt
-		mit_des_init_random_key
-		mit_des_key_sched
-		mit_des_random_key
-
-		krb5_auth_con_setflags
-
-		krb5_cc_default
-		krb5_copy_keyblock
-		krb5_free_ap_rep_enc_part
-		krb5_free_context
-		krb5_free_cred_contents
-		krb5_free_creds
-		krb5_free_keyblock
-		krb5_free_principal
-		krb5_fwd_tgt_creds
-		krb5_get_credentials
-		krb5_init_context
-
-		krb5_mk_req_extended
-		krb5_rd_rep
-		krb5_sname_to_principal
-*/
-
-/* Glue for every function consists of the ProcInfo enum (built from the prototype)
-	and a glue function */
-
-/* These functions fail silently, anyone have any better ideas? */
-
-
-/* krb5_auth_con_free */
-
-enum {
-	krb5_auth_con_free_ProcInfo = kThinkCStackBased |
-	RESULT_SIZE(SIZE_CODE(sizeof(krb5_error_code))) |
-	STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(krb5_context))) |
-	STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(krb5_auth_context)))
-};
-
-krb5_error_code krb5_auth_con_free (
-		krb5_context			param1,
-		krb5_auth_context		param2))
-{
-	static krb5_auth_con_free_ProcPtr = kUnresolvedSymbolAddress;
-
-	// if this symbol has not been setup yet...
-	if ((Ptr) krb5_auth_con_free_ProcPtr == (Ptr) kUnresolvedSymbolAddress)   
-		Find_Symbol((Ptr*) &krb5_auth_con_free_ProcPtr,"\pkrb5_auth_con_free",krb5_auth_con_free_ProcInfo);
-	if ((Ptr) krb5_auth_con_free_ProcPtr != (Ptr) kUnresolvedSymbolAddress)
-		return krb5_auth_con_free_ProcPtr(param1, param2);
-}
-
-/* krb5_auth_con_genaddrs */
-
-enum {
-	krb5_auth_con_genaddrs_ProcInfo = kThinkCStackBased |
-	RESULT_SIZE(SIZE_CODE(sizeof(krb5_error_code))) |
-	STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(krb5_context))) |
-	STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(krb5_auth_context))) |
-	STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(int))) |
-	STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(int)))
-};
-
-krb5_error_code krb5_auth_con_genaddrs (
-		krb5_context			param1,
-		krb5_auth_context		param2,
-		int						param3,
-		int						param4))
-{
-	static krb5_auth_con_genaddrs_ProcPtr = kUnresolvedSymbolAddress;
-
-	// if this symbol has not been setup yet...
-	if ((Ptr) krb5_auth_con_genaddrs_ProcPtr == (Ptr) kUnresolvedSymbolAddress)   
-		Find_Symbol((Ptr*) &krb5_auth_con_genaddrs_ProcPtr,"\pkrb5_auth_con_genaddrs",krb5_auth_con_genaddrs_ProcInfo);
-	if ((Ptr) krb5_auth_con_genaddrs_ProcPtr != (Ptr) kUnresolvedSymbolAddress)
-		return krb5_auth_con_genaddrs_ProcPtr(param1, param2, param3, param4);
-}
-
-/* krb5_auth_con_getlocalsubkey */
-
-enum {
-	krb5_auth_con_getlocalsubkey_ProcInfo = kThinkCStackBased |
-	RESULT_SIZE(SIZE_CODE(sizeof(krb5_error_code))) |
-	STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(krb5_context))) |
-	STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(krb5_auth_context))) |
-	STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(krb5_keyblock**)))
-};
-
-krb5_error_code krb5_auth_con_getlocalsubkey (
-		krb5_context			param1,	
-		krb5_auth_context		param2,
-		krb5_keyblock**			param3)
-{
-	static krb5_auth_con_getlocalsubkey_ProcPtr = kUnresolvedSymbolAddress;
-
-	// if this symbol has not been setup yet...
-	if ((Ptr) krb5_auth_con_getlocalsubkey_ProcPtr == (Ptr) kUnresolvedSymbolAddress)   
-		Find_Symbol((Ptr*) &krb5_auth_con_getlocalsubkey_ProcPtr,"\pkrb5_auth_con_getlocalsubkey",krb5_auth_con_getlocalsubkey_ProcInfo);
-	if ((Ptr) krb5_auth_con_getlocalsubkey_ProcPtr != (Ptr) kUnresolvedSymbolAddress)
-		return krb5_auth_con_getlocalsubkey_ProcPtr(param1, param2, param3);
-}
-
-/* This code is directly from Technote 1077 */
-
-/*	changed Library name to be hardcoded at the top of the file
-	instead in the middle of the code */
-
-// Private functions
-
-static pascal OSErr GetSystemArchitecture(OSType *archType)
-{
-	static long sSysArchitecture = 0; // static so we only Gestalt once.
-	OSErr tOSErr = noErr;
-
-	*archType = kAnyCFragArch;   // assume wild architecture
-
-	// If we don't know the system architecture yet...
-	if (sSysArchitecture == 0)
-	// ...Ask Gestalt what kind of machine we are running on.
-	tOSErr = Gestalt(gestaltSysArchitecture, &sSysArchitecture);
-
-	if (tOSErr == noErr) // if no errors
-	{
-		if (sSysArchitecture == gestalt68k)   // 68k?
-			*archType = kMotorola68KCFragArch;   
-		else if (sSysArchitecture == gestaltPowerPC) // PPC?
-			*archType = kPowerPCCFragArch;       
-		else
-			tOSErr = gestaltUnknownErr;  // who knows what might be next?
-	}
-	return tOSErr;
-}
-
-static OSErr Find_Symbol(
-	Ptr* pSymAddr,
-	Str255 pSymName,
-	ProcInfoType pProcInfo)
-{
-	static ConnectionID sCID = 0;
-	static OSType sArchType = kAnyCFragArch;
-	static OSErr sOSErr = noErr;
-
-	Str255 errMessage;
-	Ptr mainAddr;
-	SymClass symClass;
-	ISAType tISAType;
-
-	if (sArchType == kAnyCFragArch)  // if architecture is undefined...
-	{
-		sCID = 0;     // ...force (re)connect to library
-		sOSErr = GetSystemArchitecture(&sArchType); // determine architecture
-		if (sOSErr != noErr)
-		return sOSErr; // OOPS!
-	}
-
-	if (sArchType == kMotorola68KArch) // ...for CFM68K
-		tISAType = kM68kISA | kCFM68kRTA;
-	else if (sArchType == kPowerPCArch)  // ...for PPC CFM
-		tISAType = kPowerPCISA | kPowerPCRTA;
-	else
-		sOSErr = gestaltUnknownErr; // who knows what might be next?
-
-	if (sCID == 0) // If we haven't connected to the library yet...
-	{
-		// NOTE: The library name is hard coded here.
-		// I try to isolate the glue code, one file per library.
-		// I have had developers pass in the Library name to allow
-		// plug-in type support. Additional code has to be added to
-		// each entry points glue routine to support multiple or
-		// switching connection IDs.
-		sOSErr = GetSharedLibrary(kLibraryName, sArchType, kLoadCFrag,
-		&sCID, &mainAddr, errMessage);
-		if (sOSErr != noErr)
-		return sOSErr; // OOPS!
-	}
-
-	// If we haven't looked up this symbol yet...
-	if ((Ptr) *pSymAddr == (Ptr) kUnresolvedCFragSymbolAddress)    
-	{
-		// ...look it up now
-		sOSErr = FindSymbol(sCID,pSymName,pSymAddr,&symClass);
-		if (sOSErr != noErr) // in case of error...
-		// ...clear the procedure pointer
-		*(Ptr*) &pSymAddr = (Ptr) kUnresolvedSymbolAddress;
-#	if !GENERATINGCFM // if this is classic 68k code...
-			*pSymAddr = (Ptr)NewRoutineDescriptorTrap((ProcPtr) *pSymAddr,
-			pProcInfo, tISAType);  // ...create a routine descriptor...
-#	endif
-	}
-	return sOSErr;
-}
diff --git a/src/mac/K5.CFMglue.cin b/src/mac/K5.CFMglue.cin
index 5c5d5b646..633eeb341 100644
--- a/src/mac/K5.CFMglue.cin
+++ b/src/mac/K5.CFMglue.cin
@@ -1,109 +1,6 @@
 /* Include prototypes for glue functions */
 #include <krb5.h>
+#include <des_int.h>
 
 /* Hardcode library fragment name here */
 #define kLibraryName "\pK5Library"
-#include <CodeFragments.h>
-
-// Private function prototypes
-
-static OSErr Find_Symbol(
-	Ptr* pSymAddr,
-	Str255 pSymName,
-	ProcInfoType pProcInfo);
-
-static pascal OSErr GetSystemArchitecture(OSType *archType);
-
-/* This code is directly from Technote 1077 */
-
-/*	changed Library name to be hardcoded at the top of the file
-	instead in the middle of the code */
-
-// Private functions
-
-static pascal OSErr GetSystemArchitecture(OSType *archType)
-{
-	static long sSysArchitecture = 0; // static so we only Gestalt once.
-	OSErr tOSErr = noErr;
-
-	*archType = kAnyCFragArch;   // assume wild architecture
-
-	// If we don't know the system architecture yet...
-	if (sSysArchitecture == 0)
-	// ...Ask Gestalt what kind of machine we are running on.
-	tOSErr = Gestalt(gestaltSysArchitecture, &sSysArchitecture);
-
-	if (tOSErr == noErr) // if no errors
-	{
-		if (sSysArchitecture == gestalt68k)   // 68k?
-			*archType = kMotorola68KCFragArch;   
-		else if (sSysArchitecture == gestaltPowerPC) // PPC?
-			*archType = kPowerPCCFragArch;       
-		else
-			tOSErr = gestaltUnknownErr;  // who knows what might be next?
-	}
-	return tOSErr;
-}
-
-static OSErr Find_Symbol(
-	Ptr* pSymAddr,
-	Str255 pSymName,
-	ProcInfoType pProcInfo)
-{
-	static ConnectionID sCID = 0;
-	static OSType sArchType = kAnyCFragArch;
-	static OSErr sOSErr = noErr;
-
-	Str255 errMessage;
-	Ptr mainAddr;
-	SymClass symClass;
-	ISAType tISAType;
-
-	if (sArchType == kAnyCFragArch)  // if architecture is undefined...
-	{
-		sCID = 0;     // ...force (re)connect to library
-		sOSErr = GetSystemArchitecture(&sArchType); // determine architecture
-		if (sOSErr != noErr)
-		return sOSErr; // OOPS!
-	}
-
-	if (sArchType == kMotorola68KArch) // ...for CFM68K
-		tISAType = kM68kISA | kCFM68kRTA;
-	else if (sArchType == kPowerPCArch)  // ...for PPC CFM
-		tISAType = kPowerPCISA | kPowerPCRTA;
-	else
-		sOSErr = gestaltUnknownErr; // who knows what might be next?
-
-	if (sCID == 0) // If we haven't connected to the library yet...
-	{
-		// NOTE: The library name is hard coded here.
-		// I try to isolate the glue code, one file per library.
-		// I have had developers pass in the Library name to allow
-		// plug-in type support. Additional code has to be added to
-		// each entry points glue routine to support multiple or
-		// switching connection IDs.
-		sOSErr = GetSharedLibrary(kLibraryName, sArchType, kLoadCFrag,
-		&sCID, &mainAddr, errMessage);
-		if (sOSErr != noErr)
-		return sOSErr; // OOPS!
-	}
-
-	// If we haven't looked up this symbol yet...
-	if ((Ptr) *pSymAddr == (Ptr) kUnresolvedCFragSymbolAddress)    
-	{
-		// ...look it up now
-		sOSErr = FindSymbol(sCID,pSymName,pSymAddr,&symClass);
-		if (sOSErr != noErr) // in case of error...
-		// ...clear the procedure pointer
-		*(Ptr*) &pSymAddr = (Ptr) kUnresolvedSymbolAddress;
-#	if !GENERATINGCFM // if this is classic 68k code...
-			*pSymAddr = (Ptr)NewRoutineDescriptorTrap((ProcPtr) *pSymAddr,
-			pProcInfo, tISAType);  // ...create a routine descriptor...
-#	endif
-	}
-	return sOSErr;
-}
-
-/* --------------------------------- */
-/* Autogenerated section starts here */
-/* --------------------------------- */
diff --git a/src/mac/K5.moreCFMglue.cin b/src/mac/K5.moreCFMglue.cin
new file mode 100644
index 000000000..6852f5d17
--- /dev/null
+++ b/src/mac/K5.moreCFMglue.cin
@@ -0,0 +1,7 @@
+#include <K5.CFMglue.h>
+
+Boolean KerberosV5LibraryIsPresent ()
+{
+	Ptr	symAddr;
+	return (Find_Symbol (&symAddr, "\pkrb5_get_credentials", krb5_get_credentials_ProcInfo)) == noErr;
+}
\ No newline at end of file
diff --git a/src/mac/kconfig/kconfig.prj b/src/mac/kconfig/kconfig.prj
index ec1606065..e45ca5e1e 100644
--- a/src/mac/kconfig/kconfig.prj
+++ b/src/mac/kconfig/kconfig.prj
diff --git a/src/mac/libraries/autoconf.h b/src/mac/libraries/autoconf.h
index ba6b6f0ae..3341630ad 100644
--- a/src/mac/libraries/autoconf.h
+++ b/src/mac/libraries/autoconf.h
@@ -13,8 +13,6 @@
 #define krb5_sigtype void
 #define HAVE_NETINET_IN_H 1
 #define ODBM 1
-/* Define to empty if the keyword does not work.  */
-#define const 
 
 /* Define if you can safely include both <sys/time.h> and <time.h>.  */
 #define TIME_WITH_SYS_TIME 1