Modify kadm5 initializers to accept krb5 contexts

Add krb5_context parameters to all kadm5 initialization functions.
This allows extended error information to be retrieved by the caller
when an error is returned.

ticket: 6547

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

6 files changed, 24 insertions, 6 deletions

diff --git a/src/lib/kadm5/unit-test/destroy-test.c b/src/lib/kadm5/unit-test/destroy-test.c
index 26100601a4..e9dd25a3ca 100644
--- a/src/lib/kadm5/unit-test/destroy-test.c
+++ b/src/lib/kadm5/unit-test/destroy-test.c
@@ -18,9 +18,15 @@ int main()
      int    x;
      void *server_handle;
      kadm5_server_handle_t handle;
+     krb5_context context;
 
+     ret = kadm5_init_krb5_context(&context);
+     if (ret != 0) {
+	 com_err("test", ret, "context init");
+	 exit(2);
+     }
      for(x = 0; x < TEST_NUM; x++) {
-	ret = kadm5_init("admin", "admin", KADM5_ADMIN_SERVICE, 0,
+	ret = kadm5_init(context, "admin", "admin", KADM5_ADMIN_SERVICE, 0,
 			 KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, NULL,
 			 &server_handle);
 	if(ret != KADM5_OK) {
diff --git a/src/lib/kadm5/unit-test/handle-test.c b/src/lib/kadm5/unit-test/handle-test.c
index 231d950393..b5bc82f02c 100644
--- a/src/lib/kadm5/unit-test/handle-test.c
+++ b/src/lib/kadm5/unit-test/handle-test.c
@@ -24,7 +24,7 @@ int main(int argc, char *argv[])
 
     kadm5_init_krb5_context(&context);
      
-    ret = kadm5_init("admin/none", "admin", KADM5_ADMIN_SERVICE, NULL,
+    ret = kadm5_init(context, "admin/none", "admin", KADM5_ADMIN_SERVICE, NULL,
 		     KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, NULL,
 		     &server_handle);
     if(ret != KADM5_OK) {
diff --git a/src/lib/kadm5/unit-test/init-test.c b/src/lib/kadm5/unit-test/init-test.c
index 8e9ec82841..8c7527cb93 100644
--- a/src/lib/kadm5/unit-test/init-test.c
+++ b/src/lib/kadm5/unit-test/init-test.c
@@ -10,10 +10,16 @@ int main()
      kadm5_ret_t ret;
      void *server_handle;
      kadm5_config_params params;
+     krb5_context context;
 
      memset(&params, 0, sizeof(params));
      params.mask |= KADM5_CONFIG_NO_AUTH;
-     ret = kadm5_init("admin", "admin", NULL, &params,
+     ret = kadm5_init_krb5_context(&context);
+     if (ret != 0) {
+	 com_err("init-test", ret, "while initializing krb5 context");
+	 exit(1);
+     }
+     ret = kadm5_init(context, "admin", "admin", NULL, &params,
 		      KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, NULL,
 		      &server_handle);
      if (ret == KADM5_RPC_ERROR)
diff --git a/src/lib/kadm5/unit-test/iter-test.c b/src/lib/kadm5/unit-test/iter-test.c
index 36081507b9..e3e0b746ab 100644
--- a/src/lib/kadm5/unit-test/iter-test.c
+++ b/src/lib/kadm5/unit-test/iter-test.c
@@ -8,13 +8,19 @@ int main(int argc, char **argv)
      void *server_handle;
      char **names;
      int count, princ, i;
+     krb5_context context;
 
      if (argc != 3) {
 	  fprintf(stderr, "Usage: %s [-princ|-pol] exp\n", argv[0]);
 	  exit(1);
      }
      princ = (strcmp(argv[1], "-princ") == 0);
-     
+
+     ret = kadm5_init_krb5_context(&context);
+     if (ret != KADM5_OK) {
+	 com_err("iter-test", ret, "while initializing context");
+	 exit(1);
+     }
      ret = kadm5_init("admin", "admin", KADM5_ADMIN_SERVICE, 0,
 		      KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, NULL,
 		      &server_handle);
diff --git a/src/lib/kadm5/unit-test/randkey-test.c b/src/lib/kadm5/unit-test/randkey-test.c
index 12e9e23990..a9c9d9856c 100644
--- a/src/lib/kadm5/unit-test/randkey-test.c
+++ b/src/lib/kadm5/unit-test/randkey-test.c
@@ -22,7 +22,7 @@ int main()
      kadm5_init_krb5_context(&context);
 
      krb5_parse_name(context, "testuser", &tprinc);
-     ret = kadm5_init("admin", "admin", KADM5_ADMIN_SERVICE, NULL,
+     ret = kadm5_init(context, "admin", "admin", KADM5_ADMIN_SERVICE, NULL,
 		      KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, NULL,
 		      &server_handle);
      if(ret != KADM5_OK) {
diff --git a/src/lib/kadm5/unit-test/setkey-test.c b/src/lib/kadm5/unit-test/setkey-test.c
index b0dcd0e7e2..27bd7b793a 100644
--- a/src/lib/kadm5/unit-test/setkey-test.c
+++ b/src/lib/kadm5/unit-test/setkey-test.c
@@ -118,7 +118,7 @@ main(int argc, char **argv)
        exit(1);
   }
 
-  ret = kadm5_init(authprinc, NULL, KADM5_ADMIN_SERVICE, NULL,
+  ret = kadm5_init(context, authprinc, NULL, KADM5_ADMIN_SERVICE, NULL,
 		   KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, NULL,
 		   &handle);
   if (ret) {