Merge pull request #6420 from keszybz/gateway-name

Rename "gateway" to "_gateway" and other resolved changes
2017-08-01 09:43:41 +02:00
parent 7f18ef0a55 d5da77077d
commit f19ca6105e
9 changed files with 55 additions and 10 deletions
@@ -196,8 +196,11 @@ bool is_gateway_hostname(const char *hostname) {
         * synthetic "gateway" host. */

        return
-                strcaseeq(hostname, "gateway") ||
-                strcaseeq(hostname, "gateway.");
+                strcaseeq(hostname, "_gateway") || strcaseeq(hostname, "_gateway.")
+#if ENABLE_COMPAT_GATEWAY_HOSTNAME
+                || strcaseeq(hostname, "gateway") || strcaseeq(hostname, "gateway.")
+#endif
+                ;
 }

 int sethostname_idempotent(const char *s) {