diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-03-03 05:41:43 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-03-06 21:26:05 +0100 |
| commit | 6ce72a01abfcffd19313b50e15976582ae84c61c (patch) | |
| tree | dcce7f94f5acaef2304f10c6e75d3155d49683cc /source3/smbd/process.c | |
| parent | d95dbb86c592590dd5b64d2e307470943260834d (diff) | |
| download | samba-6ce72a01abfcffd19313b50e15976582ae84c61c.tar.gz samba-6ce72a01abfcffd19313b50e15976582ae84c61c.tar.bz2 samba-6ce72a01abfcffd19313b50e15976582ae84c61c.zip | |
s3:smbd: keep 'num_users' and 'users' directly under smbd_server_connection
The plan is to have users_struct as some kind of low level
abstraction for a smb1/smb2 session, that can be used by SMB_VFS modules.
metze
Diffstat (limited to 'source3/smbd/process.c')
| -rw-r--r-- | source3/smbd/process.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 113131828f..f87eccfdcd 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -2984,20 +2984,17 @@ static void smbd_id_cache_kill(struct messaging_context *msg_ctx, { const char *msg = (data && data->data) ? (const char *)data->data : "<NULL>"; - struct user_struct *validated_users; struct id_cache_ref id; struct smbd_server_connection *sconn = talloc_get_type_abort(private_data, struct smbd_server_connection); - validated_users = sconn->smb1.sessions.validated_users; - if (!id_cache_ref_parse(msg, &id)) { DEBUG(0, ("Invalid ?ID: %s\n", msg)); return; } - if (id_in_use(validated_users, &id)) { + if (id_in_use(sconn->users, &id)) { exit_server_cleanly(msg); } id_cache_delete_from_cache(&id); @@ -3265,9 +3262,7 @@ void smbd_process(struct tevent_context *ev_ctx, sconn->smb1.sessions.max_send = BUFFER_SIZE; sconn->smb1.sessions.last_session_tag = UID_FIELD_INVALID; /* this holds info on user ids that are already validated for this VC */ - sconn->smb1.sessions.validated_users = NULL; sconn->smb1.sessions.next_vuid = VUID_OFFSET; - sconn->smb1.sessions.num_validated_vuids = 0; conn_init(sconn); if (!init_dptrs(sconn)) { |