From 1c8a238f9c7d0292584391a800f8140b7351c750 Mon Sep 17 00:00:00 2001 From: Richard Basch Date: Thu, 20 Feb 1997 06:10:37 +0000 Subject: dump.c kdb5_destroy.c kdb5_stash.c kdb5_util.c: Removed unneeded call to krb5_init_ets load_v4.c: Removed unneeded call to krb5_init_ets Check return value of krb5_init_context Call krb5_free_context prior to returning (error returns) git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9921 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/dbutil/dump.c | 1 - src/kadmin/dbutil/kdb5_destroy.c | 1 - src/kadmin/dbutil/kdb5_stash.c | 1 - src/kadmin/dbutil/kdb5_util.c | 1 - src/kadmin/dbutil/loadv4.c | 35 +++++++++++++++++++++++++++-------- 5 files changed, 27 insertions(+), 12 deletions(-) (limited to 'src/kadmin') diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c index 4289cd7d60..8d95746705 100644 --- a/src/kadmin/dbutil/dump.c +++ b/src/kadmin/dbutil/dump.c @@ -1951,7 +1951,6 @@ load_db(argc, argv) exit_status++; return; } - krb5_init_ets(kcontext); /* * Open the dumpfile diff --git a/src/kadmin/dbutil/kdb5_destroy.c b/src/kadmin/dbutil/kdb5_destroy.c index c2e9fc54b7..c9bdd604de 100644 --- a/src/kadmin/dbutil/kdb5_destroy.c +++ b/src/kadmin/dbutil/kdb5_destroy.c @@ -56,7 +56,6 @@ kdb5_destroy(argc, argv) int force = 0; krb5_init_context(&context); - krb5_init_ets(context); if (strrchr(argv[0], '/')) argv[0] = strrchr(argv[0], '/')+1; diff --git a/src/kadmin/dbutil/kdb5_stash.c b/src/kadmin/dbutil/kdb5_stash.c index ec9f4f9f5d..1d29de0f5c 100644 --- a/src/kadmin/dbutil/kdb5_stash.c +++ b/src/kadmin/dbutil/kdb5_stash.c @@ -60,7 +60,6 @@ char *argv[]; argv[0] = strrchr(argv[0], '/')+1; krb5_init_context(&context); - krb5_init_ets(context); dbname = global_params.dbname; realm = global_params.realm; diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c index 38a2c021a9..aafdb5ef07 100644 --- a/src/kadmin/dbutil/kdb5_util.c +++ b/src/kadmin/dbutil/kdb5_util.c @@ -132,7 +132,6 @@ int main(argc, argv) (long) retval); exit(1); } - krb5_init_ets(util_context); initialize_adb_error_table(); progname = (strrchr(argv[0], '/') ? strrchr(argv[0], '/')+1 : argv[0]); diff --git a/src/kadmin/dbutil/loadv4.c b/src/kadmin/dbutil/loadv4.c index 2562eb9479..238a187cf5 100644 --- a/src/kadmin/dbutil/loadv4.c +++ b/src/kadmin/dbutil/loadv4.c @@ -146,9 +146,11 @@ char *argv[]; extern kadm5_config_params global_params; long exp_time = 0; - krb5_init_context(&context); - - krb5_init_ets(context); + retval = krb5_init_context(&context); + if (retval) { + fprintf(stderr, "%s: Could not initialize krb5 context.\n", PROGNAME); + return; + } if (strrchr(argv[0], '/')) argv[0] = strrchr(argv[0], '/')+1; @@ -200,12 +202,14 @@ char *argv[]; if (!v4dumpfile) { usage(); + krb5_free_context(context); return; } if (!valid_enctype(master_keyblock.enctype)) { com_err(PROGNAME, KRB5_PROG_KEYTYPE_NOSUPP, "while setting up enctype %d", master_keyblock.enctype); + krb5_free_context(context); return; } @@ -218,6 +222,7 @@ char *argv[]; fprintf(stderr, "%s: The v5 database appears to already exist.\n", PROGNAME); + krb5_free_context(context); return; } tempdbname = dbname; @@ -226,6 +231,7 @@ char *argv[]; tempdbname = malloc(dbnamelen + 2); if (tempdbname == 0) { com_err(PROGNAME, ENOMEM, "allocating temporary filename"); + krb5_free_context(context); return; } strcpy(tempdbname, dbname); @@ -238,6 +244,7 @@ char *argv[]; if (!realm) { if (retval = krb5_get_default_realm(context, &defrealm)) { com_err(PROGNAME, retval, "while retrieving default realm name"); + krb5_free_context(context); return; } realm = defrealm; @@ -248,6 +255,7 @@ char *argv[]; if (retval = krb5_db_setup_mkey_name(context, mkey_name, realm, &mkey_fullname, &master_princ)) { com_err(PROGNAME, retval, "while setting up master key name"); + krb5_free_context(context); return; } @@ -272,10 +280,12 @@ master key name '%s'\n", read_mkey, read_mkey, stash_file, 0, &master_keyblock)) { com_err(PROGNAME, retval, "while reading master key"); + krb5_free_context(context); return; } if (retval = krb5_process_key(context, &master_encblock, &master_keyblock)) { com_err(PROGNAME, retval, "while processing master key"); + krb5_free_context(context); return; } @@ -284,6 +294,7 @@ master key name '%s'\n", &master_keyblock, &rblock.rseed)) { com_err(PROGNAME, retval, "while initializing random key generator"); (void) krb5_finish_key(context, &master_encblock); + krb5_free_context(context); return; } if (retval = krb5_db_create(context, tempdbname)) { @@ -292,6 +303,7 @@ master key name '%s'\n", (void) krb5_dbm_db_destroy(context, tempdbname); com_err(PROGNAME, retval, "while creating %sdatabase '%s'", tempdb ? "temporary " : "", tempdbname); + krb5_free_context(context); return; } if (retval = krb5_db_set_name(context, tempdbname)) { @@ -300,12 +312,14 @@ master key name '%s'\n", (void) krb5_dbm_db_destroy(context, tempdbname); com_err(PROGNAME, retval, "while setting active database to '%s'", tempdbname); + krb5_free_context(context); return; } if (v4init(PROGNAME, v4manual, v4dumpfile)) { (void) krb5_finish_key(context, &master_encblock); (void) krb5_finish_random_key(context, &master_encblock, &rblock.rseed); (void) krb5_dbm_db_destroy(context, tempdbname); + krb5_free_context(context); return; } if ((retval = krb5_db_init(context)) || @@ -315,6 +329,7 @@ master key name '%s'\n", (void) krb5_dbm_db_destroy(context, tempdbname); com_err(PROGNAME, retval, "while initializing the database '%s'", tempdbname); + krb5_free_context(context); return; } @@ -324,6 +339,7 @@ master key name '%s'\n", (void) krb5_finish_random_key(context, &master_encblock, &rblock.rseed); (void) krb5_dbm_db_destroy(context, tempdbname); com_err(PROGNAME, retval, "while adding K/M to the database"); + krb5_free_context(context); return; } @@ -334,6 +350,7 @@ master key name '%s'\n", (void) krb5_finish_random_key(context, &master_encblock, &rblock.rseed); (void) krb5_dbm_db_destroy(context, tempdbname); com_err(PROGNAME, retval, "while adding TGT service to the database"); + krb5_free_context(context); return; } @@ -377,16 +394,18 @@ master key name '%s'\n", * file with policy info. */ if (!tempdb && (retval = osa_adb_create_policy_db(&newparams))) { - com_err(PROGNAME, retval, "while creating policy database"); - kadm5_free_config_params(context, &newparams); - return; + com_err(PROGNAME, retval, "while creating policy database"); + kadm5_free_config_params(context, &newparams); + krb5_free_context(context); + return; } /* * Create the magic principals in the database. */ if (retval = kadm5_create_magic_princs(&newparams, context)) { - com_err(PROGNAME, retval, "while creating KADM5 principals"); - return; + com_err(PROGNAME, retval, "while creating KADM5 principals"); + krb5_free_context(context); + return; } krb5_free_context(context); -- cgit