diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-08-01 21:36:49 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-08-01 21:36:49 +0200 |
| commit | b1f85bfb005c4f6c93cf88779e3a12abbd99c973 (patch) | |
| tree | 404dc0a9a298e7ef6a3f3e68f1b937b0dead1894 /source4/kdc/kpasswdd.c | |
| parent | 47124efe420f4f4f08494cbb2255eacdc9625c8d (diff) | |
| parent | d9ad17f945d21d50ea629e22db3ee8758be421a6 (diff) | |
| download | samba-b1f85bfb005c4f6c93cf88779e3a12abbd99c973.tar.gz samba-b1f85bfb005c4f6c93cf88779e3a12abbd99c973.tar.bz2 samba-b1f85bfb005c4f6c93cf88779e3a12abbd99c973.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
(This used to be commit 8e201ecf3e86c3c8865c7276fad8dad07106efaf)
Diffstat (limited to 'source4/kdc/kpasswdd.c')
| -rw-r--r-- | source4/kdc/kpasswdd.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c index 55dadd9a7e..065777fc66 100644 --- a/source4/kdc/kpasswdd.c +++ b/source4/kdc/kpasswdd.c @@ -38,9 +38,11 @@ #include "param/param.h" #include "kdc/kdc.h" -/* TODO: remove this */ -#include "heimdal/lib/krb5/krb5_locl.h" +/* TODO: remove all SAMBA4_INTERNAL_HEIMDAL stuff from this file */ +#ifdef SAMBA4_INTERNAL_HEIMDAL +#include "heimdal/lib/hcrypto/aes.h" #include "heimdal/lib/krb5/krb5-private.h" +#endif /* hold information about one kdc socket */ struct kpasswd_socket { @@ -285,6 +287,7 @@ static bool kpasswd_process_request(struct kdc_server *kdc, reply); } if (chpw.targname && chpw.targrealm) { +#ifdef SAMBA4_INTERNAL_HEIMDAL if (_krb5_principalname2krb5_principal(kdc->smb_krb5_context->krb5_context, &principal, *chpw.targname, *chpw.targrealm) != 0) { @@ -295,6 +298,12 @@ static bool kpasswd_process_request(struct kdc_server *kdc, reply); } +#else /* SAMBA4_INTERNAL_HEIMDAL */ + return kpasswdd_make_error_reply(kdc, mem_ctx, + KRB5_KPASSWD_BAD_VERSION, + "Operation Not Implemented", + reply); +#endif /* SAMBA4_INTERNAL_HEIMDAL */ } else { free_ChangePasswdDataMS(&chpw); return kpasswdd_change_password(kdc, mem_ctx, session_info, |