* krb524d.c: Include <krb5/adm_proto.h> for krb5_log_init()

	prototype.
	(cleanup_and_exit) Conditionalize krb5_kt_close on keytab being
	non-null.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13415 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 2c1d941a7fda16c106fcb7c798c0830e05f3e7f0..1b4762964dd063049cabafb632e98bcd5787de21 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -2,6 +2,8 @@
 
        * krb524d.c: Include <krb5/adm_proto.h> for krb5_log_init()
        prototype.
+       (cleanup_and_exit) Conditionalize krb5_kt_close on keytab being
+       non-null.
 
 2001-06-20  Mitchell Berger  <mitchb@mit.edu>
 

diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c
index 2812ebc0e6c6315d7c65beab6e99a836a6ad7852..7be5800ab097e04e037118dc83fcdc9585f68596 100644 (file)
--- a/src/krb524/krb524d.c
+++ b/src/krb524/krb524d.c
@@ -224,7 +224,7 @@ void cleanup_and_exit(ret, context)
      if (use_master && handle) {
          (void) kadm5_destroy(handle);
      }
-     if (use_keytab) krb5_kt_close(context, kt);
+     if (use_keytab &&kt) krb5_kt_close(context, kt);
      krb5_free_context(context);
      exit(ret);
 }