Constify config_filename

diff --git a/src/src/globals.c b/src/src/globals.c
index b862015a2d073f7210b8bbe6d4034e98197b2993..23bd6900c657b63b3ff8f53869e226e1259290e0 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -508,7 +508,7 @@ int     clmacro_count          = 0;
 uschar *clmacros[MAX_CLMACROS];
 BOOL    config_changed         = FALSE;
 FILE   *config_file            = NULL;
 uschar *clmacros[MAX_CLMACROS];
 BOOL    config_changed         = FALSE;
 FILE   *config_file            = NULL;

-uschar *config_filename        = NULL;
+const uschar *config_filename  = NULL;

 int     config_lineno          = 0;
 #ifdef CONFIGURE_GROUP
 gid_t   config_gid             = CONFIGURE_GROUP;
 int     config_lineno          = 0;
 #ifdef CONFIGURE_GROUP
 gid_t   config_gid             = CONFIGURE_GROUP;

diff --git a/src/src/globals.h b/src/src/globals.h
index b3747a84afcb43ef44077b7a9e2f27670b7c78f4..6e6a5c2245613a6f574b7f180b9d5b026002ec9e 100644 (file)
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -281,7 +281,7 @@ extern uschar *clmacros[];             /* Copy of them, for re-exec */
 extern int     connection_max_messages;/* Max down one SMTP connection */
 extern BOOL    config_changed;         /* True if -C used */
 extern FILE   *config_file;            /* Configuration file */
 extern int     connection_max_messages;/* Max down one SMTP connection */
 extern BOOL    config_changed;         /* True if -C used */
 extern FILE   *config_file;            /* Configuration file */

-extern uschar *config_filename;        /* Configuration file name */
+extern const uschar *config_filename;  /* Configuration file name */

 extern gid_t   config_gid;             /* Additional group owner */
 extern int     config_lineno;          /* Line number */
 extern uschar *config_main_filelist;   /* List of possible config files */
 extern gid_t   config_gid;             /* Additional group owner */
 extern int     config_lineno;          /* Line number */
 extern uschar *config_main_filelist;   /* List of possible config files */

diff --git a/src/src/readconf.c b/src/src/readconf.c
index 27a834b3f7234cd21105b0f0a93e86a8f0f54a83..9c3f1a4bc86bf7d8d22d5f7c8513382cf455de08 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -27,7 +27,7 @@ static void readconf_options_auths(void);
 
 typedef struct config_file_item {
   struct config_file_item *next;
 
 typedef struct config_file_item {
   struct config_file_item *next;

-  uschar *filename;
+  const uschar *filename;

   FILE *file;
   int lineno;
 } config_file_item;
   FILE *file;
   int lineno;
 } config_file_item;