summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/ldb_tdb
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2004-04-28 07:32:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:51:36 -0500
commitb0b97592be312b3553ac31cc3f3cb994de06e506 (patch)
treedc9d731c916eae81767883804c2d7d269bc56f3f /source4/lib/ldb/ldb_tdb
parent6411aa483f9233af098b4893ad67ebd2fd9d5868 (diff)
downloadsamba-b0b97592be312b3553ac31cc3f3cb994de06e506.tar.gz
samba-b0b97592be312b3553ac31cc3f3cb994de06e506.tar.bz2
samba-b0b97592be312b3553ac31cc3f3cb994de06e506.zip
r382: More C++ friendliness fixes.
(This used to be commit e96f3a2005cf6f4da2ecd4670a35eab1b4f250d0)
Diffstat (limited to 'source4/lib/ldb/ldb_tdb')
-rw-r--r--source4/lib/ldb/ldb_tdb/ldb_index.c2
-rw-r--r--source4/lib/ldb/ldb_tdb/ldb_search.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c b/source4/lib/ldb/ldb_tdb/ldb_index.c
index d4e6c95d63..a23fc2d525 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_index.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_index.c
@@ -576,7 +576,7 @@ static int ltdb_index_add1(struct ldb_context *ldb, const char *dn,
}
msg.num_elements = 0;
msg.elements = NULL;
- msg.private = NULL;
+ msg.private_data = NULL;
}
free(dn_key);
diff --git a/source4/lib/ldb/ldb_tdb/ldb_search.c b/source4/lib/ldb/ldb_tdb/ldb_search.c
index 9a2287e20e..fe84091303 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_search.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_search.c
@@ -166,7 +166,7 @@ static struct ldb_message *ltdb_pull_attrs(struct ldb_context *ldb,
ret->num_elements = 0;
ret->elements = NULL;
- ret->private = NULL;
+ ret->private_data = NULL;
if (!attrs) {
if (msg_add_all_elements(ret, msg) != 0) {
@@ -221,7 +221,7 @@ void ltdb_search_dn1_free(struct ldb_context *ldb, struct ldb_message *msg)
{
int i;
if (msg->dn) free(msg->dn);
- if (msg->private) free(msg->private);
+ if (msg->private_data) free(msg->private_data);
for (i=0;i<msg->num_elements;i++) {
if (msg->elements[i].values) free(msg->elements[i].values);
}
@@ -258,7 +258,7 @@ int ltdb_search_dn1(struct ldb_context *ldb, const char *dn, struct ldb_message
free(tdb_data.dptr);
return -1;
}
- msg->private = tdb_data.dptr;
+ msg->private_data = tdb_data.dptr;
msg->num_elements = 0;
msg->elements = NULL;