diff options
| author | Jim McDonough <jmcd@samba.org> | 2009-04-17 09:28:01 +0200 |
|---|---|---|
| committer | Jim McDonough <jmcd@samba.org> | 2009-04-17 09:28:01 +0200 |
| commit | 1214bf606d1cdf3f33b91ffe7cb4c349ce737d68 (patch) | |
| tree | 7294165dc644ddc3860831f02578c63dad7770ef /source3/smbd/uid.c | |
| parent | 75ccf934ac09e5af68cfd5afdd75a1b32ca24287 (diff) | |
| parent | 05ea8daacabe62b6c20770a8518192c44e7eb763 (diff) | |
| download | samba-1214bf606d1cdf3f33b91ffe7cb4c349ce737d68.tar.gz samba-1214bf606d1cdf3f33b91ffe7cb4c349ce737d68.tar.xz samba-1214bf606d1cdf3f33b91ffe7cb4c349ce737d68.zip | |
Merge branch 'master' of /home/jmcd/samba/git.samba.org/samba-master into mymaster
Diffstat (limited to 'source3/smbd/uid.c')
| -rw-r--r-- | source3/smbd/uid.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c index f8c55b1b8f..b8ed321a45 100644 --- a/source3/smbd/uid.c +++ b/source3/smbd/uid.c @@ -164,6 +164,10 @@ void conn_clear_vuid_cache(connection_struct *conn, uint16_t vuid) if (ent->vuid == vuid) { ent->vuid = UID_FIELD_INVALID; + /* Ensure we're not freeing an active pointer. */ + if (conn->server_info == ent->server_info) { + conn->server_info = NULL; + } TALLOC_FREE(ent->server_info); ent->read_only = False; ent->admin_user = False; @@ -216,6 +220,13 @@ bool change_to_user(connection_struct *conn, uint16 vuid) server_info = vuser ? vuser->server_info : conn->server_info; + if (!server_info) { + /* Invalid vuid sent - even with security = share. */ + DEBUG(2,("change_to_user: Invalid vuid %d used on " + "share %s.\n",vuid, lp_servicename(snum) )); + return false; + } + if (!check_user_ok(conn, vuid, server_info, snum)) { DEBUG(2,("change_to_user: SMB user %s (unix user %s, vuid %d) " "not permitted access to share %s.\n", |