From 5fd1c5445b16cbe4927aaae60a099dde597ef7b4 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 1 Aug 2008 19:30:16 +0200
Subject: libreplace: include <krb5.h> and <com_err.h> and no heimdal specific
 headers

metze
(This used to be commit cffed8e19e22a1fa7b7a322b153df5d54e4c3be2)
---
 source4/kdc/kpasswdd.c                | 13 +++++++++++--
 source4/lib/replace/system/kerberos.h |  5 +++--
 2 files changed, 14 insertions(+), 4 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, 
diff --git a/source4/lib/replace/system/kerberos.h b/source4/lib/replace/system/kerberos.h
index 78aa7b943f..2981024bee 100644
--- a/source4/lib/replace/system/kerberos.h
+++ b/source4/lib/replace/system/kerberos.h
@@ -129,8 +129,9 @@
 /* Whether krb5_princ_realm returns krb5_realm or krb5_data */
 #define KRB5_PRINC_REALM_RETURNS_REALM 1
 
-#include "heimdal/lib/krb5/krb5.h"
-#include "heimdal/lib/com_err/com_err.h"
+#include <krb5.h>
+#include <com_err.h>
+
 #endif
 
 #endif
-- 
cgit