diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-06-08 19:06:16 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-06-12 07:45:48 +1000 |
| commit | 9b261c008a395a323e0516f4cd3f3134aa050577 (patch) | |
| tree | 91cf543ba7ccd560313bea52fa8678f0456e8485 /source4/kdc/kdc.c | |
| parent | 5cef57ff7d899773a084d23838b7f18a83f6e79d (diff) | |
| download | samba-9b261c008a395a323e0516f4cd3f3134aa050577.tar.gz samba-9b261c008a395a323e0516f4cd3f3134aa050577.tar.bz2 samba-9b261c008a395a323e0516f4cd3f3134aa050577.zip | |
s4:heimdal: import lorikeet-heimdal-200906080040 (commit 904d0124b46eed7a8ad6e5b73e892ff34b6865ba)
Also including the supporting changes required to pass make test
A number of heimdal functions and constants have changed since we last
imported a tree (for the better, but inconvenient for us).
Andrew Bartlett
Diffstat (limited to 'source4/kdc/kdc.c')
| -rw-r--r-- | source4/kdc/kdc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c index 3d11441062..ad74e10227 100644 --- a/source4/kdc/kdc.c +++ b/source4/kdc/kdc.c @@ -661,7 +661,9 @@ static NTSTATUS kdc_check_generic_kerberos(struct irpc_message *msg, static struct hdb_method hdb_samba4 = { .interface_version = HDB_INTERFACE_VERSION, - .prefix = "samba4:", + .prefix = "samba4", /* Only used in the hdb-backed keytab code + * for a keytab of 'samba4:', to find + * kpasswd's key in the main DB */ .create = hdb_samba4_create }; @@ -722,7 +724,7 @@ static void kdc_task_init(struct task_server *task) task_server_terminate(task, "kdc: failed to get KDC configuration"); return; } - + kdc->config->logf = kdc->smb_krb5_context->logf; kdc->config->db = talloc(kdc, struct HDB *); if (!kdc->config->db) { |