diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1995-04-19 18:03:52 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1995-04-19 18:03:52 +0000 |
| commit | 48a313c6b36d668a4aebc6c2950258d3b973a6ec (patch) | |
| tree | 1d0506ede636aec95cac77bb2d3256e20c168a28 /src | |
| parent | b9a420cb3c760ab8385ff9a92b52d9bc83707c9f (diff) | |
| download | krb5-48a313c6b36d668a4aebc6c2950258d3b973a6ec.tar.gz krb5-48a313c6b36d668a4aebc6c2950258d3b973a6ec.tar.xz krb5-48a313c6b36d668a4aebc6c2950258d3b973a6ec.zip | |
When default realm specified on command line, call krb5_set_default_realm so
that created keys will have the proper realm. (which may not be the same
as the machines default realm)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5379 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/admin/edit/ChangeLog | 6 | ||||
| -rw-r--r-- | src/admin/edit/kdb5_edit.c | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog index 4483235a7..24e60eb06 100644 --- a/src/admin/edit/ChangeLog +++ b/src/admin/edit/ChangeLog @@ -1,3 +1,9 @@ +Wed Apr 19 13:59:47 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> + + * kdb5_edit.c (kdb5_edit_Init): If a default realm is specified + (with -r), use krb5_set_default_realm so that created keys + will have the correct realm. + Thu Mar 23 23:28:26 1995 Theodore Y. Ts'o <tytso@dcl> * kdb5_edit.c (show_principal, parse_princ_args): Add diff --git a/src/admin/edit/kdb5_edit.c b/src/admin/edit/kdb5_edit.c index 584708e44..bc9b36870 100644 --- a/src/admin/edit/kdb5_edit.c +++ b/src/admin/edit/kdb5_edit.c @@ -205,7 +205,13 @@ char *kdb5_edit_Init(argc, argv) exit(1); } krb5_use_cstype(edit_context, &master_encblock, etype); - if (!cur_realm) { + + if (cur_realm) { + if (retval = krb5_set_default_realm(edit_context, cur_realm)) { + com_err(progname, retval, "while setting default realm name"); + exit(1); + } + } else { if (retval = krb5_get_default_realm(edit_context, &defrealm)) { com_err(progname, retval, "while retrieving default realm name"); exit(1); @@ -217,6 +223,7 @@ char *kdb5_edit_Init(argc, argv) } (void) strcpy(cur_realm, defrealm); } + (void) set_dbname_help(progname, dbname); exit_status = 0; /* It's OK if we get errors in set_dbname_help */ return request; |