From dee8877cfaeaf60327e32eced3b3221be7be87d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Sun, 27 Jun 2004 22:54:02 +0000 Subject: [PATCH] use kadm5_ad_init_with_password_ctx git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14011 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kadmin/kadmin.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/kadmin/kadmin.c b/kadmin/kadmin.c index 721ac42a3..50c69d6fa 100644 --- a/kadmin/kadmin.c +++ b/kadmin/kadmin.c @@ -219,13 +219,16 @@ main(int argc, char **argv) KADM5_ADMIN_SERVICE, &conf, 0, 0, &kadm_handle); - else if (ad_flag) - ret = kadm5_ad_init_with_password(client_name, - NULL, - KADM5_ADMIN_SERVICE, - &conf, 0, 0, - &kadm_handle); - else if (keytab) { + else if (ad_flag) { + if (client_name == NULL) + krb5_errx(context, 1, "keytab mode require principal name"); + ret = kadm5_ad_init_with_password_ctx(context, + client_name, + NULL, + KADM5_ADMIN_SERVICE, + &conf, 0, 0, + &kadm_handle); + } else if (keytab) { if (client_name == NULL) krb5_errx(context, 1, "keytab mode require principal name"); ret = kadm5_c_init_with_skey_ctx(context,