diff options
| author | Andreas Schneider <asn@samba.org> | 2016-09-07 16:38:06 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2016-09-13 00:19:26 +0200 |
| commit | 510e504a5b8a2dd05803e9dc7ab34786a8b77967 (patch) | |
| tree | 04a9e1dae8f2a070b9d9827c5c555c3a2716996f /source4/kdc | |
| parent | 7e4c996bb13a6cc3e713e5aa2a76a556cb185f1e (diff) | |
| download | samba-510e504a5b8a2dd05803e9dc7ab34786a8b77967.tar.gz | |
s4-kdc: Switch to the new kpasswd service implementation
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source4/kdc')
| -rw-r--r-- | source4/kdc/kdc-heimdal.c | 13 | ||||
| -rwxr-xr-x | source4/kdc/wscript_build | 3 |
2 files changed, 13 insertions, 3 deletions
diff --git a/source4/kdc/kdc-heimdal.c b/source4/kdc/kdc-heimdal.c index be4507386bc..f2927e5cb9f 100644 --- a/source4/kdc/kdc-heimdal.c +++ b/source4/kdc/kdc-heimdal.c @@ -33,6 +33,7 @@ #include "kdc/kdc-proxy.h" #include "kdc/kdc-glue.h" #include "kdc/pac-glue.h" +#include "kdc/kpasswd-service.h" #include "dsdb/samdb/samdb.h" #include "auth/session.h" #include "libds/common/roles.h" @@ -151,7 +152,7 @@ static NTSTATUS kdc_startup_interfaces(struct kdc_server *kdc, struct loadparm_c if (kpasswd_port) { status = kdc_add_socket(kdc, model_ops, "kpasswd", wcard[i], kpasswd_port, - kpasswdd_process, false); + kpasswd_process, false); if (NT_STATUS_IS_OK(status)) { num_binds++; } @@ -177,7 +178,7 @@ static NTSTATUS kdc_startup_interfaces(struct kdc_server *kdc, struct loadparm_c if (kpasswd_port) { status = kdc_add_socket(kdc, model_ops, "kpasswd", address, kpasswd_port, - kpasswdd_process, done_wildcard); + kpasswd_process, done_wildcard); NT_STATUS_NOT_OK_RETURN(status); } } @@ -411,6 +412,14 @@ static void kdc_task_init(struct task_server *task) return; } + kdc->keytab_name = talloc_asprintf(kdc, "HDB:samba4&%p", kdc->base_ctx); + if (kdc->keytab_name == NULL) { + task_server_terminate(task, + "kdc: Failed to set keytab name", + true); + return; + } + /* Register WinDC hooks */ ret = krb5_plugin_register(kdc->smb_krb5_context->krb5_context, PLUGIN_TYPE_DATA, "windc", diff --git a/source4/kdc/wscript_build b/source4/kdc/wscript_build index 18eae904872..24d89f4c89b 100755 --- a/source4/kdc/wscript_build +++ b/source4/kdc/wscript_build @@ -7,7 +7,7 @@ else: kdc_include = getattr(bld.env, "CPPPATH_KDC") bld.SAMBA_MODULE('service_kdc', - source='kdc-heimdal.c kpasswd-helper.c kpasswd-heimdal.c', + source='kdc-heimdal.c', subsystem='service', init_function='server_service_kdc_init', deps=''' @@ -20,6 +20,7 @@ bld.SAMBA_MODULE('service_kdc', PAC_GLUE KDC-GLUE KDC-SERVER + KPASSWD-SERVICE KPASSWD_GLUE ''', internal_module=False) |