(*): handle krb5_init_context failure consistently

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9441 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-12-31 08:01:16 +00:00
parent 4dff86bc9f
commit 3ae0642b6f

View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -113,7 +113,9 @@ kadm5_s_init_with_password(const char *client_name,
kadm5_ret_t ret; kadm5_ret_t ret;
kadm5_server_context *ctx; kadm5_server_context *ctx;
krb5_init_context(&context); ret = krb5_init_context(&context);
if (ret)
return ret;
ret = kadm5_s_init_with_password_ctx(context, ret = kadm5_s_init_with_password_ctx(context,
client_name, client_name,
password, password,
@@ -163,7 +165,9 @@ kadm5_s_init_with_skey(const char *client_name,
kadm5_ret_t ret; kadm5_ret_t ret;
kadm5_server_context *ctx; kadm5_server_context *ctx;
krb5_init_context(&context); ret = krb5_init_context(&context);
if (ret)
return ret;
ret = kadm5_s_init_with_skey_ctx(context, ret = kadm5_s_init_with_skey_ctx(context,
client_name, client_name,
keytab, keytab,
@@ -213,7 +217,9 @@ kadm5_s_init_with_creds(const char *client_name,
kadm5_ret_t ret; kadm5_ret_t ret;
kadm5_server_context *ctx; kadm5_server_context *ctx;
krb5_init_context(&context); ret = krb5_init_context(&context);
if (ret)
return ret;
ret = kadm5_s_init_with_creds_ctx(context, ret = kadm5_s_init_with_creds_ctx(context,
client_name, client_name,
ccache, ccache,