* server_init.c (kadm5_destroy): Call kadm5_free_config_params

	* server_acl.c: Include <ctype.h> for tolower().
	(acl_load_acl_file): Close acl file, even when acl_catchall_entry is
	    not set.

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

diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index e7f65f2b6234e57b804b1447c2fa1ac2eb3a0aba..afd953d5ad2ea9ae8d89cfca1d971e9268873b8b 100644 (file)
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,11 @@
+Mon Oct 13 10:59:22 1997  Ezra Peisach  <epeisach@mit.edu>
+
+       * server_init.c (kadm5_destroy): Call kadm5_free_config_params.
+
+       * server_acl.c: Include <ctype.h> for tolower().
+       (acl_load_acl_file): Close acl file, even when acl_catchall_entry is
+           not set.
+
 Wed Aug  6 20:22:23 1997  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in: Add flags to conditionally compile with Hesiod.

diff --git a/src/lib/kadm5/srv/server_acl.c b/src/lib/kadm5/srv/server_acl.c
index 35da5dd8083f41dea2dddb1f93023f55c1cb3cf1..36919c2b0315c7d59c5de39dba532cb00915596f 100644 (file)
--- a/src/lib/kadm5/srv/server_acl.c
+++ b/src/lib/kadm5/srv/server_acl.c
@@ -32,6 +32,7 @@
 #include "k5-int.h"
 #include "server_acl.h"
 #include <kadm5/server_internal.h>
+#include <ctype.h>
 
 typedef struct _acl_op_table {
     char       ao_op;
@@ -264,6 +265,8 @@ char tmpbuf[10];
            aentpp = &(*aentpp)->ae_next;
        }
 
+       fclose(afp);
+
        if (acl_catchall_entry) {
             strcpy(tmpbuf, acl_catchall_entry);
             if (*aentpp = acl_parse_line(tmpbuf)) {
@@ -275,7 +278,6 @@ char tmpbuf[10];
                         ("> catchall acl entry (%s) load failed\n",
                          acl_catchall_entry));
             }
-            fclose(afp);
        }
     }
     else {

diff --git a/src/lib/kadm5/srv/server_init.c b/src/lib/kadm5/srv/server_init.c
index 3f35d3521975f1b559f56bb4fb8431ebbb22ef42..cb15cf903bbcb2ef4dcb4ceed345d29c6cc2e641 100644 (file)
--- a/src/lib/kadm5/srv/server_init.c
+++ b/src/lib/kadm5/srv/server_init.c
@@ -291,6 +291,7 @@ kadm5_ret_t kadm5_destroy(void *server_handle)
     adb_policy_close(handle);
     krb5_db_fini(handle->context);
     krb5_free_principal(handle->context, handle->current_caller);
+    kadm5_free_config_params(handle->context, &handle->params);
     krb5_free_context(handle->context);
     handle->magic_number = 0;
     free(handle->lhandle);