diff options
| author | Jeremy Allison <jra@samba.org> | 2004-10-27 00:41:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:03 -0500 |
| commit | 0f3f7b035b37bfc51d3a59d0472003c3d4ac1511 (patch) | |
| tree | e36e161e9baf10b37ba234512744e2fc727ac9e1 /source/utils | |
| parent | c7036f824627dc555185a52ed95d3e0132babcd8 (diff) | |
| download | samba-0f3f7b035b37bfc51d3a59d0472003c3d4ac1511.tar.gz samba-0f3f7b035b37bfc51d3a59d0472003c3d4ac1511.tar.xz samba-0f3f7b035b37bfc51d3a59d0472003c3d4ac1511.zip | |
r3273: Ensure we're consistent in the use of strchr_m for '@'.
Jeremy.
Diffstat (limited to 'source/utils')
| -rw-r--r-- | source/utils/net_ads.c | 4 | ||||
| -rw-r--r-- | source/utils/ntlm_auth.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c index 19311cde654..2202ee11e2f 100644 --- a/source/utils/net_ads.c +++ b/source/utils/net_ads.c @@ -169,7 +169,7 @@ retry: * extract the realm and convert to upper case. * This is only used to establish the connection. */ - if ((cp = strchr(ads->auth.user_name, '@'))!=0) { + if ((cp = strchr_m(ads->auth.user_name, '@'))!=0) { *cp++ = '\0'; ads->auth.realm = smb_xstrdup(cp); strupper_m(ads->auth.realm); @@ -1126,7 +1126,7 @@ static int net_ads_password(int argc, const char **argv) } use_in_memory_ccache(); - c = strchr(auth_principal, '@'); + c = strchr_m(auth_principal, '@'); if (c) { realm = ++c; } else { diff --git a/source/utils/ntlm_auth.c b/source/utils/ntlm_auth.c index b2c155dfb2a..8296ccb5fba 100644 --- a/source/utils/ntlm_auth.c +++ b/source/utils/ntlm_auth.c @@ -920,7 +920,7 @@ static void manage_gss_spnego_request(enum stdio_helper_mode stdio_helper_mode, if (NT_STATUS_IS_OK(status)) { - domain = strchr(principal, '@'); + domain = strchr_m(principal, '@'); if (domain == NULL) { DEBUG(1, ("Did not get a valid principal " |