diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-26 12:38:06 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-26 03:52:30 +0100 |
| commit | bf52cffd2587615243a7101868a9038d9aa1b0c2 (patch) | |
| tree | b5bfadb81148bc7554b6f1b2291a140f620cbbe3 /source4/dsdb/kcc | |
| parent | 5e8cb67605367ffd9dd2a8624df90f2ca5e77fc4 (diff) | |
| download | samba-bf52cffd2587615243a7101868a9038d9aa1b0c2.tar.gz samba-bf52cffd2587615243a7101868a9038d9aa1b0c2.tar.bz2 samba-bf52cffd2587615243a7101868a9038d9aa1b0c2.zip | |
s4-kcc: fixed valgrind errors in drs replicaInfo server side
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Fri Nov 26 03:52:30 CET 2010 on sn-devel-104
Diffstat (limited to 'source4/dsdb/kcc')
| -rw-r--r-- | source4/dsdb/kcc/kcc_drs_replica_info.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source4/dsdb/kcc/kcc_drs_replica_info.c b/source4/dsdb/kcc/kcc_drs_replica_info.c index e2e49b81fd..1da3ecd00d 100644 --- a/source4/dsdb/kcc/kcc_drs_replica_info.c +++ b/source4/dsdb/kcc/kcc_drs_replica_info.c @@ -418,13 +418,9 @@ static WERROR get_master_ncs(TALLOC_CTX *mem_ctx, struct ldb_context *samdb, } for (k = 0; k < msg_elem->num_values; k++) { - int len = msg_elem->values[k].length; - /* copy the string on msg_elem->values[k]->data to nc_str */ - nc_str = talloc_array(mem_ctx, char, len); + nc_str = talloc_strndup(mem_ctx, (char *)msg_elem->values[k].data, msg_elem->values[k].length); W_ERROR_HAVE_NO_MEMORY(nc_str); - memcpy(nc_str, msg_elem->values[k].data, len); - nc_str[len] = '\0'; nc_list_elem = talloc_zero(mem_ctx, struct ncList); W_ERROR_HAVE_NO_MEMORY(nc_list_elem); @@ -584,7 +580,6 @@ static WERROR kccdrs_replica_get_info_neighbours(TALLOC_CTX *mem_ctx, struct repsFromTo2 *reps_from = NULL; uint32_t c_reps_from; uint32_t i_rep; - struct drsuapi_DsReplicaNeighbour neigh; struct ncList *nc_list = NULL; status = get_ncs_list(mem_ctx, samdb, service, object_dn_str, &nc_list); @@ -624,6 +619,8 @@ static WERROR kccdrs_replica_get_info_neighbours(TALLOC_CTX *mem_ctx, { if (i >= base_index) { + struct drsuapi_DsReplicaNeighbour neigh; + ZERO_STRUCT(neigh); status = fill_neighbor_from_repsFrom(mem_ctx, samdb, nc_dn, &neigh, reps_from); @@ -702,7 +699,6 @@ static WERROR kccdrs_replica_get_info_repsto(TALLOC_CTX *mem_ctx, struct repsFromTo2 *reps_to; uint32_t c_reps_to; uint32_t i_rep; - struct drsuapi_DsReplicaNeighbour neigh; struct ncList *nc_list = NULL; status = get_ncs_list(mem_ctx, samdb, service, object_dn_str, &nc_list); @@ -726,6 +722,8 @@ static WERROR kccdrs_replica_get_info_repsto(TALLOC_CTX *mem_ctx, /* foreach r in nc!repsTo */ for (i_rep = 0; i_rep < c_reps_to; i_rep++) { + struct drsuapi_DsReplicaNeighbour neigh; + ZERO_STRUCT(neigh); /* put all info on reps_to */ if (reps_to_blob[i_rep].version == 1) { |