From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 10 Aug 2020 19:19:39 +0000 (+0100)
Subject: Constify
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/051018257599e8a91f4ba2c2c99b72697eb0a4a4?ds=sidebyside

Constify
---

diff --git a/src/src/globals.c b/src/src/globals.c
index a5df06d98..aa94a276f 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -1529,8 +1529,8 @@ uschar *srs_recipient          = NULL;
 int     string_datestamp_offset= -1;
 int     string_datestamp_length= 0;
 int     string_datestamp_type  = -1;
-uschar *submission_domain      = NULL;
-uschar *submission_name        = NULL;
+const uschar *submission_domain = NULL;
+const uschar *submission_name  = NULL;
 int     syslog_facility        = LOG_MAIL;
 uschar *syslog_processname     = US"exim";
 uschar *system_filter          = NULL;
diff --git a/src/src/globals.h b/src/src/globals.h
index ea326959d..962da137f 100644
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -1015,8 +1015,8 @@ extern int     string_datestamp_length;/* After insertion by string_format */
 extern int     string_datestamp_type;  /* After insertion by string_format */
 extern BOOL    strip_excess_angle_brackets; /* Surrounding route-addrs */
 extern BOOL    strip_trailing_dot;     /* Remove dots at ends of domains */
-extern uschar *submission_domain;      /* Domain for submission mode */
-extern uschar *submission_name;        /* User name set from ACL */
+extern const uschar *submission_domain;/* Domain for submission mode */
+extern const uschar *submission_name;  /* User name set from ACL */
 extern BOOL    syslog_duplication;     /* FALSE => no duplicate logging */
 extern int     syslog_facility;        /* As defined by Syslog.h */
 extern BOOL    syslog_pid;             /* TRUE if PID on syslogs */
diff --git a/src/src/receive.c b/src/src/receive.c
index 76b4d378d..707fe07f7 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -2806,7 +2806,7 @@ From:) but we still want to ensure a valid Sender: if it is required. */
 if (  !from_header
    && ((!sender_host_address && !f.suppress_local_fixups) || f.submission_mode))
   {
-  uschar *oname = US"";
+  const uschar * oname = US"";
 
   /* Use the originator_name if this is a locally submitted message and the
   caller is not trusted. For trusted callers, use it only if -F was used to