prefork: add a magic number to prefork-interp

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/cprogs/cgi-fcgi-interp.c b/cprogs/cgi-fcgi-interp.c
index 3dbfef68f9b3007dfb1ac74975d0c6a2d0997453..2de4661dcadf6307866a9b156e59e7ef168cf61f 100644 (file)
--- a/cprogs/cgi-fcgi-interp.c
+++ b/cprogs/cgi-fcgi-interp.c
@@ -150,6 +150,9 @@ void fusagemessage(FILE *f) {
   fprintf(f, "usage: #!/usr/bin/cgi-fcgi-interp [<options>]\n");
 }
 
+void ident_addinit(void) {
+}
+
 static int stderr_copy;
 
 static void make_stderr_copy(void) {

diff --git a/cprogs/prefork-interp.c b/cprogs/prefork-interp.c
index 018a7919ddaa5f0a623e04cbc762f561e64afc91..6ee253fbd09ca96fad8e6489a76b6e865c9e9880 100644 (file)
--- a/cprogs/prefork-interp.c
+++ b/cprogs/prefork-interp.c
@@ -100,6 +100,11 @@ const struct cmdinfo cmdinfos[]= {
   { 0 }
 };
 
+void ident_addinit(void) {
+  char ident_magic[1] = { 0 };
+  sha256_update(&identsc, sizeof(ident_magic), ident_magic);
+}
+
 static void propagate_exit_status(int status, const char *what) {
   int r;
 

diff --git a/cprogs/prefork.c b/cprogs/prefork.c
index aaac059e1bb3a739d64957ebdf5bf9b3fa9ae4c6..909d0658ebf7f407f317f32164299b8306ff7101 100644 (file)
--- a/cprogs/prefork.c
+++ b/cprogs/prefork.c
@@ -206,6 +206,7 @@ void process_opts(const char *const **argv_io) {
   const char *smashedopt;
 
   sha256_init(&identsc);
+  ident_addinit();
 
   if ((*argv_io)[0] &&
       (smashedopt = (*argv_io)[1]) &&

diff --git a/cprogs/prefork.h b/cprogs/prefork.h
index 617a455939e25bf3ed03b1192e5a948e4e04fbd3..4a3f996e362c52cf531a10024df786238cad9798 100644 (file)
--- a/cprogs/prefork.h
+++ b/cprogs/prefork.h
@@ -83,5 +83,6 @@ void of_help(const struct cmdinfo *ci, const char *val);
 void of_iassign(const struct cmdinfo *ci, const char *val);
 void ident_addstring(const struct cmdinfo *ci, const char *string);
 void off_ident_addenv(const struct cmdinfo *ci, const char *name);
+void ident_addinit(void);
 
 #endif /*PREFORK_H*/