diff options
| author | Andreas Schneider <asn@samba.org> | 2022-11-16 11:24:12 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2022-11-18 19:17:31 +0000 |
| commit | f03665bb7e8ea97699062630f2aa1bac4c5dfc7f (patch) | |
| tree | eaa39d82156c5c82f6f845161a4ede1dfa6204be | |
| parent | c213ead8c4c1b5287294a67e65f271fbb0b922b2 (diff) | |
| download | samba-f03665bb7e8ea97699062630f2aa1bac4c5dfc7f.tar.gz | |
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
| -rw-r--r-- | selftest/knownfail.d/sustitutions | 1 | ||||
| -rw-r--r-- | source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/selftest/knownfail.d/sustitutions b/selftest/knownfail.d/sustitutions deleted file mode 100644 index 800b8e03170..00000000000 --- 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 4fcb7681d84..ed262a8cd0d 100644 --- 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); |