diff options
| author | Greg Hudson <ghudson@mit.edu> | 2009-08-17 19:40:48 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2009-08-17 19:40:48 +0000 |
| commit | 1b8c72b7ef064eabb37d726e831b4618cb37d2c7 (patch) | |
| tree | 1df8b26a5af064e93ad262ce57801ebff42c80a8 /src/kadmin | |
| parent | f75549596ed93c658805f3df40ca4d9853b28213 (diff) | |
| download | krb5-1b8c72b7ef064eabb37d726e831b4618cb37d2c7.zip krb5-1b8c72b7ef064eabb37d726e831b4618cb37d2c7.tar.gz krb5-1b8c72b7ef064eabb37d726e831b4618cb37d2c7.tar.bz2 | |
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
Diffstat (limited to 'src/kadmin')
| -rw-r--r-- | src/kadmin/cli/kadmin.c | 6 | ||||
| -rw-r--r-- | src/kadmin/dbutil/kadm5_create.c | 2 | ||||
| -rw-r--r-- | src/kadmin/server/ovsec_kadmd.c | 2 | ||||
| -rw-r--r-- | src/kadmin/testing/util/tcl_kadm5.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c index fcfe4d9..814ace3 100644 --- a/src/kadmin/cli/kadmin.c +++ b/src/kadmin/cli/kadmin.c @@ -479,7 +479,7 @@ char *kadmin_startup(argc, argv) if (ccache_name) { printf("Authenticating as principal %s with existing credentials.\n", princstr); - retval = kadm5_init_with_creds(princstr, cc, + retval = kadm5_init_with_creds(context, princstr, cc, svcname, ¶ms, KADM5_STRUCT_VERSION, @@ -493,7 +493,7 @@ char *kadmin_startup(argc, argv) else printf("Authenticating as principal %s with default keytab.\n", princstr); - retval = kadm5_init_with_skey(princstr, keytab_name, + retval = kadm5_init_with_skey(context, princstr, keytab_name, svcname, ¶ms, KADM5_STRUCT_VERSION, @@ -503,7 +503,7 @@ char *kadmin_startup(argc, argv) } else { printf("Authenticating as principal %s with password.\n", princstr); - retval = kadm5_init_with_password(princstr, password, + retval = kadm5_init_with_password(context, princstr, password, svcname, ¶ms, KADM5_STRUCT_VERSION, diff --git a/src/kadmin/dbutil/kadm5_create.c b/src/kadmin/dbutil/kadm5_create.c index 894edf3..c2196e5 100644 --- a/src/kadmin/dbutil/kadm5_create.c +++ b/src/kadmin/dbutil/kadm5_create.c @@ -106,7 +106,7 @@ int kadm5_create_magic_princs(kadm5_config_params *params, retval = krb5_klog_init(context, "admin_server", progname, 0); if (retval) return retval; - if ((retval = kadm5_init(progname, NULL, NULL, params, + if ((retval = kadm5_init(context, progname, NULL, NULL, params, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, db5util_db_args, diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c index d2451f8..fb42c7b 100644 --- a/src/kadmin/server/ovsec_kadmd.c +++ b/src/kadmin/server/ovsec_kadmd.c @@ -303,7 +303,7 @@ int main(int argc, char *argv[]) krb5_klog_init(context, "admin_server", whoami, 1); - if((ret = kadm5_init("kadmind", NULL, + if((ret = kadm5_init(context, "kadmind", NULL, NULL, ¶ms, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, diff --git a/src/kadmin/testing/util/tcl_kadm5.c b/src/kadmin/testing/util/tcl_kadm5.c index 8de05e5..15ae99f 100644 --- a/src/kadmin/testing/util/tcl_kadm5.c +++ b/src/kadmin/testing/util/tcl_kadm5.c @@ -1600,13 +1600,13 @@ static int _tcl_kadm5_init_any(enum init_type init_type, ClientData clientData, } } - ret = kadm5_init_with_creds(client_name, cc, service_name, + ret = kadm5_init_with_creds(context, client_name, cc, service_name, ¶ms, struct_version, api_version, NULL, &server_handle); (void) krb5_cc_close(context, cc); } else - ret = kadm5_init(client_name, pass, service_name, ¶ms, + ret = kadm5_init(context, client_name, pass, service_name, ¶ms, struct_version, api_version, NULL, &server_handle); if (ret != KADM5_OK) { |