From dbc82a9f19e2fb4b7f9d9d708a7c5ed0eb4f0778 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Tue, 5 Nov 2019 11:39:27 +0100 Subject: [PATCH] smbdotconf: mark "remote announce" with substitution="1" Signed-off-by: Ralph Boehme Reviewed-by: Stefan Metzmacher --- docs-xml/smbdotconf/misc/remoteannounce.xml | 1 + source3/nmbd/nmbd_sendannounce.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs-xml/smbdotconf/misc/remoteannounce.xml b/docs-xml/smbdotconf/misc/remoteannounce.xml index ad537c8b41f..04368987e06 100644 --- a/docs-xml/smbdotconf/misc/remoteannounce.xml +++ b/docs-xml/smbdotconf/misc/remoteannounce.xml @@ -1,6 +1,7 @@ diff --git a/source3/nmbd/nmbd_sendannounce.c b/source3/nmbd/nmbd_sendannounce.c index a9cdf1c5a58..48396ddf1c5 100644 --- a/source3/nmbd/nmbd_sendannounce.c +++ b/source3/nmbd/nmbd_sendannounce.c @@ -461,7 +461,7 @@ void announce_my_servers_removed(void) void announce_remote(time_t t) { - char *s; + char *s = NULL; const char *ptr; static time_t last_time = 0; char *s2; @@ -469,13 +469,15 @@ void announce_remote(time_t t) char *comment; int stype = lp_default_server_announce(); TALLOC_CTX *frame = NULL; + const struct loadparm_substitution *lp_sub = + loadparm_s3_global_substitution(); if (last_time && (t < (last_time + REMOTE_ANNOUNCE_INTERVAL))) return; last_time = t; - s = lp_remote_announce(talloc_tos()); + s = lp_remote_announce(talloc_tos(), lp_sub); if (!*s) return; -- 2.47.3