From 310cf9857491e23678657598739d77520e7afcda Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 13 Feb 2012 11:21:11 +1100
Subject: s3-lib/addns: Move to system/kerberos.h and HAVE_KRB5

---
 lib/addns/dns.h    | 17 +----------------
 lib/addns/dnsgss.c |  4 ++--
 2 files changed, 3 insertions(+), 18 deletions(-)

(limited to 'lib/addns')

diff --git a/lib/addns/dns.h b/lib/addns/dns.h
index d98a27ea2d..a4b033d712 100644
--- a/lib/addns/dns.h
+++ b/lib/addns/dns.h
@@ -27,6 +27,7 @@
 
 #include "../replace/replace.h"
 #include "system/network.h"
+#include "system/kerberos.h"
 
 /* make sure we have included the correct config.h */
 #ifndef NO_CONFIG_H /* for some tests */
@@ -77,22 +78,6 @@
 #endif
 #endif
 
-#ifdef HAVE_KRB5_H
-#include <krb5.h>
-#endif
-
-#if HAVE_GSSAPI_GSSAPI_H
-#include <gssapi/gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
-#include <gssapi/gssapi_generic.h>
-#elif HAVE_GSSAPI_H
-#include <gssapi.h>
-#endif
-
-#if defined(HAVE_GSSAPI_H) || defined(HAVE_GSSAPI_GSSAPI_H) || defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)
-#define HAVE_GSSAPI_SUPPORT    1
-#endif
-
 #include <talloc.h>
 
 /*******************************************************************
diff --git a/lib/addns/dnsgss.c b/lib/addns/dnsgss.c
index 19b734a6a3..4fef832926 100644
--- a/lib/addns/dnsgss.c
+++ b/lib/addns/dnsgss.c
@@ -26,7 +26,7 @@
 #include <ctype.h>
 
 
-#ifdef HAVE_GSSAPI_SUPPORT
+#ifdef HAVE_KRB5
 
 /*********************************************************************
 *********************************************************************/
@@ -331,4 +331,4 @@ DNS_ERROR dns_sign_update(struct dns_update_request *req,
 	return err;
 }
 
-#endif	/* HAVE_GSSAPI_SUPPORT */
+#endif	/* HAVE_KRB5 */
-- 
cgit