diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1997-10-13 15:03:13 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1997-10-13 15:03:13 +0000 |
| commit | 1ae0cd689f247ea50615d335cc1af3c41a842b4c (patch) | |
| tree | 55dbc06ea862ac2d0a8fa21c3cc557a59acbac06 /src/lib/kadm5/srv | |
| parent | 3c3006564bf7304eae692eee1c745fceea7d12da (diff) | |
| download | krb5-1ae0cd689f247ea50615d335cc1af3c41a842b4c.tar.gz krb5-1ae0cd689f247ea50615d335cc1af3c41a842b4c.tar.xz krb5-1ae0cd689f247ea50615d335cc1af3c41a842b4c.zip | |
* 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
Diffstat (limited to 'src/lib/kadm5/srv')
| -rw-r--r-- | src/lib/kadm5/srv/ChangeLog | 8 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/server_acl.c | 4 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/server_init.c | 1 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index e7f65f2b62..afd953d5ad 100644 --- 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 35da5dd808..36919c2b03 100644 --- 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 3f35d35219..cb15cf903b 100644 --- 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); |