sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

r7024: reverting mistaken commit

Browse Source 
(This used to be commit c70c5c4ee9b14fbdb174f542607aceebe0e88470)
This commit is contained in:
Gerald Carter 2005-05-27 14:19:57 +00:00 committed by Gerald (Jerry) Carter
parent af52df2f1f
commit cc6df2e9cf
4 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/auth/auth.c
View File

@ -215,7 +215,6 @@ static NTSTATUS check_ntlm_password(const struct auth_context *auth_context,
if (!user_info || !auth_context || !server_info)
return NT_STATUS_LOGON_FAILURE;
DEBUG(3, ("check_ntlm_password: Checking password for unmapped user [%s]\\[%s]@[%s] with the new password interface\n",
user_info->client_domain.str, user_info->smb_name.str, user_info->wksta_name.str));
@ -306,19 +305,12 @@ static NTSTATUS check_ntlm_password(const struct auth_context *auth_context,
unix_username));
}
}
if (!NT_STATUS_IS_OK(nt_status)) {
if (lp_map_to_guest() == MAP_TO_GUEST_ON_VALID_DOMAIN_USER ){
/*user_info->smb_name.str = lp_guestaccount();*/
become_root();
nt_status = smb_pam_accountcheck(lp_guestaccount());
unbecome_root();
make_server_info_guest(server_info);
}else{
DEBUG(2, ("check_ntlm_password: Authentication for user [%s] -> [%s] FAILED with error %s\n",
user_info->smb_name.str, user_info->internal_username.str,
nt_errstr(nt_status)));
ZERO_STRUCTP(server_info);
}
DEBUG(2, ("check_ntlm_password: Authentication for user [%s] -> [%s] FAILED with error %s\n",
user_info->smb_name.str, user_info->internal_username.str,
nt_errstr(nt_status)));
ZERO_STRUCTP(server_info);
}
return nt_status;
}

1
source3/include/smb.h
View File

@ -1654,7 +1654,6 @@ struct unix_error_map {
#include "client.h"
*/
#define MAP_TO_GUEST_ON_VALID_DOMAIN_USER 3
/*
* Size of new password account encoding string. This is enough space to
* hold 11 ACB characters, plus the surrounding [] and a terminating null.

1
source3/param/loadparm.c
View File

@ -754,7 +754,6 @@ static const struct enum_list enum_smb_signing_vals[] = {
are rejected, unless the username does not exist, in which case it
is treated as a guest login
{MAP_TO_GUEST_ON_VALID_DOMAIN_USER, "Non-UNIX Valid Domain User"},
"Bad Password" means session setups with an invalid password
are treated as a guest login

17
source3/smbd/sesssetup.c
View File

@ -125,7 +125,6 @@ static NTSTATUS check_guest_password(auth_serversupplied_info **server_info)
return nt_status;
}
if (!make_user_info_guest(&user_info)) {
(auth_context->free)(&auth_context);
return NT_STATUS_NO_MEMORY;
@ -147,7 +146,6 @@ static int reply_spnego_kerberos(connection_struct *conn,
int length, int bufsize,
DATA_BLOB *secblob)
{
int map_domainuser_to_guest = 0;
DATA_BLOB ticket;
char *client, *p, *domain;
fstring netbios_domain_name;
@ -247,19 +245,14 @@ static int reply_spnego_kerberos(connection_struct *conn,
}
asprintf(&user, "%s%c%s", domain, *lp_winbind_separator(), client);
/* lookup the passwd struct, create a new user if necessary */
if (lp_map_to_guest() == MAP_TO_GUEST_ON_VALID_DOMAIN_USER ){
map_domainuser_to_guest == 1;
fstrcpy(user,lp_guestaccount());
pw = smb_getpwnam( user, real_username, True );
} else {
map_username( user );
pw = smb_getpwnam( user, real_username, True );
if (!pw) {
}
DEBUG(1,("Username %s is invalid on this system\n",user));
SAFE_FREE(user);
SAFE_FREE(client);
@ -272,20 +265,16 @@ static int reply_spnego_kerberos(connection_struct *conn,
sub_set_smb_name( real_username );
reload_services(True);
if (map_domainuser_to_guest == 1) {
make_server_info_guest(&server_info);
}else{
if (!NT_STATUS_IS_OK(ret = make_server_info_pw(&server_info, real_username, pw)))
if (!NT_STATUS_IS_OK(ret = make_server_info_pw(&server_info, real_username, pw)))
{
DEBUG(1,("make_server_info_from_pw failed!\n"));
SAFE_FREE(user);
SAFE_FREE(client);
data_blob_free(&ap_rep);
data_blob_free(&session_key);
return ERROR_NT(ret);
}
}
/* make_server_info_pw does not set the domain. Without this we end up
* with the local netbios name in substitutions for %D. */