s4:kdc Use better db context structure

This allows to use a common structure not tied to hdb_samba4
Also allows to avoid many casts within hdb_samba4 functions

This is the first step to abstract samba kdc databse functions
so they can be used by the MIT forthcoming plugin.

diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index eb7edeb5c83a1822350f14a78368d334e80d4694..33575bd8ea4106cad511c3b68d368094f5166300 100644 (file)
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -490,7 +490,8 @@ out:
 /*
  * Construct an hdb_entry from a directory entry.
  */
-static krb5_error_code hdb_samba4_message2entry(krb5_context context, HDB *db,
+static krb5_error_code hdb_samba4_message2entry(krb5_context context,
+                                        struct samba_kdc_db_context *kdc_db_ctx,
                                         struct loadparm_context *lp_ctx,
                                         TALLOC_CTX *mem_ctx, krb5_const_principal principal,
                                         enum hdb_samba4_ent_type ent_type,
@@ -661,7 +662,7 @@ static krb5_error_code hdb_samba4_message2entry(krb5_context context, HDB *db,
 
        } else {
                NTTIME must_change_time
-                       = samdb_result_force_password_change((struct ldb_context *)db->hdb_db, mem_ctx,
+                       = samdb_result_force_password_change(kdc_db_ctx->samdb, mem_ctx,
                                                             realm_dn, msg);
                if (must_change_time == 0x7FFFFFFFFFFFFFFFULL) {
                        entry_ex->entry.pw_end = NULL;
@@ -721,14 +722,14 @@ static krb5_error_code hdb_samba4_message2entry(krb5_context context, HDB *db,
 
 
        p->msg = talloc_steal(p, msg);
-       p->samdb = (struct ldb_context *)db->hdb_db;
+       p->samdb = kdc_db_ctx->samdb;
 
 out:
        if (ret != 0) {
                /* This doesn't free ent itself, that is for the eventual caller to do */
                hdb_free_entry(context, entry_ex);
        } else {
-               talloc_steal(db, entry_ex->ctx);
+               talloc_steal(kdc_db_ctx, entry_ex->ctx);
        }
 
        return ret;
@@ -737,7 +738,8 @@ out:
 /*
  * Construct an hdb_entry from a directory entry.
  */
-static krb5_error_code hdb_samba4_trust_message2entry(krb5_context context, HDB *db,
+static krb5_error_code hdb_samba4_trust_message2entry(krb5_context context,
+                                              struct samba_kdc_db_context *kdc_db_ctx,
                                               struct loadparm_context *lp_ctx,
                                               TALLOC_CTX *mem_ctx, krb5_const_principal principal,
                                               enum trust_direction direction,
@@ -901,14 +903,14 @@ static krb5_error_code hdb_samba4_trust_message2entry(krb5_context context, HDB
 
 
        p->msg = talloc_steal(p, msg);
-       p->samdb = (struct ldb_context *)db->hdb_db;
+       p->samdb = kdc_db_ctx->samdb;
 
 out:
        if (ret != 0) {
                /* This doesn't free ent itself, that is for the eventual caller to do */
                hdb_free_entry(context, entry_ex);
        } else {
-               talloc_steal(db, entry_ex->ctx);
+               talloc_steal(kdc_db_ctx, entry_ex->ctx);
        }
 
        return ret;
@@ -984,7 +986,8 @@ static krb5_error_code hdb_samba4_rename(krb5_context context, HDB *db, const ch
        return HDB_ERR_DB_INUSE;
 }
 
-static krb5_error_code hdb_samba4_lookup_client(krb5_context context, HDB *db,
+static krb5_error_code hdb_samba4_lookup_client(krb5_context context,
+                                               struct samba_kdc_db_context *kdc_db_ctx,
                                                struct loadparm_context *lp_ctx,
                                                TALLOC_CTX *mem_ctx,
                                                krb5_const_principal principal,
@@ -1001,7 +1004,7 @@ static krb5_error_code hdb_samba4_lookup_client(krb5_context context, HDB *db,
                return ret;
        }
 
-       nt_status = sam_get_results_principal((struct ldb_context *)db->hdb_db,
+       nt_status = sam_get_results_principal(kdc_db_ctx->samdb,
                                              mem_ctx, principal_string, attrs,
                                              realm_dn, msg);
        free(principal_string);
@@ -1016,7 +1019,8 @@ static krb5_error_code hdb_samba4_lookup_client(krb5_context context, HDB *db,
        return ret;
 }
 
-static krb5_error_code hdb_samba4_fetch_client(krb5_context context, HDB *db,
+static krb5_error_code hdb_samba4_fetch_client(krb5_context context,
+                                              struct samba_kdc_db_context *kdc_db_ctx,
                                               struct loadparm_context *lp_ctx,
                                               TALLOC_CTX *mem_ctx,
                                               krb5_const_principal principal,
@@ -1026,20 +1030,21 @@ static krb5_error_code hdb_samba4_fetch_client(krb5_context context, HDB *db,
        krb5_error_code ret;
        struct ldb_message *msg = NULL;
 
-       ret = hdb_samba4_lookup_client(context, db, lp_ctx,
+       ret = hdb_samba4_lookup_client(context, kdc_db_ctx, lp_ctx,
                                       mem_ctx, principal, user_attrs,
                                       &realm_dn, &msg);
        if (ret != 0) {
                return ret;
        }
 
-       ret = hdb_samba4_message2entry(context, db, lp_ctx, mem_ctx,
+       ret = hdb_samba4_message2entry(context, kdc_db_ctx, lp_ctx, mem_ctx,
                                       principal, HDB_SAMBA4_ENT_TYPE_CLIENT,
                                       realm_dn, msg, entry_ex);
        return ret;
 }
 
-static krb5_error_code hdb_samba4_fetch_krbtgt(krb5_context context, HDB *db,
+static krb5_error_code hdb_samba4_fetch_krbtgt(krb5_context context,
+                                       struct samba_kdc_db_context *kdc_db_ctx,
                                        struct loadparm_context *lp_ctx,
                                        TALLOC_CTX *mem_ctx,
                                        krb5_const_principal principal,
@@ -1048,7 +1053,7 @@ static krb5_error_code hdb_samba4_fetch_krbtgt(krb5_context context, HDB *db,
 {
        krb5_error_code ret;
        struct ldb_message *msg = NULL;
-       struct ldb_dn *realm_dn = ldb_get_default_basedn(db->hdb_db);
+       struct ldb_dn *realm_dn = ldb_get_default_basedn(kdc_db_ctx->samdb);
        const char *realm;
 
        krb5_principal alloc_principal = NULL;
@@ -1070,7 +1075,7 @@ static krb5_error_code hdb_samba4_fetch_krbtgt(krb5_context context, HDB *db,
                int lret;
                char *realm_fixed;
 
-               lret = gendb_search_single_extended_dn(db->hdb_db, mem_ctx,
+               lret = gendb_search_single_extended_dn(kdc_db_ctx->samdb, mem_ctx,
                                                       realm_dn, LDB_SCOPE_SUBTREE,
                                                       &msg, krbtgt_attrs,
                                                       "(&(objectClass=user)(samAccountName=krbtgt))");
@@ -1079,8 +1084,8 @@ static krb5_error_code hdb_samba4_fetch_krbtgt(krb5_context context, HDB *db,
                        krb5_set_error_message(context, HDB_ERR_NOENTRY, "hdb_samba4_fetch: could not find own KRBTGT in DB!");
                        return HDB_ERR_NOENTRY;
                } else if (lret != LDB_SUCCESS) {
-                       krb5_warnx(context, "hdb_samba4_fetch: could not find own KRBTGT in DB: %s", ldb_errstring(db->hdb_db));
-                       krb5_set_error_message(context, HDB_ERR_NOENTRY, "hdb_samba4_fetch: could not find own KRBTGT in DB: %s", ldb_errstring(db->hdb_db));
+                       krb5_warnx(context, "hdb_samba4_fetch: could not find own KRBTGT in DB: %s", ldb_errstring(kdc_db_ctx->samdb));
+                       krb5_set_error_message(context, HDB_ERR_NOENTRY, "hdb_samba4_fetch: could not find own KRBTGT in DB: %s", ldb_errstring(kdc_db_ctx->samdb));
                        return HDB_ERR_NOENTRY;
                }
 
@@ -1106,7 +1111,7 @@ static krb5_error_code hdb_samba4_fetch_krbtgt(krb5_context context, HDB *db,
                }
                principal = alloc_principal;
 
-               ret = hdb_samba4_message2entry(context, db, lp_ctx, mem_ctx,
+               ret = hdb_samba4_message2entry(context, kdc_db_ctx, lp_ctx, mem_ctx,
                                        principal, HDB_SAMBA4_ENT_TYPE_KRBTGT,
                                        realm_dn, msg, entry_ex);
                if (ret != 0) {
@@ -1133,7 +1138,7 @@ static krb5_error_code hdb_samba4_fetch_krbtgt(krb5_context context, HDB *db,
 
                /* Trusted domains are under CN=system */
 
-               ret = hdb_samba4_lookup_trust(context, (struct ldb_context *)db->hdb_db,
+               ret = hdb_samba4_lookup_trust(context, kdc_db_ctx->samdb,
                                       mem_ctx,
                                       realm, realm_dn, &msg);
 
@@ -1143,7 +1148,7 @@ static krb5_error_code hdb_samba4_fetch_krbtgt(krb5_context context, HDB *db,
                        return ret;
                }
 
-               ret = hdb_samba4_trust_message2entry(context, db, lp_ctx, mem_ctx,
+               ret = hdb_samba4_trust_message2entry(context, kdc_db_ctx, lp_ctx, mem_ctx,
                                              principal, direction,
                                              realm_dn, msg, entry_ex);
                if (ret != 0) {
@@ -1158,7 +1163,8 @@ static krb5_error_code hdb_samba4_fetch_krbtgt(krb5_context context, HDB *db,
 
 }
 
-static krb5_error_code hdb_samba4_lookup_server(krb5_context context, HDB *db,
+static krb5_error_code hdb_samba4_lookup_server(krb5_context context,
+                                               struct samba_kdc_db_context *kdc_db_ctx,
                                                struct loadparm_context *lp_ctx,
                                                TALLOC_CTX *mem_ctx,
                                                krb5_const_principal principal,
@@ -1185,7 +1191,7 @@ static krb5_error_code hdb_samba4_lookup_server(krb5_context context, HDB *db,
                /* At this point we may find the host is known to be
                 * in a different realm, so we should generate a
                 * referral instead */
-               nt_status = crack_service_principal_name((struct ldb_context *)db->hdb_db,
+               nt_status = crack_service_principal_name(kdc_db_ctx->samdb,
                                                         mem_ctx, principal_string,
                                                         &user_dn, realm_dn);
                free(principal_string);
@@ -1194,7 +1200,7 @@ static krb5_error_code hdb_samba4_lookup_server(krb5_context context, HDB *db,
                        return HDB_ERR_NOENTRY;
                }
 
-               ldb_ret = gendb_search_single_extended_dn((struct ldb_context *)db->hdb_db,
+               ldb_ret = gendb_search_single_extended_dn(kdc_db_ctx->samdb,
                                                          mem_ctx,
                                                          user_dn, LDB_SCOPE_BASE,
                                                          msg, attrs,
@@ -1208,7 +1214,7 @@ static krb5_error_code hdb_samba4_lookup_server(krb5_context context, HDB *db,
                char *filter = NULL;
                char *short_princ;
                /* server as client principal case, but we must not lookup userPrincipalNames */
-               *realm_dn = ldb_get_default_basedn(db->hdb_db);
+               *realm_dn = ldb_get_default_basedn(kdc_db_ctx->samdb);
                realm = krb5_principal_get_realm(context, principal);
 
                /* TODO: Check if it is our realm, otherwise give referall */
@@ -1221,7 +1227,7 @@ static krb5_error_code hdb_samba4_lookup_server(krb5_context context, HDB *db,
                        return ret;
                }
 
-               lret = gendb_search_single_extended_dn(db->hdb_db, mem_ctx,
+               lret = gendb_search_single_extended_dn(kdc_db_ctx->samdb, mem_ctx,
                                                       *realm_dn, LDB_SCOPE_SUBTREE,
                                                       msg, attrs, "(&(objectClass=user)(samAccountName=%s))",
                                                       ldb_binary_encode_string(mem_ctx, short_princ));
@@ -1232,7 +1238,7 @@ static krb5_error_code hdb_samba4_lookup_server(krb5_context context, HDB *db,
                }
                if (lret != LDB_SUCCESS) {
                        DEBUG(3, ("Failed single search for for %s - %s\n",
-                                 filter, ldb_errstring(db->hdb_db)));
+                                 filter, ldb_errstring(kdc_db_ctx->samdb)));
                        return HDB_ERR_NOENTRY;
                }
        }
@@ -1240,7 +1246,8 @@ static krb5_error_code hdb_samba4_lookup_server(krb5_context context, HDB *db,
        return 0;
 }
 
-static krb5_error_code hdb_samba4_fetch_server(krb5_context context, HDB *db,
+static krb5_error_code hdb_samba4_fetch_server(krb5_context context,
+                                              struct samba_kdc_db_context *kdc_db_ctx,
                                               struct loadparm_context *lp_ctx,
                                               TALLOC_CTX *mem_ctx,
                                               krb5_const_principal principal,
@@ -1251,13 +1258,13 @@ static krb5_error_code hdb_samba4_fetch_server(krb5_context context, HDB *db,
        struct ldb_dn *realm_dn;
        struct ldb_message *msg;
 
-       ret = hdb_samba4_lookup_server(context, db, lp_ctx, mem_ctx, principal,
+       ret = hdb_samba4_lookup_server(context, kdc_db_ctx, lp_ctx, mem_ctx, principal,
                                       server_attrs, &realm_dn, &msg);
        if (ret != 0) {
                return ret;
        }
 
-       ret = hdb_samba4_message2entry(context, db, lp_ctx, mem_ctx,
+       ret = hdb_samba4_message2entry(context, kdc_db_ctx, lp_ctx, mem_ctx,
                                principal, HDB_SAMBA4_ENT_TYPE_SERVER,
                                realm_dn, msg, entry_ex);
        if (ret != 0) {
@@ -1272,9 +1279,10 @@ static krb5_error_code hdb_samba4_fetch(krb5_context context, HDB *db,
                                 unsigned flags,
                                 hdb_entry_ex *entry_ex)
 {
+       struct samba_kdc_db_context *kdc_db_ctx = (struct samba_kdc_db_context *)db->hdb_db;
        krb5_error_code ret = HDB_ERR_NOENTRY;
-       TALLOC_CTX *mem_ctx = talloc_named(db, 0, "hdb_samba4_fetch context");
-       struct loadparm_context *lp_ctx = talloc_get_type(ldb_get_opaque(db->hdb_db, "loadparm"), struct loadparm_context);
+       TALLOC_CTX *mem_ctx = talloc_named(kdc_db_ctx, 0, "hdb_samba4_fetch context");
+       struct loadparm_context *lp_ctx = kdc_db_ctx->lp_ctx;
 
        if (!mem_ctx) {
                ret = ENOMEM;
@@ -1283,20 +1291,20 @@ static krb5_error_code hdb_samba4_fetch(krb5_context context, HDB *db,
        }
 
        if (flags & HDB_F_GET_CLIENT) {
-               ret = hdb_samba4_fetch_client(context, db, lp_ctx, mem_ctx, principal, flags, entry_ex);
+               ret = hdb_samba4_fetch_client(context, kdc_db_ctx, lp_ctx, mem_ctx, principal, flags, entry_ex);
                if (ret != HDB_ERR_NOENTRY) goto done;
        }
        if (flags & HDB_F_GET_SERVER) {
                /* krbtgt fits into this situation for trusted realms, and for resolving different versions of our own realm name */
-               ret = hdb_samba4_fetch_krbtgt(context, db, lp_ctx, mem_ctx, principal, flags, entry_ex);
+               ret = hdb_samba4_fetch_krbtgt(context, kdc_db_ctx, lp_ctx, mem_ctx, principal, flags, entry_ex);
                if (ret != HDB_ERR_NOENTRY) goto done;
 
                /* We return 'no entry' if it does not start with krbtgt/, so move to the common case quickly */
-               ret = hdb_samba4_fetch_server(context, db, lp_ctx, mem_ctx, principal, flags, entry_ex);
+               ret = hdb_samba4_fetch_server(context, kdc_db_ctx, lp_ctx, mem_ctx, principal, flags, entry_ex);
                if (ret != HDB_ERR_NOENTRY) goto done;
        }
        if (flags & HDB_F_GET_KRBTGT) {
-               ret = hdb_samba4_fetch_krbtgt(context, db, lp_ctx, mem_ctx, principal, flags, entry_ex);
+               ret = hdb_samba4_fetch_krbtgt(context, kdc_db_ctx, lp_ctx, mem_ctx, principal, flags, entry_ex);
                if (ret != HDB_ERR_NOENTRY) goto done;
        }
 
@@ -1326,6 +1334,7 @@ struct hdb_samba4_seq {
 
 static krb5_error_code hdb_samba4_seq(krb5_context context, HDB *db, unsigned flags, hdb_entry_ex *entry)
 {
+       struct samba_kdc_db_context *kdc_db_ctx = (struct samba_kdc_db_context *)db->hdb_db;
        krb5_error_code ret;
        struct hdb_samba4_seq *priv = (struct hdb_samba4_seq *)db->hdb_dbc;
        TALLOC_CTX *mem_ctx;
@@ -1345,7 +1354,7 @@ static krb5_error_code hdb_samba4_seq(krb5_context context, HDB *db, unsigned fl
        }
 
        if (priv->index < priv->count) {
-               ret = hdb_samba4_message2entry(context, db, priv->lp_ctx,
+               ret = hdb_samba4_message2entry(context, kdc_db_ctx, priv->lp_ctx,
                                        mem_ctx,
                                        NULL, HDB_SAMBA4_ENT_TYPE_ANY,
                                        priv->realm_dn, priv->msgs[priv->index++], entry);
@@ -1365,7 +1374,8 @@ static krb5_error_code hdb_samba4_seq(krb5_context context, HDB *db, unsigned fl
 static krb5_error_code hdb_samba4_firstkey(krb5_context context, HDB *db, unsigned flags,
                                        hdb_entry_ex *entry)
 {
-       struct ldb_context *ldb_ctx = (struct ldb_context *)db->hdb_db;
+       struct samba_kdc_db_context *kdc_db_ctx = (struct samba_kdc_db_context *)db->hdb_db;
+       struct ldb_context *ldb_ctx = kdc_db_ctx->samdb;
        struct loadparm_context *lp_ctx = talloc_get_type(ldb_get_opaque(ldb_ctx, "loadparm"),
                                                          struct loadparm_context);
        struct hdb_samba4_seq *priv = (struct hdb_samba4_seq *)db->hdb_dbc;
@@ -1456,9 +1466,8 @@ hdb_samba4_check_constrained_delegation(krb5_context context, HDB *db,
                                        hdb_entry_ex *entry,
                                        krb5_const_principal target_principal)
 {
-       struct ldb_context *ldb_ctx = (struct ldb_context *)db->hdb_db;
-       struct loadparm_context *lp_ctx = talloc_get_type(ldb_get_opaque(ldb_ctx, "loadparm"),
-                                                         struct loadparm_context);
+       struct samba_kdc_db_context *kdc_db_ctx = (struct samba_kdc_db_context *)db->hdb_db;
+       struct loadparm_context *lp_ctx = kdc_db_ctx->lp_ctx;
        krb5_error_code ret;
        krb5_principal enterprise_prinicpal = NULL;
        struct ldb_dn *realm_dn;
@@ -1470,7 +1479,7 @@ hdb_samba4_check_constrained_delegation(krb5_context context, HDB *db,
                "objectSid", NULL
        };
 
-       TALLOC_CTX *mem_ctx = talloc_named(db, 0, "hdb_samba4_check_constrained_delegation");
+       TALLOC_CTX *mem_ctx = talloc_named(kdc_db_ctx, 0, "hdb_samba4_check_constrained_delegation");
 
        if (!mem_ctx) {
                ret = ENOMEM;
@@ -1496,7 +1505,7 @@ hdb_samba4_check_constrained_delegation(krb5_context context, HDB *db,
                target_principal = enterprise_prinicpal;
        }
 
-       ret = hdb_samba4_lookup_server(context, db, lp_ctx, mem_ctx, target_principal,
+       ret = hdb_samba4_lookup_server(context, kdc_db_ctx, lp_ctx, mem_ctx, target_principal,
                                       delegation_check_attrs, &realm_dn, &msg);
 
        krb5_free_principal(context, enterprise_prinicpal);
@@ -1531,9 +1540,8 @@ hdb_samba4_check_pkinit_ms_upn_match(krb5_context context, HDB *db,
                                     hdb_entry_ex *entry,
                                     krb5_const_principal certificate_principal)
 {
-       struct ldb_context *ldb_ctx = (struct ldb_context *)db->hdb_db;
-       struct loadparm_context *lp_ctx = talloc_get_type(ldb_get_opaque(ldb_ctx, "loadparm"),
-                                                         struct loadparm_context);
+       struct samba_kdc_db_context *kdc_db_ctx = (struct samba_kdc_db_context *)db->hdb_db;
+       struct loadparm_context *lp_ctx = kdc_db_ctx->lp_ctx;
        krb5_error_code ret;
        struct ldb_dn *realm_dn;
        struct ldb_message *msg;
@@ -1552,7 +1560,7 @@ hdb_samba4_check_pkinit_ms_upn_match(krb5_context context, HDB *db,
                return ret;
        }
 
-       ret = hdb_samba4_lookup_client(context, db, lp_ctx,
+       ret = hdb_samba4_lookup_client(context, kdc_db_ctx, lp_ctx,
                                       mem_ctx, certificate_principal,
                                       ms_upn_check_attrs, &realm_dn, &msg);
 
@@ -1581,15 +1589,14 @@ hdb_samba4_check_pkinit_ms_upn_match(krb5_context context, HDB *db,
  * (hdb_samba4_create) from the kpasswdd -> krb5 -> keytab_hdb -> hdb
  * code */
 
-NTSTATUS hdb_samba4_create_kdc(TALLOC_CTX *mem_ctx,
-                             struct tevent_context *ev_ctx,
-                             struct loadparm_context *lp_ctx,
-                             krb5_context context, struct HDB **db)
+NTSTATUS hdb_samba4_create_kdc(struct samba_kdc_base_context *base_ctx,
+                              krb5_context context, struct HDB **db)
 {
+       struct samba_kdc_db_context *kdc_db_ctx;
        struct auth_session_info *session_info;
        NTSTATUS nt_status;
 
-       *db = talloc(mem_ctx, HDB);
+       *db = talloc(base_ctx, HDB);
        if (!*db) {
                krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
                return NT_STATUS_NO_MEMORY;
@@ -1606,12 +1613,12 @@ NTSTATUS hdb_samba4_create_kdc(TALLOC_CTX *mem_ctx,
         * credentials to set CRED_DONT_USE_KERBEROS, which would
         * break other users of the system_session */
        DEBUG(0,("FIXME: Using new system session for hdb\n"));
-       nt_status = auth_system_session_info(*db, lp_ctx, &session_info);
+       nt_status = auth_system_session_info(*db, base_ctx->lp_ctx, &session_info);
        if (!NT_STATUS_IS_OK(nt_status)) {
-               return nt_status;
+              return nt_status;
        }
 #else
-       session_info = system_session(lp_ctx);
+       session_info = system_session(kdc_db_ctx->lp_ctx);
        if (session_info == NULL) {
                return NT_STATUS_INTERNAL_ERROR;
        }
@@ -1628,13 +1635,23 @@ NTSTATUS hdb_samba4_create_kdc(TALLOC_CTX *mem_ctx,
        cli_credentials_set_kerberos_state(session_info->credentials,
                                           CRED_DONT_USE_KERBEROS);
 
+       kdc_db_ctx = talloc_zero(*db, struct samba_kdc_db_context);
+       if (kdc_db_ctx == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       kdc_db_ctx->ev_ctx = base_ctx->ev_ctx;
+       kdc_db_ctx->lp_ctx = base_ctx->lp_ctx;
+
        /* Setup the link to LDB */
-       (*db)->hdb_db = samdb_connect(*db, ev_ctx, lp_ctx, session_info);
-       if ((*db)->hdb_db == NULL) {
+       kdc_db_ctx->samdb = samdb_connect(kdc_db_ctx, base_ctx->ev_ctx,
+                                         base_ctx->lp_ctx, session_info);
+       if (kdc_db_ctx->samdb == NULL) {
                DEBUG(1, ("hdb_samba4_create: Cannot open samdb for KDC backend!"));
                return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
        }
 
+       (*db)->hdb_db = kdc_db_ctx;
+
        (*db)->hdb_dbc = NULL;
        (*db)->hdb_open = hdb_samba4_open;
        (*db)->hdb_close = hdb_samba4_close;
@@ -1664,15 +1681,14 @@ static krb5_error_code hdb_samba4_create(krb5_context context, struct HDB **db,
 {
        NTSTATUS nt_status;
        void *ptr;
-       struct hdb_samba4_context *hdb_samba4_context;
+       struct samba_kdc_base_context *base_ctx;
 
        if (sscanf(arg, "&%p", &ptr) != 1) {
                return EINVAL;
        }
-       hdb_samba4_context = talloc_get_type_abort(ptr, struct hdb_samba4_context);
+       base_ctx = talloc_get_type_abort(ptr, struct samba_kdc_base_context);
        /* The global kdc_mem_ctx and kdc_lp_ctx, Disgusting, ugly hack, but it means one less private hook */
-       nt_status = hdb_samba4_create_kdc(hdb_samba4_context, hdb_samba4_context->ev_ctx, hdb_samba4_context->lp_ctx,
-                                         context, db);
+       nt_status = hdb_samba4_create_kdc(base_ctx, context, db);
 
        if (NT_STATUS_IS_OK(nt_status)) {
                return 0;

diff --git a/source4/kdc/hdb-samba4.h b/source4/kdc/hdb-samba4.h
index 5f85ce188cad7d47c993d3b8671c9ac3d15e8916..3fa63ee542481820a0be28803876511c1c2e96b6 100644 (file)
--- a/source4/kdc/hdb-samba4.h
+++ b/source4/kdc/hdb-samba4.h
@@ -20,11 +20,19 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-struct hdb_samba4_context {
+struct samba_kdc_base_context {
        struct tevent_context *ev_ctx;
        struct loadparm_context *lp_ctx;
 };
 
+struct samba_kdc_seq;
+
+struct samba_kdc_db_context {
+       struct tevent_context *ev_ctx;
+       struct loadparm_context *lp_ctx;
+       struct ldb_context *samdb;
+};
+
 extern struct hdb_method hdb_samba4;
 
 struct hdb_samba4_private {

diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index 86d03822ac0ae7f89c33c5119b659a69b257a460..cddf7f0961008e3c27b352acf80bdd5e845a7138 100644 (file)
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -740,24 +740,24 @@ static void kdc_task_init(struct task_server *task)
        }
        kdc->config->num_db = 1;
 
-       status = hdb_samba4_create_kdc(kdc, task->event_ctx, task->lp_ctx,
-                                      kdc->smb_krb5_context->krb5_context,
-                                      &kdc->config->db[0]);
-       if (!NT_STATUS_IS_OK(status)) {
-               task_server_terminate(task, "kdc: hdb_samba4_create_kdc (setup KDC database) failed", true);
-               return;
-       }
-
        /* Register hdb-samba4 hooks for use as a keytab */
 
-       kdc->hdb_samba4_context = talloc(kdc, struct hdb_samba4_context);
-       if (!kdc->hdb_samba4_context) {
+       kdc->base_ctx = talloc_zero(kdc, struct samba_kdc_base_context);
+       if (!kdc->base_ctx) {
                task_server_terminate(task, "kdc: out of memory", true);
                return;
        }
 
-       kdc->hdb_samba4_context->ev_ctx = task->event_ctx;
-       kdc->hdb_samba4_context->lp_ctx = task->lp_ctx;
+       kdc->base_ctx->ev_ctx = task->event_ctx;
+       kdc->base_ctx->lp_ctx = task->lp_ctx;
+
+       status = hdb_samba4_create_kdc(kdc->base_ctx,
+                                      kdc->smb_krb5_context->krb5_context,
+                                      &kdc->config->db[0]);
+       if (!NT_STATUS_IS_OK(status)) {
+               task_server_terminate(task, "kdc: hdb_samba4_create_kdc (setup KDC database) failed", true);
+               return;
+       }
 
        ret = krb5_plugin_register(kdc->smb_krb5_context->krb5_context,
                                   PLUGIN_TYPE_DATA, "hdb",

diff --git a/source4/kdc/kdc.h b/source4/kdc/kdc.h
index 57f05e8922cd075175fe4a864f07a11b70fb7662..1809092d7c4a47362f0d7c38cb1f446b5c50c439 100644 (file)
--- a/source4/kdc/kdc.h
+++ b/source4/kdc/kdc.h
@@ -27,17 +27,8 @@
 #include <krb5/windc_plugin.h>
 #include "kdc/hdb-samba4.h"
 
-struct kdc_server;
 struct tsocket_address;
 
-bool kpasswdd_process(struct kdc_server *kdc,
-                     TALLOC_CTX *mem_ctx,
-                     DATA_BLOB *input,
-                     DATA_BLOB *reply,
-                     struct tsocket_address *peer_addr,
-                     struct tsocket_address *my_addr,
-                     int datagram_reply);
-
 /*
   top level context structure for the kdc server
 */
@@ -45,11 +36,17 @@ struct kdc_server {
        struct task_server *task;
        krb5_kdc_configuration *config;
        struct smb_krb5_context *smb_krb5_context;
-       struct hdb_samba4_context *hdb_samba4_context;
+       struct samba_kdc_base_context *base_ctx;
 };
 
+bool kpasswdd_process(struct kdc_server *kdc,
+                     TALLOC_CTX *mem_ctx,
+                     DATA_BLOB *input,
+                     DATA_BLOB *reply,
+                     struct tsocket_address *peer_addr,
+                     struct tsocket_address *my_addr,
+                     int datagram_reply);
+
 /* from hdb-samba4.c */
-NTSTATUS hdb_samba4_create_kdc(TALLOC_CTX *mem_ctx,
-                             struct tevent_context *ev_ctx,
-                             struct loadparm_context *lp_ctx,
-                             krb5_context context, struct HDB **db);
+NTSTATUS hdb_samba4_create_kdc(struct samba_kdc_base_context *base_ctx,
+                              krb5_context context, struct HDB **db);

diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c
index 8406887dad0b473b659a73a868921319c0dfd945..8009f9c06adade82ee829153bd4d8e8eac0e8e44 100644 (file)
--- a/source4/kdc/kpasswdd.c
+++ b/source4/kdc/kpasswdd.c
@@ -482,7 +482,7 @@ bool kpasswdd_process(struct kdc_server *kdc,
        cli_credentials_set_krb5_context(server_credentials, kdc->smb_krb5_context);
        cli_credentials_set_conf(server_credentials, kdc->task->lp_ctx);
 
-       keytab_name = talloc_asprintf(server_credentials, "HDB:samba4&%p", kdc->hdb_samba4_context);
+       keytab_name = talloc_asprintf(server_credentials, "HDB:samba4&%p", kdc->base_ctx);
 
        cli_credentials_set_username(server_credentials, "kadmin/changepw", CRED_SPECIFIED);
        ret = cli_credentials_set_keytab_name(server_credentials, kdc->task->event_ctx, kdc->task->lp_ctx, keytab_name, CRED_SPECIFIED);

diff --git a/source4/libnet/libnet_export_keytab.c b/source4/libnet/libnet_export_keytab.c
index a7006b4bf9d0d55ed8a8b8541f71f2d883bc2b79..da095e39f895942ea5230ad67c309e54a669088e 100644 (file)
--- a/source4/libnet/libnet_export_keytab.c
+++ b/source4/libnet/libnet_export_keytab.c
@@ -13,15 +13,15 @@ NTSTATUS libnet_export_keytab(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, s
 
        /* Register hdb-samba4 hooks for use as a keytab */
 
-       struct hdb_samba4_context *hdb_samba4_context = talloc(mem_ctx, struct hdb_samba4_context);
-       if (!hdb_samba4_context) {
+       struct samba_kdc_base_context *base_ctx = talloc_zero(mem_ctx, struct samba_kdc_base_context);
+       if (!base_ctx) {
                return NT_STATUS_NO_MEMORY; 
        }
 
-       hdb_samba4_context->ev_ctx = ctx->event_ctx;
-       hdb_samba4_context->lp_ctx = ctx->lp_ctx;
+       base_ctx->ev_ctx = ctx->event_ctx;
+       base_ctx->lp_ctx = ctx->lp_ctx;
 
-       from_keytab = talloc_asprintf(hdb_samba4_context, "HDB:samba4&%p", hdb_samba4_context);
+       from_keytab = talloc_asprintf(base_ctx, "HDB:samba4&%p", base_ctx);
        if (!from_keytab) {
                return NT_STATUS_NO_MEMORY;
        }