diff options
| author | Volker Lendecke <vl@samba.org> | 2008-05-08 15:09:02 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-05-10 11:17:01 +0200 |
| commit | 776caa081bc36aac0ab7cc826836740f5bf0bf24 (patch) | |
| tree | 0656060f12bf3a84b1b6252dcb95a91626dfbcf3 /source3/smbd/service.c | |
| parent | 0c2bf9521efcf066268016bdab5d7a30bf879e26 (diff) | |
| download | samba-776caa081bc36aac0ab7cc826836740f5bf0bf24.tar.gz samba-776caa081bc36aac0ab7cc826836740f5bf0bf24.tar.bz2 samba-776caa081bc36aac0ab7cc826836740f5bf0bf24.zip | |
Replace nt_user_token with server_info in connection_struct
(This used to be commit a3738aef59e97d4533010b048534d937d36c0950)
Diffstat (limited to 'source3/smbd/service.c')
| -rw-r--r-- | source3/smbd/service.c | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 267ca3c29f..77ed320e07 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -725,7 +725,6 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, } conn->params->service = snum; - conn->nt_user_token = NULL; status = create_connection_server_info( conn, snum, vuser ? vuser->server_info : NULL, password, @@ -871,32 +870,13 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, { bool can_write = False; - NT_USER_TOKEN *token = conn->nt_user_token ? - conn->nt_user_token : - (vuser ? vuser->server_info->ptok : NULL); - /* - * I don't believe this can happen. But the - * logic above is convoluted enough to confuse - * automated checkers, so be sure. JRA. - */ - - if (token == NULL) { - DEBUG(0,("make_connection: connection to %s " - "denied due to missing " - "NT token.\n", - lp_servicename(snum))); - conn_free(conn); - *pstatus = NT_STATUS_ACCESS_DENIED; - return NULL; - } - - can_write = share_access_check(token, - lp_servicename(snum), - FILE_WRITE_DATA); + can_write = share_access_check(conn->server_info->ptok, + lp_servicename(snum), + FILE_WRITE_DATA); if (!can_write) { - if (!share_access_check(token, + if (!share_access_check(conn->server_info->ptok, lp_servicename(snum), FILE_READ_DATA)) { /* No access, read or write. */ |