diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2003-04-28 18:51:35 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2003-04-28 18:51:35 +0000 |
| commit | 9fb5ab9a7bd8e881684c60c6063540aa9af3c7b2 (patch) | |
| tree | 87a550e292bd7eb36600284136c889e7b1e120c9 /src/lib | |
| parent | 70092f771bb2cf25a8a712d01ea3efa734af6141 (diff) | |
Incorporate krb5_os_context directly into krb5_context, since they're always
allocated and freed at the same time, even if in different files.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15378 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/os/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/krb5/os/init_os_ctx.c | 16 |
2 files changed, 7 insertions, 15 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index 2647d22f2..a53810545 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,9 @@ +2003-04-28 Ken Raeburn <raeburn@mit.edu> + + * init_os_ctx.c (krb5_os_init_context, krb5_os_free_context): + Don't allocate or free the os_context, since it's now a direct + member of the krb5_context, not separately allocated storage. + 2003-04-27 Sam Hartman <hartmans@mit.edu> * changepw.c (krb5_change_set_password): Call diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c index eb2321d42..7f2c2d593 100644 --- a/src/lib/krb5/os/init_os_ctx.c +++ b/src/lib/krb5/os/init_os_ctx.c @@ -333,17 +333,8 @@ krb5_os_init_context(krb5_context ctx) krb5_os_context os_ctx; krb5_error_code retval = 0; - if (ctx->os_context) - return 0; - - os_ctx = malloc(sizeof(struct _krb5_os_context)); - if (!os_ctx) - return ENOMEM; - memset(os_ctx, 0, sizeof(struct _krb5_os_context)); + os_ctx = ctx->os_context; os_ctx->magic = KV5M_OS_CONTEXT; - - ctx->os_context = (void *) os_ctx; - os_ctx->time_offset = 0; os_ctx->usec_offset = 0; os_ctx->os_flags = 0; @@ -453,9 +444,6 @@ krb5_os_free_context(krb5_context ctx) os_ctx = ctx->os_context; - if (!os_ctx) - return; - if (os_ctx->default_ccname) { free(os_ctx->default_ccname); os_ctx->default_ccname = 0; @@ -467,8 +455,6 @@ krb5_os_free_context(krb5_context ctx) } os_ctx->magic = 0; - free(os_ctx); - ctx->os_context = 0; if (ctx->profile) { profile_release(ctx->profile); |