ipc.c: Fix for duplicate printer names being long.
loadparm.c: Set bNetWkstaUserLogon to false by default - new code in password.c
protects us.
nmbd_logonnames.c:
nmbd_namequery.c:
nmbd_namerelease.c: Debug messages fix.
password.c: SGI compile warning fix, fix for tcon() with bNetWkstaUserLogon call.
reply.c: SGI compile warning fix.
server.c Debug messages fix.
smbpass.c: Fix for incorrect pointer.
Jeremy.
BOOL check_oem_password(char *user, unsigned char *data,
struct smb_passwd **psmbpw, char *new_passwd,
int new_passwd_size);
-BOOL change_oem_password(struct smb_passwd *smbpw, char *new_passwd, BOOL flag);
+BOOL change_oem_password(struct smb_passwd *smbpw, char *new_passwd, BOOL override);
/*The following definitions come from client.c */
void generate_next_challenge(char *challenge);
BOOL set_challenge(char *challenge);
-BOOL last_challenge(char *challenge);
+BOOL last_challenge(unsigned char *challenge);
user_struct *get_valid_user_struct(uint16 vuid);
void invalidate_vuid(uint16 vuid);
char *validated_username(uint16 vuid);
if (pw && pw->pw_passwd) {
int i;
unsigned char md4_tmp[16];
- mdfour(md4_tmp, pw->pw_passwd, strlen(pw->pw_passwd));
+ mdfour(md4_tmp, (unsigned char *)pw->pw_passwd, strlen(pw->pw_passwd));
for (i=0;i<16;i++)
md4_inbuf[8+i] ^= md4_tmp[i];
}
/* Tell the namelist writer to write out a change. */
subrec->work_changed = True;
- DEBUG(0,("become_logon_server_success: Samba is now a logon server\
+ DEBUG(0,("become_logon_server_success: Samba is now a logon server \
for workgroup %s on subnet %s\n", work->work_group, subrec->subnet_name));
}
success = True;
putip((char *)&answer_ip,&nmb->answers->rdata[2]);
- DEBUG(5,("query_name_response: On subnet %s - positive response from IP %s\
+ DEBUG(5,("query_name_response: On subnet %s - positive response from IP %s \
for name %s. IP of that name is %s\n", subrec->subnet_name, inet_ntoa(p->ip),
namestr(question_name), inet_ntoa(answer_ip)));
if(bcast)
{
/* Someone sent a response. This shouldn't happen/ */
- DEBUG(1,("release_name_response: A response for releasing name %s was received on a\
+ DEBUG(1,("release_name_response: A response for releasing name %s was received on a \
broadcast subnet %s. This should not happen !\n", namestr(answer_name), subrec->subnet_name));
return;
}
Globals.client_code_page = DEFAULT_CLIENT_CODE_PAGE;
Globals.bTimeServer = False;
Globals.bBindInterfacesOnly = False;
- Globals.bNetWkstaUserLogon = True;
+ Globals.bNetWkstaUserLogon = False; /* This is now set to false by default as
+ the code in password.c protects us from this bug. */
Globals.bUnixPasswdSync = False;
Globals.bPasswdChatDebug = False;
}
} else {
if(newpwd->acct_ctrl & ACB_PWNOTREQ)
- sprintf((char *)&p[i*2], "NO PASSWORDXXXXXXXXXXXXXXXXXXXXX");
+ sprintf(p, "NO PASSWORDXXXXXXXXXXXXXXXXXXXXX");
else
- sprintf((char *)&p[i*2], "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
+ sprintf(p, "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
}
p += 32;
fgets(p,8191,f);
p[strlen(p)-1]='\0';
if (next_token(&p,tok,":") &&
+ (strlen(lp_printerdriver(snum)) == strlen(tok)) &&
(!strncmp(tok,lp_printerdriver(snum),strlen(lp_printerdriver(snum)))))
ok=1;
}
/*******************************************************************
get the last challenge sent
********************************************************************/
-BOOL last_challenge(char *challenge)
+BOOL last_challenge(unsigned char *challenge)
{
if (!challenge_sent) return(False);
memcpy(challenge,saved_challenge,8);
use it (ie. does it exist in the smbpasswd file).
*/
DEBUG(4,("smb_password_ok: Checking NT MD4 password\n"));
- if (smb_password_check(nt_pass, smb_pass->smb_nt_passwd, challenge))
+ if (smb_password_check(nt_pass, (uchar *)smb_pass->smb_nt_passwd, challenge))
{
DEBUG(4,("smb_password_ok: NT MD4 password check succeeded\n"));
return(True);
return True;
}
- if((smb_pass->smb_passwd != NULL) && smb_password_check(lm_pass, smb_pass->smb_passwd, challenge))
+ if((smb_pass->smb_passwd != NULL) && smb_password_check(lm_pass, (uchar *)smb_pass->smb_passwd, challenge))
{
DEBUG(4,("smb_password_ok: LM MD4 password check succeeded\n"));
return(True);
pstring pass2;
int level = lp_passwordlevel();
struct passwd *pass;
- char challenge[8];
+ uchar challenge[8];
struct smb_passwd *smb_pass;
BOOL update_encrypted = lp_update_encrypted();
BOOL challenge_done = False;
return(False);
}
- if (!cli_send_tconX(&pw_cli, "IPC$", "IPC", "", 1)) {
- DEBUG(1,("password server %s refused IPC$ connect\n", pw_cli.desthost));
- cli_ulogoff(&pw_cli);
- return False;
- }
-
/*
* This patch from Rob Nielsen <ran@adc.com> makes doing
* the NetWksaUserLogon a dynamic, rather than compile-time
if (lp_net_wksta_user_logon()) {
DEBUG(3,("trying NetWkstaUserLogon with password server %s\n", pw_cli.desthost));
+
+ if (!cli_send_tconX(&pw_cli, "IPC$", "IPC", "", 1)) {
+ DEBUG(0,("password server %s refused IPC$ connect\n", pw_cli.desthost));
+ cli_ulogoff(&pw_cli);
+ return False;
+ }
+
if (!cli_NetWkstaUserLogon(&pw_cli,user,local_machine)) {
- DEBUG(1,("password server %s failed NetWkstaUserLogon\n", pw_cli.desthost));
+ DEBUG(0,("password server %s failed NetWkstaUserLogon\n", pw_cli.desthost));
cli_tdis(&pw_cli);
cli_ulogoff(&pw_cli);
return False;
}
if (pw_cli.privilages == 0) {
- DEBUG(1,("password server %s gave guest privilages\n", pw_cli.desthost));
+ DEBUG(0,("password server %s gave guest privilages\n", pw_cli.desthost));
cli_tdis(&pw_cli);
cli_ulogoff(&pw_cli);
return False;
}
if (!strequal(pw_cli.eff_name, user)) {
- DEBUG(1,("password server %s gave different username %s\n",
+ DEBUG(0,("password server %s gave different username %s\n",
pw_cli.desthost,
pw_cli.eff_name));
cli_tdis(&pw_cli);
cli_ulogoff(&pw_cli);
return False;
}
+ cli_tdis(&pw_cli);
}
else {
DEBUG(3,("skipping NetWkstaUserLogon with password server %s\n", pw_cli.desthost));
DEBUG(3,("password server %s accepted the password\n", pw_cli.desthost));
- cli_tdis(&pw_cli);
cli_ulogoff(&pw_cli);
return(True);
return(ERROR(0, 0xc0000000|NT_STATUS_LOGON_FAILURE));
}
- if (!smb_password_ok(smb_trust_acct, smb_passwd, smb_nt_passwd))
+ if (!smb_password_ok(smb_trust_acct, (unsigned char *)smb_passwd, (unsigned char *)smb_nt_passwd))
{
DEBUG(0,("session_trust_account: Trust Account %s - password failed\n", user));
SSVAL(outbuf, smb_flg2, FLAGS2_32_BIT_ERROR_CODES);
return fd_ptr;
}
}
- DEBUG(1,("ERROR! Out of file_fd structures - perhaps increase MAX_OPEN_FILES?\
-n"));
+ DEBUG(1,("ERROR! Out of file_fd structures - perhaps increase MAX_OPEN_FILES?\n"));
return 0;
}