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 | f8345c1b18904169666955c98474fa2d5894a007 (patch) | |
| tree | 53ca3d4f949b75fef36cd160aead63984db4ff9b | |
| parent | 0e1de2d773c274ae2981a69a05c61919b52143ee (diff) | |
| download | samba-f8345c1b18904169666955c98474fa2d5894a007.tar.gz samba-f8345c1b18904169666955c98474fa2d5894a007.tar.xz samba-f8345c1b18904169666955c98474fa2d5894a007.zip | |
r3273: Ensure we're consistent in the use of strchr_m for '@'.
Jeremy.
(This used to be commit 0f3f7b035b37bfc51d3a59d0472003c3d4ac1511)
| -rw-r--r-- | source3/libads/ldap.c | 2 | ||||
| -rw-r--r-- | source3/utils/net_ads.c | 4 | ||||
| -rw-r--r-- | source3/utils/ntlm_auth.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index e5d2dfb8d3f..749274298f1 100644 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -2261,7 +2261,7 @@ char *ads_pull_username(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, void *msg) breaks winbindd_getpwnam() */ ret = ads_pull_string(ads, mem_ctx, msg, "userPrincipalName"); - if (ret && (p = strchr(ret, '@'))) { + if (ret && (p = strchr_m(ret, '@'))) { *p = 0; return ret; } diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index 19311cde654..2202ee11e2f 100644 --- a/source3/utils/net_ads.c +++ b/source3/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/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index b2c155dfb2a..8296ccb5fba 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/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 " |