diff options
| author | Volker Lendecke <vl@samba.org> | 2008-04-30 17:42:39 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-05-05 18:28:59 +0200 |
| commit | bec1dfab27be3db888eeb451b4547f16e08e93c3 (patch) | |
| tree | f1b85618a0bf8ecd39a07d0039fb3b843477f6f1 /source3/smbd/service.c | |
| parent | a683625d7fe0be58da23b98828b445478df1606f (diff) | |
| download | samba-bec1dfab27be3db888eeb451b4547f16e08e93c3.tar.gz samba-bec1dfab27be3db888eeb451b4547f16e08e93c3.tar.bz2 samba-bec1dfab27be3db888eeb451b4547f16e08e93c3.zip | |
Remove "userdom_struct user" from "struct user_struct"
(This used to be commit 420de035237bb08bc470c9eb820f3da2edaa6805)
Diffstat (limited to 'source3/smbd/service.c')
| -rw-r--r-- | source3/smbd/service.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 7b0fdc8976..ff69fc4029 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -724,11 +724,12 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, return NULL; } } else { - if (!user_ok_token(vuser->user.unix_name, + if (!user_ok_token(vuser->server_info->unix_name, vuser->server_info->ptok, snum)) { DEBUG(2, ("user '%s' (from session setup) not " "permitted to access this share " - "(%s)\n", vuser->user.unix_name, + "(%s)\n", + vuser->server_info->unix_name, lp_servicename(snum))); conn_free(conn); *status = NT_STATUS_ACCESS_DENIED; @@ -738,8 +739,8 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, conn->vuid = vuser->vuid; conn->uid = vuser->server_info->uid; conn->gid = vuser->server_info->gid; - string_set(&conn->user,vuser->user.unix_name); - fstrcpy(user,vuser->user.unix_name); + string_set(&conn->user,vuser->server_info->unix_name); + fstrcpy(user,vuser->server_info->unix_name); guest = vuser->server_info->guest; } else if (lp_security() == SEC_SHARE) { NTSTATUS status2; |