summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-02-13 11:21:11 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-02-13 04:41:05 +0100
commit310cf9857491e23678657598739d77520e7afcda (patch)
treebee744c0dd98cd35e4f917c3397306e22e2ed428 /lib
parentbee55a29578e8eab66c36de9b2526769b05b8dba (diff)
downloadsamba-310cf9857491e23678657598739d77520e7afcda.tar.gz
samba-310cf9857491e23678657598739d77520e7afcda.tar.bz2
samba-310cf9857491e23678657598739d77520e7afcda.zip
s3-lib/addns: Move to system/kerberos.h and HAVE_KRB5
Diffstat (limited to 'lib')
-rw-r--r--lib/addns/dns.h17
-rw-r--r--lib/addns/dnsgss.c4
2 files changed, 3 insertions, 18 deletions
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 */