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/include | |
| parent | 70092f771bb2cf25a8a712d01ea3efa734af6141 (diff) | |
| download | krb5-9fb5ab9a7bd8e881684c60c6063540aa9af3c7b2.tar.gz krb5-9fb5ab9a7bd8e881684c60c6063540aa9af3c7b2.tar.xz krb5-9fb5ab9a7bd8e881684c60c6063540aa9af3c7b2.zip | |
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/include')
| -rw-r--r-- | src/include/ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/k5-int.h | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 53947082b0..15b7497071 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,8 @@ +2003-04-28 Ken Raeburn <raeburn@mit.edu> + + * k5-int.h (struct _krb5_context): Change os_context to be an + array of one _krb5_os_context instead of a void pointer. + 2003-04-17 Sam Hartman <hartmans@mit.edu> * k5-int.h: Add encode_krb5_setpw_req diff --git a/src/include/k5-int.h b/src/include/k5-int.h index ec7381bcf3..35d924bc3e 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -983,7 +983,16 @@ struct _krb5_context { int in_tkt_ktype_count; krb5_enctype *tgs_ktypes; int tgs_ktype_count; - void *os_context; + /* This used to be a void*, but since we always allocate them + together (though in different source files), and the types + are declared in the same header, might as well just combine + them. + + The array[1] is so the existing code treating the field as + a pointer will still work. For cleanliness, it should + eventually get changed to a single element instead of an + array. */ + struct _krb5_os_context os_context[1]; char *default_realm; profile_t profile; void *db_context; |