From 5c0edfbab3eb8cdee5c8f893303389735b8a4243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= Date: Mon, 14 Apr 2014 14:37:29 +0200 Subject: [PATCH] lib-util: rename memdup to smb_memdup and fix all callers (bug #10556) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Baumbach Reviewed-by: Volker Lendecke (cherry picked from commit fae7e5d771d1c69bded1189b23335647023fa0f7) Conflicts: ctdb/lib/util/util.h Also renamed memdup() in source3/locking/brlock.c --- lib/util/samba_util.h | 2 +- lib/util/util.c | 2 +- source3/lib/interface.c | 4 ++-- source3/lib/smbldap.c | 2 +- source3/libsmb/clirap.c | 4 ++-- source3/locking/brlock.c | 2 +- source3/passdb/secrets.c | 2 +- source3/smbd/seal.c | 2 +- source3/smbd/sec_ctx.c | 4 ++-- source3/winbindd/winbindd_cache.c | 2 +- source4/smbd/process_thread.c | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h index f52347e..dcb92ee 100644 --- a/lib/util/samba_util.h +++ b/lib/util/samba_util.h @@ -739,7 +739,7 @@ char *smb_xstrndup(const char *s, size_t n); /** Like strdup but for memory. **/ -_PUBLIC_ void *memdup(const void *p, size_t size); +_PUBLIC_ void *smb_memdup(const void *p, size_t size); /** * Write a password to the log file. diff --git a/lib/util/util.c b/lib/util/util.c index 2b73f63..11d7753 100644 --- a/lib/util/util.c +++ b/lib/util/util.c @@ -693,7 +693,7 @@ char *smb_xstrndup(const char *s, size_t n) Like strdup but for memory. **/ -_PUBLIC_ void *memdup(const void *p, size_t size) +_PUBLIC_ void *smb_memdup(const void *p, size_t size) { void *p2; if (size == 0) diff --git a/source3/lib/interface.c b/source3/lib/interface.c index 39dc9cb..3edeae5 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 08640d0..f2d58a5 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; diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c index 7e6f8d7..036919f 100644 --- a/source3/libsmb/clirap.c +++ b/source3/libsmb/clirap.c @@ -67,14 +67,14 @@ bool cli_api(struct cli_state *cli, * talloc */ - *rparam = (char *)memdup(my_rparam, num_my_rparam); + *rparam = (char *)smb_memdup(my_rparam, num_my_rparam); if (*rparam == NULL) { goto fail; } *rprcnt = num_my_rparam; TALLOC_FREE(my_rparam); - *rdata = (char *)memdup(my_rdata, num_my_rdata); + *rdata = (char *)smb_memdup(my_rdata, num_my_rdata); if (*rdata == NULL) { goto fail; } diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 78c2538..8d98c9f 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -1774,7 +1774,7 @@ static int brl_traverse_fn(struct db_record *rec, void *state) /* In a traverse function we must make a copy of dbuf before modifying it. */ - locks = (struct lock_struct *)memdup(value.dptr, value.dsize); + locks = (struct lock_struct *)smb_memdup(value.dptr, value.dsize); if (!locks) { return -1; /* Terminate traversal. */ } diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c index f97510d..548b030 100644 --- a/source3/passdb/secrets.c +++ b/source3/passdb/secrets.c @@ -144,7 +144,7 @@ void *secrets_fetch(const char *key, size_t *size) return NULL; } - result = memdup(dbuf.dptr, dbuf.dsize); + result = smb_memdup(dbuf.dptr, dbuf.dsize); if (result == NULL) { return NULL; } diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c index cdcfe06..7122bf2 100644 --- a/source3/smbd/seal.c +++ b/source3/smbd/seal.c @@ -245,7 +245,7 @@ NTSTATUS srv_request_encryption_setup(connection_struct *conn, /* Return the raw blob. */ SAFE_FREE(*ppdata); - *ppdata = (unsigned char *)memdup(response.data, response.length); + *ppdata = (unsigned char *)smb_memdup(response.data, response.length); if ((*ppdata) == NULL && response.length > 0) return NT_STATUS_NO_MEMORY; *p_data_size = response.length; diff --git a/source3/smbd/sec_ctx.c b/source3/smbd/sec_ctx.c index d474219..c34247e6 100644 --- a/source3/smbd/sec_ctx.c +++ b/source3/smbd/sec_ctx.c @@ -331,8 +331,8 @@ void set_sec_ctx(uid_t uid, gid_t gid, int ngroups, gid_t *groups, const struct TALLOC_FREE(ctx_p->token); if (ngroups) { - ctx_p->ut.groups = (gid_t *)memdup(groups, - sizeof(gid_t) * ngroups); + ctx_p->ut.groups = (gid_t *)smb_memdup(groups, + sizeof(gid_t) * ngroups); if (!ctx_p->ut.groups) { smb_panic("memdup failed"); } diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c index ec7ddb7..83b34f0 100644 --- a/source3/winbindd/winbindd_cache.c +++ b/source3/winbindd/winbindd_cache.c @@ -3560,7 +3560,7 @@ static struct cache_entry *create_centry_validate(const char *kstr, TDB_DATA dat struct cache_entry *centry; centry = SMB_XMALLOC_P(struct cache_entry); - centry->data = (unsigned char *)memdup(data.dptr, data.dsize); + centry->data = (unsigned char *)smb_memdup(data.dptr, data.dsize); if (!centry->data) { SAFE_FREE(centry); return NULL; diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c index 764c1f3..ad264c9 100644 --- a/source4/smbd/process_thread.c +++ b/source4/smbd/process_thread.c @@ -218,7 +218,7 @@ static void thread_set_title(struct tevent_context *ev, const char *title) static int thread_mutex_init(smb_mutex_t *mutex, const char *name) { pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER; - mutex->mutex = memdup(&m, sizeof(m)); + mutex->mutex = smb_memdup(&m, sizeof(m)); if (! mutex->mutex) { errno = ENOMEM; return -1; @@ -294,7 +294,7 @@ static int thread_mutex_unlock(smb_mutex_t *mutex, const char *name) static int thread_rwlock_init(smb_rwlock_t *rwlock, const char *name) { pthread_rwlock_t m = PTHREAD_RWLOCK_INITIALIZER; - rwlock->rwlock = memdup(&m, sizeof(m)); + rwlock->rwlock = smb_memdup(&m, sizeof(m)); if (! rwlock->rwlock) { errno = ENOMEM; return -1; -- 1.8.3.2