diff options
| author | Jeremy Allison <jra@samba.org> | 2007-03-23 21:50:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:18:52 -0500 |
| commit | b93126ea12f057497fd5d97e79e5ebac1bcfe1ef (patch) | |
| tree | 4e8b01930f73a2eeb4526e6874707c9dfd55f8f0 /source3 | |
| parent | eb465894322c78688480827b55e084210a6228a6 (diff) | |
| download | samba-b93126ea12f057497fd5d97e79e5ebac1bcfe1ef.tar.gz samba-b93126ea12f057497fd5d97e79e5ebac1bcfe1ef.tar.bz2 samba-b93126ea12f057497fd5d97e79e5ebac1bcfe1ef.zip | |
r21953: One format fix, clarify a condition that the IBM
checker was worried about.
Jeremy.
(This used to be commit 70eec7b8ae6a4992b43df853dffc21dd91498390)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/sysacls.c | 2 | ||||
| -rw-r--r-- | source3/smbd/service.c | 22 |
2 files changed, 21 insertions, 3 deletions
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c index d31c1870c3..dcd7640714 100644 --- a/source3/lib/sysacls.c +++ b/source3/lib/sysacls.c @@ -181,7 +181,7 @@ char *sys_acl_to_text(SMB_ACL_T acl_d, ssize_t *len_p) id = idbuf; } else { id = gr->gr_name; - } + } case SMB_ACL_GROUP_OBJ: tag = "group"; break; diff --git a/source3/smbd/service.c b/source3/smbd/service.c index c96bcea4e2..79c618e7b3 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -915,10 +915,28 @@ 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->nt_user_token; + conn->nt_user_token : + (vuser ? vuser->nt_user_token : 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); + *status = NT_STATUS_ACCESS_DENIED; + return NULL; + } - BOOL can_write = share_access_check(token, + can_write = share_access_check(token, lp_servicename(snum), FILE_WRITE_DATA); |