sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-05 20:58:40 +03:00
Code

r15589: While trying to understand the vuid code I found that security=share is broken

Browse Source 
right now. r14112 broke it, in 3.0.22 register_vuid for security=share returns
UID_FIELD_INVALID which in current 3_0 is turned into an error condition. This
makes sure that we only call register_vuid if sec!=share and meanwhile also
fixes a little memleak.

Then I also found a crash in smbclient with sec=share and hostmsdfs=yes.

There's another crash with sec=share when coming from w2k3, but I need sleep
now.

Someone (jerry,jra?) please review the sesssetup.c change.

Thanks,

Volker
(This used to be commit 8059d0ae395604503cad3d9f197928305923e3f5)
This commit is contained in:
Volker Lendecke 2006-05-13 23:05:53 +00:00 committed by Gerald (Jerry) Carter
parent 3895a5a1fc
commit ee7b4b47cb
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/libsmb/cliconnect.c
View File

@ -221,6 +221,7 @@ static BOOL cli_session_setup_plaintext(struct cli_state *cli, const char *user,
fstr_sprintf( lanman, "Samba %s", SAMBA_VERSION_STRING); fstr_sprintf( lanman, "Samba %s", SAMBA_VERSION_STRING);
memset(cli->outbuf, '\0', smb_size);
set_message(cli->outbuf,13,0,True); set_message(cli->outbuf,13,0,True);
SCVAL(cli->outbuf,smb_com,SMBsesssetupX); SCVAL(cli->outbuf,smb_com,SMBsesssetupX);
cli_setup_packet(cli); cli_setup_packet(cli);
@ -937,7 +938,8 @@ BOOL cli_send_tconX(struct cli_state *cli,
pass = ""; pass = "";
} }
if ((cli->sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) && *pass && passlen != 24) { if ((cli->sec_mode & NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) &&
pass && *pass && passlen != 24) {
if (!lp_client_lanman_auth()) { if (!lp_client_lanman_auth()) {
DEBUG(1, ("Server requested LANMAN password (share-level security) but 'client use lanman auth'" DEBUG(1, ("Server requested LANMAN password (share-level security) but 'client use lanman auth'"
" is disabled\n")); " is disabled\n"));

5
source3/smbd/password.c
View File

@ -155,10 +155,9 @@ int register_vuid(auth_serversupplied_info *server_info,
{ {
user_struct *vuser = NULL; user_struct *vuser = NULL;
/* Ensure no vuid gets registered in share level security. */ /* Paranoia check. */
if(lp_security() == SEC_SHARE) { if(lp_security() == SEC_SHARE) {
data_blob_free(&session_key); smb_panic("Tried to register uid in security=share\n");
return UID_FIELD_INVALID;
} }
/* Limit allowed vuids to 16bits - VUID_OFFSET. */ /* Limit allowed vuids to 16bits - VUID_OFFSET. */

32
source3/smbd/sesssetup.c
View File

@ -1127,20 +1127,30 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,
/* register the name and uid as being validated, so further connections /* register the name and uid as being validated, so further connections
to a uid can get through without a password, on the same VC */ to a uid can get through without a password, on the same VC */
/* register_vuid keeps the server info */ if (lp_security() == SEC_SHARE) {
sess_vuid = register_vuid(server_info, session_key, nt_resp.data ? nt_resp : lm_resp, sub_user); sess_vuid = UID_FIELD_INVALID;
data_blob_free(&nt_resp); data_blob_free(&session_key);
data_blob_free(&lm_resp); TALLOC_FREE(server_info);
} else {
/* register_vuid keeps the server info */
sess_vuid = register_vuid(server_info, session_key,
nt_resp.data ? nt_resp : lm_resp,
sub_user);
if (sess_vuid == UID_FIELD_INVALID) {
data_blob_free(&nt_resp);
data_blob_free(&lm_resp);
return ERROR_NT(nt_status_squash(NT_STATUS_LOGON_FAILURE));
}
if (sess_vuid == UID_FIELD_INVALID) { /* current_user_info is changed on new vuid */
return ERROR_NT(nt_status_squash(NT_STATUS_LOGON_FAILURE)); reload_services( True );
sessionsetup_start_signing_engine(server_info, inbuf);
} }
/* current_user_info is changed on new vuid */ data_blob_free(&nt_resp);
reload_services( True ); data_blob_free(&lm_resp);
sessionsetup_start_signing_engine(server_info, inbuf);
SSVAL(outbuf,smb_uid,sess_vuid); SSVAL(outbuf,smb_uid,sess_vuid);
SSVAL(inbuf,smb_uid,sess_vuid); SSVAL(inbuf,smb_uid,sess_vuid);