Get KerberosAgent building again after KIM changes

ticket: 6055
status: open

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

diff --git a/src/kim/agent/mac/Identities.h b/src/kim/agent/mac/Identities.h
index 985ea362d8f527fbbf5ff878beb23cf76775fcf3..0d3cdd4e2168a2da6804213233e748a0d3a0218a 100644 (file)
--- a/src/kim/agent/mac/Identities.h
+++ b/src/kim/agent/mac/Identities.h
@@ -22,8 +22,6 @@
  * or implied warranty.
  */
 
-#import <Cocoa/Cocoa.h>
-
 @interface Identity : NSObject {
     kim_identity kimIdentity;
     int state;
@@ -31,13 +29,18 @@
     
 }
 
+@end
+
 
 @interface Identities : NSObject {
     NSArray *identitiesArray;
+    NSMutableArray *favoriteIdentitiesArray;
+    NSMutableArray *ccacheIdentitiesArray;
     NSConnection *threadConnection;
 
 }
 
+- (int) update;
 - (NSArray *) identities;
 
 @end

diff --git a/src/kim/agent/mac/Identities.m b/src/kim/agent/mac/Identities.m
index 651a49fe3b9b4e986abf47295446f60f5bc4c635..82b926d0968e839204d212b7f8c5f8dc4d1cbedb 100644 (file)
--- a/src/kim/agent/mac/Identities.m
+++ b/src/kim/agent/mac/Identities.m
@@ -37,9 +37,6 @@
     return self;
 }
 
-
-
-
 @end
 
 @implementation Identities
@@ -92,7 +89,7 @@
 
     threadConnection = NULL;
     favoriteIdentitiesArray = NULL;
-    ccacheIdentitiesArray = NULL:
+    ccacheIdentitiesArray = NULL;
     
     if (!err) {
         self = [super init];
@@ -106,9 +103,10 @@
     
     if (!err) {
         kim_favorite_identities favoriteIdentities = NULL;
+        kim_count i;
         kim_count count = 0;
         
-        err = kim_favorite_identities_create (&favorite_identities);
+        err = kim_favorite_identities_create (&favoriteIdentities);
         
         if (!err) {
             err = kim_favorite_identities_get_number_of_identities (favoriteIdentities,
@@ -117,13 +115,13 @@
         
         for (i = 0; !err && i < count; i++) {
             kim_identity kimIdentity = NULL;
-            Identity *identity = NULL:
+            Identity *identity = NULL;
             
             err = kim_favorite_identities_get_identity_at_index (favoriteIdentities, 
                                                                  i, &kimIdentity);
             
             if (!err) {
-                Identity *identity = [[[Identity alloc] initWithIdentity: kimIdentity] autorelease];
+                identity = [[[Identity alloc] initWithIdentity: kimIdentity] autorelease];
                 if (!identity) { err = ENOMEM; }
             }
              
@@ -179,7 +177,7 @@
 
 - (NSArray *) identities
 {
-    return identities;
+    return identitiesArray;
 }
 
 // ---------------------------------------------------------------------------
@@ -235,14 +233,14 @@
             err = KIM_NO_ERROR;
         }
         
-        kim_identity_free (&identity);
+        kim_identity_free (&kimIdentity);
         kim_ccache_free (&ccache);
     }
     
     kim_ccache_iterator_free (&iterator);
     
     if (err) {
-        NSLog (@"Got error %s", kim_error_message (err));
+        NSLog (@"Got error %s", error_message (err));
     }
     
     return err;

diff --git a/src/kim/agent/mac/KerberosAgentPrefix.pch b/src/kim/agent/mac/KerberosAgentPrefix.pch
index 88c32a80e7c9d2b51500b6156862f794dc3a930f..9ee9b62e84433997dcb7881c5bc6381a3ae5400b 100644 (file)
--- a/src/kim/agent/mac/KerberosAgentPrefix.pch
+++ b/src/kim/agent/mac/KerberosAgentPrefix.pch
@@ -8,6 +8,7 @@
 
 #include <Kerberos/Kerberos.h>
 #include <Kerberos/KerberosLoginPrivate.h>
+#include <Kerberos/kim.h>
 #include <Kerberos/KerberosDebug.h>
 #include <nameser.h>
 #include <netinet/in.h>

diff --git a/src/kim/lib/kim.exports b/src/kim/lib/kim.exports
index 5f94b3de167612c097b09371eb25e408689f8e64..8792c74f862a2489c7b3f430c1df3528c64355b2 100644 (file)
--- a/src/kim/lib/kim.exports
+++ b/src/kim/lib/kim.exports
@@ -70,6 +70,15 @@ kim_selection_hints_remember_identity
 kim_selection_hints_forget_identity
 kim_selection_hints_free
 
+kim_favorite_identities_create
+kim_favorite_identities_copy
+kim_favorite_identities_get_number_of_identities
+kim_favorite_identities_get_identity_at_index
+kim_favorite_identities_add_identity
+kim_favorite_identities_remove_identity
+kim_favorite_identities_remove_all_identities
+kim_favorite_identities_free
+
 kim_preferences_create
 kim_preferences_copy
 kim_preferences_set_options