diff options
| author | Gerald Carter <jerry@samba.org> | 2004-12-16 12:30:49 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-12-16 12:30:49 +0000 |
| commit | 8d91e07ef22ad3ed484b04bc4968380a24940696 (patch) | |
| tree | b5b8989f8da9ef7f852081f0460995386edd4b5d /source/libads/ads_struct.c | |
| parent | 1a878c865637feb80206c0dc599acebf7f4a46bd (diff) | |
| download | samba-3.0.10.tar.gz samba-3.0.10.tar.xz samba-3.0.10.zip | |
r4231: commiting changes to 3.0.10samba-3.0.10
Diffstat (limited to 'source/libads/ads_struct.c')
| -rw-r--r-- | source/libads/ads_struct.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/libads/ads_struct.c b/source/libads/ads_struct.c index 92f37093f46..e8546f86f50 100644 --- a/source/libads/ads_struct.c +++ b/source/libads/ads_struct.c @@ -31,7 +31,7 @@ char *ads_build_path(const char *realm, const char *sep, const char *field, int char *ret; int len; - r = strdup(realm); + r = SMB_STRDUP(realm); if (!r || !*r) return r; @@ -42,7 +42,7 @@ char *ads_build_path(const char *realm, const char *sep, const char *field, int len = (numbits+1)*(strlen(field)+1) + strlen(r) + 1; - ret = malloc(len); + ret = SMB_MALLOC(len); if (!ret) return NULL; @@ -87,12 +87,12 @@ ADS_STRUCT *ads_init(const char *realm, { ADS_STRUCT *ads; - ads = (ADS_STRUCT *)smb_xmalloc(sizeof(*ads)); + ads = SMB_XMALLOC_P(ADS_STRUCT); ZERO_STRUCTP(ads); - ads->server.realm = realm? strdup(realm) : NULL; - ads->server.workgroup = workgroup ? strdup(workgroup) : NULL; - ads->server.ldap_server = ldap_server? strdup(ldap_server) : NULL; + ads->server.realm = realm? SMB_STRDUP(realm) : NULL; + ads->server.workgroup = workgroup ? SMB_STRDUP(workgroup) : NULL; + ads->server.ldap_server = ldap_server? SMB_STRDUP(ldap_server) : NULL; /* we need to know if this is a foreign realm */ if (realm && *realm && !strequal(lp_realm(), realm)) { |