From: Ralph Boehme Date: Mon, 4 Nov 2019 16:21:34 +0000 (+0100) Subject: smbdotconf: mark "defaultservice" with substitution="1" X-Git-Tag: ldb-2.1.0~554 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=736cb9d80c9fdba0369bd740aa82d88e45e0c4b9;p=thirdparty%2Fsamba.git smbdotconf: mark "defaultservice" with substitution="1" Signed-off-by: Ralph Boehme Reviewed-by: Stefan Metzmacher --- diff --git a/docs-xml/smbdotconf/misc/defaultservice.xml b/docs-xml/smbdotconf/misc/defaultservice.xml index 788506f4de9..2da968b9c2f 100644 --- a/docs-xml/smbdotconf/misc/defaultservice.xml +++ b/docs-xml/smbdotconf/misc/defaultservice.xml @@ -2,6 +2,7 @@ context="G" type="string" function="defaultservice" + substitution="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> default diff --git a/source3/param/service.c b/source3/param/service.c index 22f46f08894..76c12bd591d 100644 --- a/source3/param/service.c +++ b/source3/param/service.c @@ -111,6 +111,8 @@ int add_home_service(const char *service, const char *username, const char *home int find_service(TALLOC_CTX *ctx, const char *service_in, char **p_service_out) { + const struct loadparm_substitution *lp_sub = + loadparm_s3_global_substitution(); int iService; if (!service_in) { @@ -199,7 +201,7 @@ int find_service(TALLOC_CTX *ctx, const char *service_in, char **p_service_out) /* just possibly it's a default service? */ if (iService < 0) { - char *pdefservice = lp_defaultservice(talloc_tos()); + char *pdefservice = lp_defaultservice(talloc_tos(), lp_sub); if (pdefservice && *pdefservice && !strequal(pdefservice, *p_service_out)