svn commit: samba r3273 - in branches/SAMBA_3_0/source: libads utils
jra at samba.org
jra at samba.org
Wed Oct 27 00:41:49 GMT 2004
Author: jra
Date: 2004-10-27 00:41:41 +0000 (Wed, 27 Oct 2004)
New Revision: 3273
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0/source&rev=3273&nolog=1
Log:
Ensure we're consistent in the use of strchr_m for '@'.
Jeremy.
Modified:
branches/SAMBA_3_0/source/libads/ldap.c
branches/SAMBA_3_0/source/utils/net_ads.c
branches/SAMBA_3_0/source/utils/ntlm_auth.c
Changeset:
Modified: branches/SAMBA_3_0/source/libads/ldap.c
===================================================================
--- branches/SAMBA_3_0/source/libads/ldap.c 2004-10-27 00:41:39 UTC (rev 3272)
+++ branches/SAMBA_3_0/source/libads/ldap.c 2004-10-27 00:41:41 UTC (rev 3273)
@@ -2261,7 +2261,7 @@
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;
}
Modified: branches/SAMBA_3_0/source/utils/net_ads.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_ads.c 2004-10-27 00:41:39 UTC (rev 3272)
+++ branches/SAMBA_3_0/source/utils/net_ads.c 2004-10-27 00:41:41 UTC (rev 3273)
@@ -169,7 +169,7 @@
* 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 @@
}
use_in_memory_ccache();
- c = strchr(auth_principal, '@');
+ c = strchr_m(auth_principal, '@');
if (c) {
realm = ++c;
} else {
Modified: branches/SAMBA_3_0/source/utils/ntlm_auth.c
===================================================================
--- branches/SAMBA_3_0/source/utils/ntlm_auth.c 2004-10-27 00:41:39 UTC (rev 3272)
+++ branches/SAMBA_3_0/source/utils/ntlm_auth.c 2004-10-27 00:41:41 UTC (rev 3273)
@@ -920,7 +920,7 @@
if (NT_STATUS_IS_OK(status)) {
- domain = strchr(principal, '@');
+ domain = strchr_m(principal, '@');
if (domain == NULL) {
DEBUG(1, ("Did not get a valid principal "
More information about the samba-cvs
mailing list