diff options
author | Jeremy Allison <jra@samba.org> | 2010-02-17 10:46:42 -0800 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2010-02-22 15:50:34 +0100 |
commit | 615a5e83ee409fb196252984d697018241e1de62 (patch) | |
tree | a384a6e04f656760656cb91b0da78b02052e7faf | |
parent | 34d5071c1bbb7514d958968315bc182ea89a4b03 (diff) | |
download | samba-615a5e83ee409fb196252984d697018241e1de62.tar.gz samba-615a5e83ee409fb196252984d697018241e1de62.tar.xz samba-615a5e83ee409fb196252984d697018241e1de62.zip |
Fix bug #6557 - Do not work VFS full_audit
Re-arrange the operations order so SMB_VFS_CONNECT is done
first as root (to allow modules to correctly initialize themselves).
Reviewed modules to check if they needed CONNECT invoked as
a user (which we previously did) and it turns out any of them
that cared needed root permissions anyway.
Jeremy.
(cherry picked from commit 2eb33851a753cbd5594d44243802388cff5ae152)
-rw-r--r-- | source3/smbd/service.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 6248f5d5114..8490f17deae 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -649,7 +649,6 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, fstring dev; int ret; char addr[INET6_ADDRSTRLEN]; - bool on_err_call_dis_hook = false; NTSTATUS status; fstrcpy(dev, pdev); @@ -887,6 +886,18 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, return NULL; } + /* Invoke VFS make connection hook - must be the first + VFS operation we do. */ + + if (SMB_VFS_CONNECT(conn, lp_servicename(snum), + conn->server_info->unix_name) < 0) { + DEBUG(0,("make_connection: VFS make connection failed!\n")); + yield_connection(conn, lp_servicename(snum)); + conn_free(conn); + *pstatus = NT_STATUS_UNSUCCESSFUL; + return NULL; + } + /* * Fix compatibility issue pointed out by Volker. * We pass the conn->connectpath to the preexec @@ -917,6 +928,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, if (ret != 0 && lp_rootpreexec_close(snum)) { DEBUG(1,("root preexec gave %d - failing " "connection\n", ret)); + SMB_VFS_DISCONNECT(conn); yield_connection(conn, lp_servicename(snum)); conn_free(conn); *pstatus = NT_STATUS_ACCESS_DENIED; @@ -928,6 +940,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, if (!change_to_user(conn, conn->vuid)) { /* No point continuing if they fail the basic checks */ DEBUG(0,("Can't become connected user!\n")); + SMB_VFS_DISCONNECT(conn); yield_connection(conn, lp_servicename(snum)); conn_free(conn); *pstatus = NT_STATUS_LOGON_FAILURE; @@ -993,19 +1006,6 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, lp_aio_write_behind(snum)); } - /* Invoke VFS make connection hook - do this before the VFS_STAT call - to allow any filesystems needing user credentials to initialize - themselves. */ - - if (SMB_VFS_CONNECT(conn, lp_servicename(snum), - conn->server_info->unix_name) < 0) { - DEBUG(0,("make_connection: VFS make connection failed!\n")); - *pstatus = NT_STATUS_UNSUCCESSFUL; - goto err_root_exit; - } - - /* Any error exit after here needs to call the disconnect hook. */ - on_err_call_dis_hook = true; /* win2000 does not check the permissions on the directory during the tree connect, instead relying on permission @@ -1078,10 +1078,8 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, err_root_exit: change_to_root_user(); - if (on_err_call_dis_hook) { - /* Call VFS disconnect hook */ - SMB_VFS_DISCONNECT(conn); - } + /* Call VFS disconnect hook */ + SMB_VFS_DISCONNECT(conn); yield_connection(conn, lp_servicename(snum)); conn_free(conn); return NULL; |