diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-07-04 07:36:09 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-07-04 07:36:09 +0000 |
| commit | 527e824293ee934ca5da0ef5424efe5ab7757248 (patch) | |
| tree | dd86fab3b0ba9cdbd86661dfae562fa123a8f53c /source3/rpcclient | |
| parent | 87fbb7092b8f8b2f0db0f361c3d625e19de57cd9 (diff) | |
| download | samba-527e824293ee934ca5da0ef5424efe5ab7757248.tar.gz samba-527e824293ee934ca5da0ef5424efe5ab7757248.tar.bz2 samba-527e824293ee934ca5da0ef5424efe5ab7757248.zip | |
strchr and strrchr are macros when compiling with optimisation in gcc, so we can't redefine them. damn.
(This used to be commit c41fc06376d1a2b83690612304e85010b5e5f3cf)
Diffstat (limited to 'source3/rpcclient')
| -rw-r--r-- | source3/rpcclient/rpcclient.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index 0d1b84f849..6e4d60d208 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -163,7 +163,7 @@ static char* next_command (char** cmdstr) if (!cmdstr || !(*cmdstr)) return NULL; - p = strchr(*cmdstr, ';'); + p = strchr_m(*cmdstr, ';'); if (p) *p = '\0'; pstrcpy(command, *cmdstr); @@ -588,11 +588,11 @@ static void usage(char *pname) case 'U': { char *lp; pstrcpy(username,optarg); - if ((lp=strchr(username,'%'))) { + if ((lp=strchr_m(username,'%'))) { *lp = 0; pstrcpy(password,lp+1); got_pass = True; - memset(strchr(optarg,'%')+1,'X',strlen(password)); + memset(strchr_m(optarg,'%')+1,'X',strlen(password)); } break; } |