1
0
mirror of https://github.com/samba-team/samba.git synced 2025-11-21 12:23:50 +03:00

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

This commit is contained in:
Andrew Tridgell
-
parent debb471267
commit c41fc06376
78 changed files with 276 additions and 278 deletions

View File

@@ -133,7 +133,7 @@ smbc_parse_path(const char *fname, char *server, char *share, char *path,
* exists ...
*/
if (strchr(p, '@')) {
if (strchr_m(p, '@')) {
pstring username, passwd, domain;
char *u = userinfo;
@@ -141,13 +141,13 @@ smbc_parse_path(const char *fname, char *server, char *share, char *path,
username[0] = passwd[0] = domain[0] = 0;
if (strchr(u, ';')) {
if (strchr_m(u, ';')) {
next_token(&u, domain, ";", sizeof(fstring));
}
if (strchr(u, ':')) {
if (strchr_m(u, ':')) {
next_token(&u, username, ":", sizeof(fstring));
@@ -276,11 +276,11 @@ struct smbc_server *smbc_server(char *server, char *share,
DEBUG(4,("smbc_server: server_n=[%s] server=[%s]\n", server_n, server));
if ((p=strchr(server_n,'#')) &&
if ((p=strchr_m(server_n,'#')) &&
(strcmp(p+1,"1D")==0 || strcmp(p+1,"01")==0)) {
fstrcpy(group, server_n);
p = strchr(group,'#');
p = strchr_m(group,'#');
*p = 0;
}