diff options
| author | Theodore Tso <tytso@mit.edu> | 1996-11-08 22:28:43 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1996-11-08 22:28:43 +0000 |
| commit | 4bbce906813693aa821936c237b082bb51f0cb48 (patch) | |
| tree | 04fa6428098dbba30cf15e4a8f647d068ca3086e /src/kadmin | |
| parent | b7d0fdf7d891d191918de379194842d3f9837d48 (diff) | |
| download | krb5-4bbce906813693aa821936c237b082bb51f0cb48.tar.gz krb5-4bbce906813693aa821936c237b082bb51f0cb48.tar.xz krb5-4bbce906813693aa821936c237b082bb51f0cb48.zip | |
Check the error return from krb5_init_context(), and print an error
message if necessary.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9345 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin')
| -rw-r--r-- | src/kadmin/ktutil/ChangeLog | 6 | ||||
| -rw-r--r-- | src/kadmin/ktutil/ktutil.c | 7 | ||||
| -rw-r--r-- | src/kadmin/v4server/ChangeLog | 6 | ||||
| -rw-r--r-- | src/kadmin/v4server/admin_server.c | 10 |
4 files changed, 24 insertions, 5 deletions
diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog index 30b6966c1..afc6cfa2d 100644 --- a/src/kadmin/ktutil/ChangeLog +++ b/src/kadmin/ktutil/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 7 15:42:17 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * ktutil.c (main): Check the error return from + krb5_init_context(), and print an error message if + necessary. + Tue Sep 10 14:17:17 1996 Tom Yu <tlyu@mit.edu> * ktutil.M: remove ".so man1/header.doc" diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c index e03764e90..e74ab117c 100644 --- a/src/kadmin/ktutil/ktutil.c +++ b/src/kadmin/ktutil/ktutil.c @@ -45,8 +45,11 @@ int main(argc, argv) extern krb5_kt_ops krb5_ktf_writable_ops; int sci_idx; - krb5_init_context(&kcontext); - krb5_init_ets(kcontext); + retval = krb5_init_context(&kcontext); + if (retval) { + com_err(argv[0], retval, "while initializing krb5"); + exit(1); + } retval = krb5_kt_register(kcontext, &krb5_ktf_writable_ops); if (retval) { com_err(argv[0], retval, diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog index f83cf3ccc..77006b22e 100644 --- a/src/kadmin/v4server/ChangeLog +++ b/src/kadmin/v4server/ChangeLog @@ -1,3 +1,9 @@ +Fri Nov 8 17:27:20 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * admin_server.c (argv): Check the error return from + krb5_init_context(), and print an error message if + necessary. + Mon Oct 21 17:20:32 1996 Barry Jaspan <bjaspan@mit.edu> * admin_server.c: use params.admin_keytab instead of a hard-coded diff --git a/src/kadmin/v4server/admin_server.c b/src/kadmin/v4server/admin_server.c index fb6ff7d05..0abc7d822 100644 --- a/src/kadmin/v4server/admin_server.c +++ b/src/kadmin/v4server/admin_server.c @@ -95,13 +95,17 @@ char *argv[]; char *lrealm; extern char *optarg; extern int fascist_cpw; - + krb5_error_code retval; + #ifdef OVSEC_KADM memset(¶ms, 0, sizeof(params)); #endif - krb5_init_context(&kadm_context); - krb5_init_ets(kadm_context); + retval = krb5_init_context(&kadm_context); + if (retval) { + com_err(argv[0], retval, "while initializing krb5"); + exit(1); + } initialize_kadm_error_table(); prog[sizeof(prog)-1]='\0'; /* Terminate... */ (void) strncpy(prog, argv[0], sizeof(prog)-1); |