From 93132f85fc356df4d72747863a0b424f3f273578 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Sat, 1 Oct 1994 02:19:49 +0000 Subject: [PATCH] Add magic number placeholder to statically initialized structures git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4419 dc483132-0cff-0310-8789-dd5450dbe970 --- src/admin/convert/ChangeLog | 4 ++++ src/admin/convert/kdb5_convert.c | 12 +++++++----- src/admin/create/ChangeLog | 4 ++++ src/admin/create/kdb5_create.c | 12 +++++++----- src/clients/kinit/ChangeLog | 5 +++++ src/clients/kinit/kinit.c | 1 + src/clients/ksu/ChangeLog | 4 ++++ src/clients/ksu/krb_auth_su.c | 1 + src/kdc/ChangeLog | 4 ++++ src/kdc/extern.c | 6 +++--- src/lib/krb5/ccache/file/ChangeLog | 5 +++++ src/lib/krb5/ccache/file/fcc_defops.c | 1 + src/lib/krb5/ccache/file/fcc_ops.c | 1 + src/lib/krb5/ccache/stdio/ChangeLog | 5 +++++ src/lib/krb5/ccache/stdio/scc_defops.c | 1 + src/lib/krb5/ccache/stdio/scc_ops.c | 1 + src/lib/krb5/rcache/ChangeLog | 4 ++++ src/lib/krb5/rcache/rcdef.c | 1 + src/tests/hammer/ChangeLog | 4 ++++ src/tests/hammer/kdc5_hammer.c | 1 + 20 files changed, 64 insertions(+), 13 deletions(-) diff --git a/src/admin/convert/ChangeLog b/src/admin/convert/ChangeLog index cf51e35ff..49f52665d 100644 --- a/src/admin/convert/ChangeLog +++ b/src/admin/convert/ChangeLog @@ -1,3 +1,7 @@ +Fri Sep 30 22:06:03 1994 Theodore Y. Ts'o (tytso@dcl) + + * kdb5_convert.c: Add placeholders for magic numbers + Thu Sep 29 22:21:21 1994 Theodore Y. Ts'o (tytso@dcl) * Makefile.in: Relink executable when libraries change. diff --git a/src/admin/convert/kdb5_convert.c b/src/admin/convert/kdb5_convert.c index 66228779d..17dd38622 100644 --- a/src/admin/convert/kdb5_convert.c +++ b/src/admin/convert/kdb5_convert.c @@ -118,23 +118,25 @@ krb5_principal master_princ; krb5_encrypt_block master_encblock; krb5_data tgt_princ_entries[] = { - {KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME}, - {0, 0} }; + {0, KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME}, + {0, 0, 0} }; krb5_data db_creator_entries[] = { - {sizeof("db_creation")-1, "db_creation"} }; + {0, sizeof("db_creation")-1, "db_creation"} }; /* XXX knows about contents of krb5_principal, and that tgt names are of form TGT/REALM@REALM */ krb5_principal_data tgt_princ = { - {0, 0}, /* krb5_data realm */ + 0, /* magic number */ + {0, 0, 0}, /* krb5_data realm */ tgt_princ_entries, /* krb5_data *data */ 2, /* int length */ KRB5_NT_SRV_INST /* int type */ }; krb5_principal_data db_create_princ = { - {0, 0}, /* krb5_data realm */ + 0, /* magic number */ + {0, 0, 0}, /* krb5_data realm */ db_creator_entries, /* krb5_data *data */ 1, /* int length */ KRB5_NT_SRV_INST /* int type */ diff --git a/src/admin/create/ChangeLog b/src/admin/create/ChangeLog index 456ed9362..33f2adb97 100644 --- a/src/admin/create/ChangeLog +++ b/src/admin/create/ChangeLog @@ -1,3 +1,7 @@ +Fri Sep 30 22:04:35 1994 Theodore Y. Ts'o (tytso@dcl) + + * kdb5_create.c: Add placeholders for magic numbers. + Thu Sep 29 22:19:37 1994 Theodore Y. Ts'o (tytso@dcl) * Makefile.in: Relink executable when libraries change. diff --git a/src/admin/create/kdb5_create.c b/src/admin/create/kdb5_create.c index 1af7f23aa..c66e24ef2 100644 --- a/src/admin/create/kdb5_create.c +++ b/src/admin/create/kdb5_create.c @@ -91,23 +91,25 @@ krb5_principal master_princ; krb5_encrypt_block master_encblock; krb5_data tgt_princ_entries[] = { - {KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME}, - {0, 0} }; + {0, KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME}, + {0, 0, 0} }; krb5_data db_creator_entries[] = { - {sizeof("db_creation")-1, "db_creation"} }; + {0, sizeof("db_creation")-1, "db_creation"} }; /* XXX knows about contents of krb5_principal, and that tgt names are of form TGT/REALM@REALM */ krb5_principal_data tgt_princ = { - {0, 0}, /* krb5_data realm */ + 0, /* magic number */ + {0, 0, 0}, /* krb5_data realm */ tgt_princ_entries, /* krb5_data *data */ 2, /* int length */ KRB5_NT_SRV_INST /* int type */ }; krb5_principal_data db_create_princ = { - {0, 0}, /* krb5_data realm */ + 0, /* magic number */ + {0, 0, 0}, /* krb5_data realm */ db_creator_entries, /* krb5_data *data */ 1, /* int length */ KRB5_NT_SRV_INST /* int type */ diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog index fd5a027bd..06bb51e4f 100644 --- a/src/clients/kinit/ChangeLog +++ b/src/clients/kinit/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 30 22:14:12 1994 Theodore Y. Ts'o (tytso@dcl) + + * kinit.c: Add magic number placeholder to statically defined + structures. + Mon Aug 8 22:26:11 1994 Theodore Y. Ts'o (tytso at tsx-11) * kinit.c: Change name of preauthentication diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c index e6baad94b..56b7e2d8d 100644 --- a/src/clients/kinit/kinit.c +++ b/src/clients/kinit/kinit.c @@ -50,6 +50,7 @@ krb5_parse_lifetime (time, len) } krb5_data tgtname = { + 0, KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME }; diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog index 5bd6a38ea..bfd806a57 100644 --- a/src/clients/ksu/ChangeLog +++ b/src/clients/ksu/ChangeLog @@ -1,3 +1,7 @@ +Fri Sep 30 22:14:41 1994 Theodore Y. Ts'o (tytso@dcl) + + * krb_auth_su.c: Add magic number placeholder to structures. + Tue Aug 9 20:29:47 1994 Tom Yu (tlyu@dragons-lair) * *.c: "upgrade" to C Classic :-) diff --git a/src/clients/ksu/krb_auth_su.c b/src/clients/ksu/krb_auth_su.c index de196966d..4b32dbcc9 100644 --- a/src/clients/ksu/krb_auth_su.c +++ b/src/clients/ksu/krb_auth_su.c @@ -30,6 +30,7 @@ void plain_dump_principal (); krb5_data tgtname = { + 0, KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME }; diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index bf5c57096..c63bc0da5 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,7 @@ +Fri Sep 30 22:13:13 1994 Theodore Y. Ts'o (tytso@dcl) + + * extern.c: Add placeholder for magic number + Thu Sep 29 00:03:59 1994 Theodore Y. Ts'o (tytso@dcl) * Makefile.in: Relink executable when library changes. diff --git a/src/kdc/extern.c b/src/kdc/extern.c index 7f9552402..c5ee07b0f 100644 --- a/src/kdc/extern.c +++ b/src/kdc/extern.c @@ -36,7 +36,7 @@ /* real declarations of KDC's externs */ krb5_rcache kdc_rcache; -krb5_data empty_string = {0, ""}; +krb5_data empty_string = {0, 0, ""}; krb5_timestamp kdc_infinity = KRB5_INT32_MAX; /* XXX */ krb5_deltat max_life_for_realm = KRB5_KDB_MAX_LIFE; /* XXX parameter per-realm? */ @@ -53,5 +53,5 @@ char *dbm_db_name = DEFAULT_KDB_FILE; krb5_keyblock tgs_key; krb5_kvno tgs_kvno; -static krb5_data tgs_data[3] = { {KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME}, {0, 0}}; -krb5_principal_data tgs_server_struct = { { 0, 0}, tgs_data, 2, 0}; +static krb5_data tgs_data[3] = { {0, KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME}, {0, 0, 0}}; +krb5_principal_data tgs_server_struct = { 0, { 0, 0, 0}, tgs_data, 2, 0}; diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog index cc2628fba..eeacb9dd8 100644 --- a/src/lib/krb5/ccache/file/ChangeLog +++ b/src/lib/krb5/ccache/file/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 30 21:54:20 1994 Theodore Y. Ts'o (tytso@dcl) + + * fcc_defops.c (krb5_cc_file_ops): + fcc_ops.c (krb5_fcc_ops): Add placeholder for magic number + Thu Sep 22 21:37:15 1994 Theodore Y. Ts'o (tytso@dcl) * fcc_destry.c (krb5_fcc_destroy): Make sure memory associated diff --git a/src/lib/krb5/ccache/file/fcc_defops.c b/src/lib/krb5/ccache/file/fcc_defops.c index e917a2586..18591ac7f 100644 --- a/src/lib/krb5/ccache/file/fcc_defops.c +++ b/src/lib/krb5/ccache/file/fcc_defops.c @@ -29,6 +29,7 @@ #include "fcc.h" krb5_cc_ops krb5_cc_file_ops = { + 0, "FILE", krb5_fcc_get_name, krb5_fcc_resolve, diff --git a/src/lib/krb5/ccache/file/fcc_ops.c b/src/lib/krb5/ccache/file/fcc_ops.c index d6878a495..12f26e698 100644 --- a/src/lib/krb5/ccache/file/fcc_ops.c +++ b/src/lib/krb5/ccache/file/fcc_ops.c @@ -29,6 +29,7 @@ #include "fcc.h" krb5_cc_ops krb5_fcc_ops = { + 0, "FILE", krb5_fcc_get_name, krb5_fcc_resolve, diff --git a/src/lib/krb5/ccache/stdio/ChangeLog b/src/lib/krb5/ccache/stdio/ChangeLog index b7976942b..da5bce27a 100644 --- a/src/lib/krb5/ccache/stdio/ChangeLog +++ b/src/lib/krb5/ccache/stdio/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 30 21:53:31 1994 Theodore Y. Ts'o (tytso@dcl) + + * scc_defops.c (krb5_cc_stdio_ops): + scc_ops.c (krb5_scc_ops): Add placeholder for magic number + Thu Sep 22 21:38:09 1994 Theodore Y. Ts'o (tytso@dcl) * scc_destry.c (krb5_scc_destroy): Make sure memory associated diff --git a/src/lib/krb5/ccache/stdio/scc_defops.c b/src/lib/krb5/ccache/stdio/scc_defops.c index c2b418097..8eb67a770 100644 --- a/src/lib/krb5/ccache/stdio/scc_defops.c +++ b/src/lib/krb5/ccache/stdio/scc_defops.c @@ -29,6 +29,7 @@ #include "scc.h" krb5_cc_ops krb5_cc_stdio_ops = { + 0, "STDIO", krb5_scc_get_name, krb5_scc_resolve, diff --git a/src/lib/krb5/ccache/stdio/scc_ops.c b/src/lib/krb5/ccache/stdio/scc_ops.c index 00bc9448b..4ec38e72c 100644 --- a/src/lib/krb5/ccache/stdio/scc_ops.c +++ b/src/lib/krb5/ccache/stdio/scc_ops.c @@ -29,6 +29,7 @@ #include "scc.h" krb5_cc_ops krb5_scc_ops = { + 0, "STDIO", krb5_scc_get_name, krb5_scc_resolve, diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog index 8a091e5f5..7976db3ea 100644 --- a/src/lib/krb5/rcache/ChangeLog +++ b/src/lib/krb5/rcache/ChangeLog @@ -1,3 +1,7 @@ +Fri Sep 30 21:59:08 1994 Theodore Y. Ts'o (tytso@dcl) + + * rc_def.c (krb5_rc_dfl_ops): Add placeholder for magic number + Thu Sep 29 22:11:20 1994 Theodore Y. Ts'o (tytso@dcl) * rc_dfl.c (krb5_rc_dfl_recover): krb5_rc_io_size was being called diff --git a/src/lib/krb5/rcache/rcdef.c b/src/lib/krb5/rcache/rcdef.c index a898d4701..f905b04f6 100644 --- a/src/lib/krb5/rcache/rcdef.c +++ b/src/lib/krb5/rcache/rcdef.c @@ -30,6 +30,7 @@ krb5_rc_ops krb5_rc_dfl_ops = { + 0, "dfl", krb5_rc_dfl_init, krb5_rc_dfl_recover, diff --git a/src/tests/hammer/ChangeLog b/src/tests/hammer/ChangeLog index b3a307753..92c763295 100644 --- a/src/tests/hammer/ChangeLog +++ b/src/tests/hammer/ChangeLog @@ -1,3 +1,7 @@ +Fri Sep 30 22:08:45 1994 Theodore Y. Ts'o (tytso@dcl) + + * kdc_hammer.c: Add placeholder for magic number + Thu Sep 29 22:59:09 1994 Theodore Y. Ts'o (tytso@dcl) * Makefile.in: Relink executable when libraries change diff --git a/src/tests/hammer/kdc5_hammer.c b/src/tests/hammer/kdc5_hammer.c index cf347123a..6d6f93cdc 100644 --- a/src/tests/hammer/kdc5_hammer.c +++ b/src/tests/hammer/kdc5_hammer.c @@ -54,6 +54,7 @@ krb5_parse_lifetime (time, len) } krb5_data tgtname = { + 0, KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME }; -- 2.26.2