smbd/chgpasswd.c: Fixed (my) stupid bug where I was returning stack based variables. Doh !
smbd/trans2.c: Allows SETFILEINFO as well as QFILEINFO on directory handles.
Jeremy.
uint32 user_rid, SAM_USER_INFO_21 *usr);
BOOL do_samr_chgpasswd_user(struct cli_state *cli,
char *srv_name, char *user_name,
- char nt_newpass[516], char nt_oldhash[16],
- char lm_newpass[516], char lm_oldhash[16]);
+ char nt_newpass[516], uchar nt_oldhash[16],
+ char lm_newpass[516], uchar lm_oldhash[16]);
BOOL do_samr_unknown_38(struct cli_state *cli, char *srv_name);
BOOL do_samr_unknown_8(struct cli_state *cli,
POLICY_HND *domain_pol, uint16 switch_value);
void samr_io_r_unknown_38(char *desc, SAMR_R_UNKNOWN_38 *r_u, prs_struct *ps, int depth);
void make_enc_passwd(SAMR_ENC_PASSWD *pwd, char pass[512]);
void samr_io_enc_passwd(char *desc, SAMR_ENC_PASSWD *pwd, prs_struct *ps, int depth);
-void make_enc_hash(SAMR_ENC_HASH *hsh, char hash[16]);
+void make_enc_hash(SAMR_ENC_HASH *hsh, uchar hash[16]);
void samr_io_enc_hash(char *desc, SAMR_ENC_HASH *hsh, prs_struct *ps, int depth);
void make_samr_q_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u,
char *dest_host, char *user_name,
- char nt_newpass[516], char nt_oldhash[16],
- char lm_newpass[516], char lm_oldhash[16]);
+ char nt_newpass[516], uchar nt_oldhash[16],
+ char lm_newpass[516], uchar lm_oldhash[16]);
void samr_io_q_chgpasswd_user(char *desc, SAMR_Q_CHGPASSWD_USER *q_u, prs_struct *ps, int depth);
void make_samr_r_chgpasswd_user(SAMR_R_CHGPASSWD_USER *r_u, uint32 status);
void samr_io_r_chgpasswd_user(char *desc, SAMR_R_CHGPASSWD_USER *r_u, prs_struct *ps, int depth);
BOOL smb_password_ok(struct smb_passwd *smb_pass, uchar chal[8],
uchar lm_pass[24], uchar nt_pass[24]);
BOOL pass_check_smb(char *user, char *domain,
- uchar *chal, char *lm_pwd, char *nt_pwd,
+ uchar *chal, uchar *lm_pwd, uchar *nt_pwd,
struct passwd *pwd);
BOOL password_ok(char *user, char *password, int pwlen, struct passwd *pwd);
BOOL user_ok(char *user,int snum);
DEBUG(5,("rpc_read: offset end: 0x%x. data left to read:0x%x\n",
rdata->data->offset.end, data_to_read));
- return rdata->data->data != NULL;
+ return True;
}
/****************************************************************************
prs_struct *rparam, prs_struct *rdata)
{
int len;
- int alloc_hint = 0;
uint16 setup[2]; /* only need 2 uint16 setup parameters */
uint32 err;
{
RPC_HDR_RESP rhdr_resp;
smb_io_rpc_hdr_resp("rpc_hdr_resp", &rhdr_resp, rdata, 0);
- alloc_hint = rhdr_resp.alloc_hint;
}
DEBUG(5,("rpc_api_pipe: len left: %d smbtrans read: %d\n",
****************************************************************************/
BOOL do_samr_chgpasswd_user(struct cli_state *cli,
char *srv_name, char *user_name,
- char nt_newpass[516], char nt_oldhash[16],
- char lm_newpass[516], char lm_oldhash[16])
+ char nt_newpass[516], uchar nt_oldhash[16],
+ char lm_newpass[516], uchar lm_oldhash[16])
{
prs_struct data;
prs_struct rdata;
/*******************************************************************
makes a SAMR_ENC_HASH structure.
********************************************************************/
-void make_enc_hash(SAMR_ENC_HASH *hsh, char hash[16])
+void make_enc_hash(SAMR_ENC_HASH *hsh, uchar hash[16])
{
if (hsh == NULL) return;
********************************************************************/
void make_samr_q_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u,
char *dest_host, char *user_name,
- char nt_newpass[516], char nt_oldhash[16],
- char lm_newpass[516], char lm_oldhash[16])
+ char nt_newpass[516], uchar nt_oldhash[16],
+ char lm_newpass[516], uchar lm_oldhash[16])
{
int len_dest_host = strlen(dest_host);
int len_user_name = strlen(user_name);
become_root(True);
p->ntlmssp_validated = pass_check_smb(p->user_name, p->domain,
(uchar*)p->ntlmssp_chal.challenge,
- (char*)lm_owf, (char*)nt_owf, NULL);
+ lm_owf, nt_owf, NULL);
smb_pass = getsmbpwnam(p->user_name);
unbecome_root(True);
char *nt_password;
unsigned char trust_passwd[16];
+#if 0
/* machine account passwords */
pstring new_mach_pwd;
/* initialisation */
new_mach_pwd[0] = 0;
+#endif
if (!next_token(NULL, nt_user_name, NULL, sizeof(nt_user_name)))
{
/* establish a connection. */
res = res ? do_samr_chgpasswd_user(smb_cli,
srv_name, smb_cli->user_name,
- nt_newpass, (char*)nt_hshhash,
- lm_newpass, (char*)lm_hshhash) : False;
+ nt_newpass, nt_hshhash,
+ lm_newpass, lm_hshhash) : False;
/* close the session */
cli_nt_session_close(smb_cli);
BOOL check_lanman_password(char *user, uchar *pass1,
uchar *pass2, struct smb_passwd **psmbpw)
{
+ static uchar null_pw[16];
uchar unenc_new_pw[16];
uchar unenc_old_pw[16];
- uchar null_pw[16];
struct smb_passwd *smbpw;
*psmbpw = NULL;
{
uchar no_pw[14];
memset(no_pw, '\0', 14);
- E_P16((uchar *)no_pw, (uchar *)null_pw);
+ E_P16(no_pw, null_pw);
smbpw->smb_passwd = null_pw;
} else if (smbpw->smb_passwd == NULL) {
DEBUG(0,("check_lanman_password: no lanman password !\n"));
BOOL change_lanman_password(struct smb_passwd *smbpw, uchar *pass1, uchar *pass2)
{
+ static uchar null_pw[16];
uchar unenc_new_pw[16];
- uchar null_pw[16];
BOOL ret;
if (smbpw == NULL)
{
uchar no_pw[14];
memset(no_pw, '\0', 14);
- E_P16((uchar *)no_pw, (uchar *)null_pw);
+ E_P16(no_pw, null_pw);
smbpw->smb_passwd = null_pw;
} else if (smbpw->smb_passwd == NULL) {
DEBUG(0,("change_lanman_password: no lanman password !\n"));
struct smb_passwd **psmbpw, char *new_passwd,
int new_passwd_size)
{
+ static uchar null_pw[16];
+ static uchar null_ntpw[16];
struct smb_passwd *smbpw = NULL;
int new_pw_len;
uchar new_ntp16[16];
uchar unenc_old_ntpw[16];
uchar new_p16[16];
uchar unenc_old_pw[16];
- uchar null_pw[16];
- uchar null_ntpw[16];
char no_pw[2];
+
BOOL nt_pass_set = (ntdata != NULL && nthash != NULL);
become_root(False);
*/
(void)Get_Pwnam( user, True);
- if (pass_oem_change(user, (uchar*) data, (uchar*)(&data[516]), NULL, NULL))
+ if (pass_oem_change(user, (uchar*) data, (uchar *)&data[516], NULL, NULL))
{
SSVAL(*rparam,0,NERR_Success);
}
SMB hash
return True if the password is correct, False otherwise
****************************************************************************/
+
BOOL pass_check_smb(char *user, char *domain,
- uchar *chal, char *lm_pwd, char *nt_pwd,
+ uchar *chal, uchar *lm_pwd, uchar *nt_pwd,
struct passwd *pwd)
{
struct passwd *pass;
return(True);
}
- if (smb_password_ok(smb_pass, chal, (uchar *)lm_pwd, (uchar *)nt_pwd))
+ if (smb_password_ok(smb_pass, chal, lm_pwd, nt_pwd))
{
return(True);
}
}
return pass_check_smb(user, global_myworkgroup,
- challenge, password, password, pwd);
+ challenge, (uchar *)password, (uchar *)password, pwd);
}
return pass_check(user, password, pwlen, pwd,
files_struct *fsp = file_fsp(params,0);
info_level = SVAL(params,2);
- CHECK_FSP(fsp,conn);
- CHECK_ERROR(fsp);
+ if(fsp && fsp->open && fsp->is_directory) {
+ /*
+ * This is actually a SETFILEINFO on a directory
+ * handle (returned from an NT SMB). NT5.0 seems
+ * to do this call. JRA.
+ */
+ fname = fsp->fsp_name;
+ unix_convert(fname,conn,0,&bad_path,&st);
+ if (!check_name(fname,conn) || (!VALID_STAT(st) && dos_stat(fname,&st))) {
+ DEBUG(3,("fileinfo of %s failed (%s)\n",fname,strerror(errno)));
+ if((errno == ENOENT) && bad_path)
+ {
+ unix_ERR_class = ERRDOS;
+ unix_ERR_code = ERRbadpath;
+ }
+ return(UNIXERROR(ERRDOS,ERRbadpath));
+ }
+ } else {
+ /*
+ * Original code - this is an open file.
+ */
+ CHECK_FSP(fsp,conn);
+ CHECK_ERROR(fsp);
- fname = fsp->fsp_name;
- fd = fsp->fd_ptr->fd;
+ fname = fsp->fsp_name;
+ fd = fsp->fd_ptr->fd;
- if(sys_fstat(fd,&st)!=0) {
- DEBUG(3,("fstat of %s failed (%s)\n", fname, strerror(errno)));
- return(UNIXERROR(ERRDOS,ERRbadpath));
+ if (sys_fstat(fd,&st) != 0) {
+ DEBUG(3,("fstat of fnum %d failed (%s)\n",fsp->fnum, strerror(errno)));
+ return(UNIXERROR(ERRDOS,ERRbadfid));
+ }
}
} else {
/* set path info */