Add magic number placeholder to statically initialized structures

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

diff --git a/src/admin/convert/ChangeLog b/src/admin/convert/ChangeLog
index cf51e35fff7fe4533a253e47071403c6c07777bf..49f52665d8a854c2da42d8eaac671e51b3bdba50 100644 (file)
--- 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 66228779dae1b503d2d75e88ef2d24c491cbde7b..17dd3862200681620ce431b5f3722a5ee1cd0351 100644 (file)
--- 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 456ed936236b860357128d500312f09f984d5f46..33f2adb979edf2fee5c34d52312c370f3e65bc8b 100644 (file)
--- 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 1af7f23aad8af8db894c2893e36f8356e437ba69..c66e24ef2100e4851040773f6f9cf43aa190fa59 100644 (file)
--- 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 fd5a027bd100aa503ea31a3762912ff324a7fc8b..06bb51e4f7d9d66e5a59141ef000b18e7d775d5d 100644 (file)
--- 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 e6baad94bca8367268f0c901aa27f5633bdfe14a..56b7e2d8d5e20ad850e602e08a1cebcc4e8b8eb7 100644 (file)
--- 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 5bd6a38ea75af4c48e36a902b4f1e12cd7c29794..bfd806a579be5a06c48885d204f603a3eb5aa1a2 100644 (file)
--- 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 de196966db8d17cce8bdf2f522b4b71e8267a332..4b32dbcc940dce96ec5f19084b931e101902dab7 100644 (file)
--- 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 bf5c57096432b44772e02a4c21b1b63713d17829..c63bc0da5c9039a03eb01570895f71fcb392007e 100644 (file)
--- 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 7f95524021c4c55943bc731782c8b0a1112c7e9f..c5ee07b0f093b5c7718986f7c5fce3e567488e66 100644 (file)
--- 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 cc2628fbab30618995fd57bc77e3a5785e263260..eeacb9dd8394934c3ff4caf8eeb7ee72f222564e 100644 (file)
--- 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 e917a2586fc83899bd49df4c1cdaaad1b175767f..18591ac7f6a0782c8804a4c77f0035054db6de7e 100644 (file)
--- 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 d6878a4957ab0b30a7c4b13fba4e4364f7d88236..12f26e698cb3a6cd53a65dfd0a87f049ab8c55d1 100644 (file)
--- 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 b7976942b2995c0f190f47237b483054dc3e6e9e..da5bce27a3e834e82f7233699a5204ecbf71d120 100644 (file)
--- 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 c2b4180975e53b7354e23b8264b7c6a69704820f..8eb67a7703b170950c86f9014522a79c63d1693b 100644 (file)
--- 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 00bc9448bfd1ec6fbf27c7a395dac94e742ae770..4ec38e72ceb2c26611bdb246a218891fcd3ea9f5 100644 (file)
--- 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 8a091e5f5cb274ec5d3bb07871ba2703187acc0e..7976db3eae1753100539fb4be95c0788b4e4e6d9 100644 (file)
--- 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 a898d47016578c0e106dba5cecb0670fb469c311..f905b04f66baaf69a69ac9e13b0d856781e0fed2 100644 (file)
--- 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 b3a30775344fea065508c91e6b6f427d663202a9..92c763295c2bebeeafad90aab720fa8648ac1416 100644 (file)
--- 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 cf347123a355f9bbd2a6ae391074a01480f51d86..6d6f93cdc5bccc21b54c7539d18d4bf6de006755 100644 (file)
--- 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
 };