diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-04 15:09:04 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-02-07 16:19:13 -0800 |
| commit | 8d503a4eedc2d395fc3053fb3aea20ed5df901e8 (patch) | |
| tree | 24e985570bf52258b09f1f87b9de5d0c96273967 /source3 | |
| parent | fc148e61f143ceeae63c0ad1a52d68548ad07aab (diff) | |
| download | samba-8d503a4eedc2d395fc3053fb3aea20ed5df901e8.tar.gz samba-8d503a4eedc2d395fc3053fb3aea20ed5df901e8.tar.xz samba-8d503a4eedc2d395fc3053fb3aea20ed5df901e8.zip | |
param: rename lp function and variable from "rootpreexec" to "root_preexec"
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm.c | 4 | ||||
| -rw-r--r-- | source3/smbd/service.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index e08e2c3ba2..fbd9a417db 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -155,7 +155,7 @@ static struct loadparm_service sDefault = .szInclude = NULL, .preexec = NULL, .postexec = NULL, - .rootpreexec = NULL, + .root_preexec = NULL, .root_postexec = NULL, .cups_options = NULL, .printcommand = NULL, @@ -202,7 +202,7 @@ static struct loadparm_service sDefault = .block_size = 1024, .dfree_cache_time = 0, .preexec_close = false, - .rootpreexec_close = false, + .root_preexec_close = false, .case_sensitive = Auto, .preserve_case = true, .short_preserve_case = true, diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 1324168707..30614cd2bc 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -698,7 +698,7 @@ static NTSTATUS make_connection_snum(struct smbd_server_connection *sconn, /* Preexecs are done here as they might make the dir we are to ChDir * to below */ /* execute any "root preexec = " line */ - if (*lp_rootpreexec(talloc_tos(), snum)) { + if (*lp_root_preexec(talloc_tos(), snum)) { char *cmd = talloc_sub_advanced(talloc_tos(), lp_servicename(talloc_tos(), SNUM(conn)), conn->session_info->unix_info->unix_name, @@ -706,11 +706,11 @@ static NTSTATUS make_connection_snum(struct smbd_server_connection *sconn, conn->session_info->unix_token->gid, conn->session_info->unix_info->sanitized_username, conn->session_info->info->domain_name, - lp_rootpreexec(talloc_tos(), snum)); + lp_root_preexec(talloc_tos(), snum)); DEBUG(5,("cmd=%s\n",cmd)); ret = smbrun(cmd,NULL); TALLOC_FREE(cmd); - if (ret != 0 && lp_rootpreexec_close(snum)) { + if (ret != 0 && lp_root_preexec_close(snum)) { DEBUG(1,("root preexec gave %d - failing " "connection\n", ret)); status = NT_STATUS_ACCESS_DENIED; |