diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1997-11-04 17:55:07 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1997-11-04 17:55:07 +0000 |
| commit | fac816f81b161c1d8c188a5997d5710af5267e59 (patch) | |
| tree | 7abc28e4f22dd6048b1029d23f6c1e3e99cafcbe /src/kadmin/dbutil/kdb5_util.c | |
| parent | d9a2c66ab5c2b6a446bb2fe07ed4875a39e162f2 (diff) | |
| download | krb5-fac816f81b161c1d8c188a5997d5710af5267e59.zip krb5-fac816f81b161c1d8c188a5997d5710af5267e59.tar.gz krb5-fac816f81b161c1d8c188a5997d5710af5267e59.tar.bz2 | |
* kdb5_util.c: Add flag indicating that policy db is to be closed.
Change '-f" option to "-sf" to indicate stash file on
command line.
* kdb5_stash.c (kdb5_stash): Indicate that policy db should be
closed, free context when done.
* kadm5_create.c (kadm5_create): Fix up memory leaks.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10265 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/dbutil/kdb5_util.c')
| -rw-r--r-- | src/kadmin/dbutil/kdb5_util.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c index aafdb5e..ead82aa 100644 --- a/src/kadmin/dbutil/kdb5_util.c +++ b/src/kadmin/dbutil/kdb5_util.c @@ -70,6 +70,7 @@ extern krb5_encrypt_block master_encblock; krb5_db_entry master_entry; krb5_pointer master_random; int valid_master_key = 0; +int close_policy_db = 0; char *progname; krb5_boolean manual_mkey = FALSE; @@ -169,7 +170,7 @@ int main(argc, argv) } else if (strcmp(*argv, "-M") == 0 && ARG_VAL) { global_params.mkey_name = optarg; global_params.mask |= KADM5_CONFIG_MKEY_NAME; - } else if (strcmp(*argv, "-f") == 0 && ARG_VAL) { + } else if (strcmp(*argv, "-sf") == 0 && ARG_VAL) { global_params.stash_file = optarg; global_params.mask |= KADM5_CONFIG_STASH_FILE; } else if (strcmp(*argv, "-m") == 0) { @@ -223,6 +224,12 @@ int main(argc, argv) return exit_status; (*cmd->func)(cmd_argc, cmd_argv); + + if(close_policy_db) { + (void) osa_adb_close_policy(policy_db); + } + kadm5_free_config_params(util_context, &global_params); + krb5_free_context(util_context); return exit_status; } |