sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

r12279: unix_mask_match has been broken for *ever*... (How).

Browse Source 
Ensure it returns a BOOL.
Jerry (and anyone else) please check this, I think
all uses are now correct but could do with another
set of eyes. Essential for 3.0.21 release.
Jeremy.
(This used to be commit 0c7b8a7637e760fcb6629092f36b610b8c71f5c9)
This commit is contained in:
Jeremy Allison 2005-12-16 01:41:12 +00:00 committed by Gerald (Jerry) Carter
parent 76796e212c
commit 10b5609a14
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/auth/pampass.c
View File

@ -310,7 +310,7 @@ static int smb_pam_passchange_conv(int num_msg,
DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_ON: trying to match |%s| to |%s|\n",
t->prompt, current_prompt ));
if (unix_wild_match(t->prompt, current_prompt) == 0) {
if (unix_wild_match(t->prompt, current_prompt)) {
fstrcpy(current_reply, t->reply);
DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_ON: We sent: %s\n", current_reply));
pwd_sub(current_reply, udp->PAM_username, udp->PAM_password, udp->PAM_newpassword);
@ -341,7 +341,7 @@ static int smb_pam_passchange_conv(int num_msg,
DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: trying to match |%s| to |%s|\n",
t->prompt, current_prompt ));
if (unix_wild_match(t->prompt, current_prompt) == 0) {
if (unix_wild_match(t->prompt, current_prompt)) {
fstrcpy(current_reply, t->reply);
DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: We sent: %s\n", current_reply));
pwd_sub(current_reply, udp->PAM_username, udp->PAM_password, udp->PAM_newpassword);

3
source3/lib/util.c
View File

@ -2640,6 +2640,7 @@ static BOOL unix_do_match(const char *regexp, const char *str)
/*******************************************************************
Simple case insensitive interface to a UNIX wildcard matcher.
Returns True if match, False if not.
*******************************************************************/
BOOL unix_wild_match(const char *pattern, const char *string)
@ -2660,7 +2661,7 @@ BOOL unix_wild_match(const char *pattern, const char *string)
if (strequal(p2,"*"))
return True;
return unix_do_match(p2, s2) == 0;
return unix_do_match(p2, s2);
}
/**********************************************************************

2
source3/modules/vfs_recycle.c
View File

@ -319,7 +319,7 @@ static BOOL matchparam(const char **haystack_list, const char *needle)
}
for(i=0; haystack_list[i] ; i++) {
if(!unix_wild_match(haystack_list[i], needle)) {
if(unix_wild_match(haystack_list[i], needle)) {
return True;
}
}

2
source3/smbd/chgpasswd.c
View File

@ -263,7 +263,7 @@ static int expect(int master, char *issue, char *expected)
pstrcpy( str, buffer);
trim_char( str, ' ', ' ');
if ((match = (unix_wild_match(expected, str) == 0))) {
if ((match = unix_wild_match(expected, str)) == True) {
/* Now data has started to return, lower timeout. */
timeout = lp_passwd_chat_timeout() * 100;
}