summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-06-15 00:14:11 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:53:22 -0500
commitd02d0301bee23f945f6d807e94fe88c2a8e97ed9 (patch)
tree2469b265e23f3907779677fc79eefe4d60794885 /source4
parentf5c2f26e8424ca31d39948ee9cac6808c31a3293 (diff)
downloadsamba-d02d0301bee23f945f6d807e94fe88c2a8e97ed9.tar.gz
samba-d02d0301bee23f945f6d807e94fe88c2a8e97ed9.tar.bz2
samba-d02d0301bee23f945f6d807e94fe88c2a8e97ed9.zip
r23503: use hdb_dbc not hdb_openp.
Andrew Bartlett (This used to be commit 3a21304de04fa20198d5a863ffd0804a308dccb9)
Diffstat (limited to 'source4')
-rw-r--r--source4/kdc/hdb-ldb.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/source4/kdc/hdb-ldb.c b/source4/kdc/hdb-ldb.c
index b80d9f3bce..62fcf0cb00 100644
--- a/source4/kdc/hdb-ldb.c
+++ b/source4/kdc/hdb-ldb.c
@@ -988,7 +988,7 @@ struct hdb_ldb_seq {
static krb5_error_code LDB_seq(krb5_context context, HDB *db, unsigned flags, hdb_entry_ex *entry)
{
krb5_error_code ret;
- struct hdb_ldb_seq *priv = (struct hdb_ldb_seq *)db->hdb_openp;
+ struct hdb_ldb_seq *priv = (struct hdb_ldb_seq *)db->hdb_dbc;
TALLOC_CTX *mem_ctx;
hdb_entry_ex entry_ex;
memset(&entry_ex, '\0', sizeof(entry_ex));
@@ -1015,7 +1015,7 @@ static krb5_error_code LDB_seq(krb5_context context, HDB *db, unsigned flags, hd
if (ret != 0) {
talloc_free(priv);
- db->hdb_openp = 0;
+ db->hdb_dbc = NULL;
} else {
talloc_free(mem_ctx);
}
@@ -1027,7 +1027,7 @@ static krb5_error_code LDB_firstkey(krb5_context context, HDB *db, unsigned flag
hdb_entry_ex *entry)
{
struct ldb_context *ldb_ctx = (struct ldb_context *)db->hdb_db;
- struct hdb_ldb_seq *priv = (struct hdb_ldb_seq *)db->hdb_openp;
+ struct hdb_ldb_seq *priv = (struct hdb_ldb_seq *)db->hdb_dbc;
char *realm;
struct ldb_dn *realm_dn = NULL;
struct ldb_result *res = NULL;
@@ -1038,7 +1038,7 @@ static krb5_error_code LDB_firstkey(krb5_context context, HDB *db, unsigned flag
if (priv) {
talloc_free(priv);
- db->hdb_openp = 0;
+ db->hdb_dbc = NULL;
}
priv = (struct hdb_ldb_seq *) talloc(db, struct hdb_ldb_seq);
@@ -1094,14 +1094,13 @@ static krb5_error_code LDB_firstkey(krb5_context context, HDB *db, unsigned flag
priv->msgs = talloc_steal(priv, res->msgs);
talloc_free(res);
- /* why has hdb_openp changed from (void *) to (int) ??? */
- db->hdb_openp = (int)priv;
+ db->hdb_dbc = priv;
ret = LDB_seq(context, db, flags, entry);
if (ret != 0) {
talloc_free(priv);
- db->hdb_openp = 0;
+ db->hdb_dbc = NULL;
} else {
talloc_free(mem_ctx);
}
@@ -1162,7 +1161,7 @@ NTSTATUS kdc_hdb_ldb_create(TALLOC_CTX *mem_ctx,
return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
}
- (*db)->hdb_openp = 0;
+ (*db)->hdb_dbc = NULL;
(*db)->hdb_open = LDB_open;
(*db)->hdb_close = LDB_close;
(*db)->hdb_fetch = LDB_fetch;