Fixed krb5globals __initialize to use existing default cache instead of creatinga...

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

diff --git a/src/mac/Release notes b/src/mac/Release notes
index 8f2e73769566fd090afd4a7e1d5c2297508ad213..a6cd5f1ae68d5dabe527114bfc674ff33af3877a 100644 (file)
--- a/src/mac/Release notes
+++ b/src/mac/Release notes
@@ -46,4 +46,6 @@ Changes in 1.1a3:
  
 1.1b10
  Exported krb5 and gss interfaces to set cache name
- 
\ No newline at end of file
+ 
+1.1b11
+ Fixed krb5 globals lib to use existing default cache instead of creating a new one
\ No newline at end of file

diff --git a/src/mac/libraries/Kerberos v5 Globals/Krb5Globals.CFM.c b/src/mac/libraries/Kerberos v5 Globals/Krb5Globals.CFM.c
index 7bed7f1ab65c4a6e60cd39f9db02c81ed6ee40b1..923863d15512cb55b84bdd6574937590d87ca3c3 100644 (file)
--- a/src/mac/libraries/Kerberos v5 Globals/Krb5Globals.CFM.c
+++ b/src/mac/libraries/Kerberos v5 Globals/Krb5Globals.CFM.c
@@ -87,8 +87,10 @@ __initialize_Kerberos5GlobalsLib (
        if (ccErr != CC_NOERROR)
                return memFullErr;
                
-       gKerberos5GlobalsRefCount++;            
-       err = Krb5GlobalsSetUniqueDefaultCacheName ();
+       gKerberos5GlobalsRefCount++;
+       if (gKerberos5SystemDefaultCacheName == nil)
+               err = Krb5GlobalsSetUniqueDefaultCacheName ();
+
        return err;
 }
 

diff --git a/src/mac/version.r b/src/mac/version.r
index 58bb509da82506853bae3e2d8816041754a91872..52b92627ecf72890061c412e972e9d7d7c83df31 100644 (file)
--- a/src/mac/version.r
+++ b/src/mac/version.r
@@ -7,10 +7,10 @@
 #endif
 
 resource 'vers' (1) {
-       0x01, 0x10, beta, 0x10,
+       0x01, 0x10, beta, 0x11,
        verUS,
-       "1.1b10",
-       "1.1b10, Copyright 1996-1999 Massachusetts Institute of Technology"
+       "1.1b11",
+       "1.1b11, Copyright 1996-1999 Massachusetts Institute of Technology"
 };
 
 resource 'vers' (2) {