From 159d70b8df4e71c0f81bdf5b66cee5f85fbd9c82 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Fri, 21 Jul 2000 23:39:47 +0000 Subject: [PATCH] use krb5_write_priv_message git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8743 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/kadm5/init_c.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/lib/kadm5/init_c.c b/lib/kadm5/init_c.c index 5b2236a17..b295fa377 100644 --- a/lib/kadm5/init_c.c +++ b/lib/kadm5/init_c.c @@ -360,16 +360,15 @@ kadm_connect(kadm5_client_context *ctx) krb5_data params, enc_data; ret = _kadm5_marshal_params(context, ctx->realm_params, ¶ms); - ret = krb5_mk_priv(context, - ctx->ac, - ¶ms, - &enc_data, - NULL); - - ret = krb5_write_message(context, &s, &enc_data); - + ret = krb5_write_priv_message(context, ctx->ac, &s, ¶ms); krb5_data_free(¶ms); - krb5_data_free(&enc_data); + if(ret) { + freeaddrinfo (ai); + close(s); + if(ctx->ccache == NULL) + krb5_cc_close(context, cc); + return ret; + } } else if(ret == KRB5_SENDAUTH_BADAPPLVERS) { close(s); @@ -383,8 +382,6 @@ kadm_connect(kadm5_client_context *ctx) freeaddrinfo (ai); return errno; } - freeaddrinfo (ai); - ret = krb5_sendauth(context, &ctx->ac, &s, KADMIN_OLD_APPL_VERSION, NULL, server, AP_OPTS_MUTUAL_REQUIRED,