From 4ba1375526e6582d6c095592f0e82d1ba501ee3e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 14 Apr 2011 15:40:28 +1000
Subject: libcli/auth Move krb5 wrapper functions from s3 into common

This requires a small rework of the build system to ensure that the
correct #define statements are made in both the s3 and top level
builds.  We now define the various HAVE_ macros in config.h at all
times, using heimdal_build/wscript_configure when that is in use.

Andrew Bartlett
---
 source3/include/smb_krb5.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'source3/include/smb_krb5.h')

diff --git a/source3/include/smb_krb5.h b/source3/include/smb_krb5.h
index adbb0debc3..042b7ebe40 100644
--- a/source3/include/smb_krb5.h
+++ b/source3/include/smb_krb5.h
@@ -10,9 +10,7 @@
 #define KRB5_DEPRECATED
 #endif
 
-#if HAVE_KRB5_H
-#include <krb5.h>
-#endif
+#include "libcli/auth/krb5_wrap.h"
 
 #if HAVE_GSSAPI_GSSAPI_H
 #include <gssapi/gssapi.h>
@@ -22,10 +20,6 @@
 #include <gssapi.h>
 #endif
 
-#if HAVE_COM_ERR_H
-#include <com_err.h>
-#endif
-
 #ifndef KRB5_ADDR_NETBIOS
 #define KRB5_ADDR_NETBIOS 0x14
 #endif
-- 
cgit