sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

strchr and strrchr are macros when compiling with optimisation in gcc, so we can't redefine them. damn.

Browse Source
This commit is contained in:
Andrew Tridgell
-
parent debb471267
commit c41fc06376
78 changed files with 276 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/lib/access.c
View File

@ -97,19 +97,19 @@ static int string_match(char *tok,char *s, char *invalid_char)
} else if (strcasecmp(tok, "FAIL") == 0) { /* fail: match any */
return (FAIL);
} else if (strcasecmp(tok, "LOCAL") == 0) { /* local: no dots */
if (strchr(s, '.') == 0 && strcasecmp(s, "unknown") != 0)
if (strchr_m(s, '.') == 0 && strcasecmp(s, "unknown") != 0)
return (True);
} else if (!strcasecmp(tok, s)) { /* match host name or address */
return (True);
} else if (tok[(tok_len = strlen(tok)) - 1] == '.') { /* network */
if (strncmp(tok, s, tok_len) == 0)
return (True);
} else if ((cut = strchr(tok, '/')) != 0) { /* netnumber/netmask */
} else if ((cut = strchr_m(tok, '/')) != 0) { /* netnumber/netmask */
if (isdigit((int)s[0]) && masked_match(tok, cut, s))
return (True);
} else if (strchr(tok, '*') != 0) {
} else if (strchr_m(tok, '*') != 0) {
*invalid_char = '*';
} else if (strchr(tok, '?') != 0) {
} else if (strchr_m(tok, '?') != 0) {
*invalid_char = '?';
}
return (False);
@ -252,7 +252,7 @@ static BOOL only_ipaddrs_in_list(char** list)
* was a network/netmask pair. Only network/netmask pairs
* have a '/' in them
*/
if ((p=strchr(*list, '/')) == NULL)
if ((p=strchr_m(*list, '/')) == NULL)
{
only_ip = False;
DEBUG(3,("only_ipaddrs_in_list: list has non-ip address (%s)\n", *list));