s3:rpc_server: Fix include directive substitution when enumerating shares

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15243

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Nov 18 19:17:31 UTC 2022 on sn-devel-184

diff --git a/selftest/knownfail.d/sustitutions b/selftest/knownfail.d/sustitutions
deleted file mode 100644 (file)
index 800b8e0..0000000
--- a/selftest/knownfail.d/sustitutions
+++ /dev/null
@@ -1 +0,0 @@
-samba3.substitutions.Test.for.share.enum.with.include.substitution

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 4fcb7681d84a717cd6c0327d03ab78b97d2206e2..ed262a8cd0d3acd7a1cdfa55a4287758ec492a87 100644 (file)
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -650,6 +650,14 @@ static WERROR init_srv_share_info_ctr(struct pipes_struct *p,
                added_home = register_homes_share(unix_name);
        }
 
+       /*
+        * We need to make sure to reload the services for the connecting user.
+        * It is possible that the we have includes with substitutions.
+        *
+        *  include = /etc/samba/%U.conf
+        */
+       reload_services(NULL, NULL, false);
+
        num_services = lp_numservices();
 
         allowed = talloc_zero_array(ctx, bool, num_services);