summaryrefslogtreecommitdiffstats
path: root/source3/lib
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2014-04-14 14:37:29 +0200
committerJeremy Allison <jra@samba.org>2014-04-16 20:39:08 +0200
commitfae7e5d771d1c69bded1189b23335647023fa0f7 (patch)
tree7ae416ce7f3d12664b3fa75ac47c1e3a70514986 /source3/lib
parenta56c35a4deec9745ff27a66ddc85db48c5dfaf97 (diff)
downloadsamba-fae7e5d771d1c69bded1189b23335647023fa0f7.tar.gz
samba-fae7e5d771d1c69bded1189b23335647023fa0f7.tar.xz
samba-fae7e5d771d1c69bded1189b23335647023fa0f7.zip
lib-util: rename memdup to smb_memdup and fix all callers
Signed-off-by: Björn Baumbach <bb@sernet.de> Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/interface.c4
-rw-r--r--source3/lib/smbldap.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/interface.c b/source3/lib/interface.c
index 39dc9cb04c2..3edeae5742b 100644
--- a/source3/lib/interface.c
+++ b/source3/lib/interface.c
@@ -503,10 +503,10 @@ void load_interfaces(void)
total_probed = get_interfaces(talloc_tos(), &ifaces);
if (total_probed > 0) {
- probed_ifaces = (struct iface_struct *)memdup(ifaces,
+ probed_ifaces = (struct iface_struct *)smb_memdup(ifaces,
sizeof(ifaces[0])*total_probed);
if (!probed_ifaces) {
- DEBUG(0,("ERROR: memdup failed\n"));
+ DEBUG(0,("ERROR: smb_memdup failed\n"));
exit(1);
}
}
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 08640d070af..f2d58a54d19 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -353,7 +353,7 @@ static void smbldap_set_mod_internal(LDAPMod *** modlist, int modop, const char
mods[i]->mod_bvalues[j] = SMB_MALLOC_P(struct berval);
SMB_ASSERT(mods[i]->mod_bvalues[j] != NULL);
- mods[i]->mod_bvalues[j]->bv_val = (char *)memdup(blob->data, blob->length);
+ mods[i]->mod_bvalues[j]->bv_val = (char *)smb_memdup(blob->data, blob->length);
SMB_ASSERT(mods[i]->mod_bvalues[j]->bv_val != NULL);
mods[i]->mod_bvalues[j]->bv_len = blob->length;