Move kdc_get_policy helper in the lsa server where it belongs.

[idra/samba.git] / source4 / kdc / db-glue.c

diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index 95a524d605465002e2597d0942a83073cc088289..7bb2db2fb05ded872b8c63f6f92c70a7041f3f66 100644 (file)
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -35,7 +35,6 @@
 #include <hdb.h>
 #include "kdc/samba_kdc.h"
 #include "kdc/kdc-glue.h"
-#include "kdc/kdc-policy.h"
 #include "kdc/db-glue.h"
 
 #define SAMBA_KVNO_GET_KRBTGT(kvno) \
@@ -784,12 +783,12 @@ static krb5_error_code samba_kdc_message2entry(krb5_context context,
        }
 
        if (ent_type == SAMBA_KDC_ENT_TYPE_SERVER) {
-               *entry_ex->entry.max_life = nt_time_to_unix(kdc_db_ctx->policy.service_tkt_lifetime);
+               *entry_ex->entry.max_life = kdc_db_ctx->policy.svc_tkt_lifetime;
        } else if (ent_type == SAMBA_KDC_ENT_TYPE_KRBTGT || ent_type == SAMBA_KDC_ENT_TYPE_CLIENT) {
-               *entry_ex->entry.max_life = nt_time_to_unix(kdc_db_ctx->policy.user_tkt_lifetime);
+               *entry_ex->entry.max_life = kdc_db_ctx->policy.usr_tkt_lifetime;
        } else {
-               *entry_ex->entry.max_life = MIN(nt_time_to_unix(kdc_db_ctx->policy.service_tkt_lifetime),
-                                              nt_time_to_unix(kdc_db_ctx->policy.user_tkt_lifetime));
+               *entry_ex->entry.max_life = MIN(kdc_db_ctx->policy.svc_tkt_lifetime,
+                                               kdc_db_ctx->policy.usr_tkt_lifetime);
        }
 
        entry_ex->entry.max_renew = malloc(sizeof(*entry_ex->entry.max_life));
@@ -798,7 +797,7 @@ static krb5_error_code samba_kdc_message2entry(krb5_context context,
                goto out;
        }
 
-       *entry_ex->entry.max_renew = nt_time_to_unix(kdc_db_ctx->policy.user_tkt_renewaltime);
+       *entry_ex->entry.max_renew = kdc_db_ctx->policy.renewal_lifetime;
 
        entry_ex->entry.generation = NULL;
 
@@ -1881,7 +1880,11 @@ NTSTATUS samba_kdc_setup_db_ctx(TALLOC_CTX *mem_ctx, struct samba_kdc_base_conte
        kdc_db_ctx->ev_ctx = base_ctx->ev_ctx;
        kdc_db_ctx->lp_ctx = base_ctx->lp_ctx;
 
-       kdc_get_policy(base_ctx->lp_ctx, NULL, &kdc_db_ctx->policy);
+       /* get default kdc policy */
+       lpcfg_default_kdc_policy(base_ctx->lp_ctx,
+                                &kdc_db_ctx->policy.svc_tkt_lifetime,
+                                &kdc_db_ctx->policy.usr_tkt_lifetime,
+                                &kdc_db_ctx->policy.renewal_lifetime);
 
        session_info = system_session(kdc_db_ctx->lp_ctx);
        if (session_info == NULL) {