s3-libads: Move to using only the HAVE_KRB5 define
[sfrench/samba-autobuild/.git] / lib / addns / dns.h
index 6ccdbb60f1a004de751d9ab7a27cabc1547d97de..d0999918c14217e83dd0e29e35102a55cc4a32cd 100644 (file)
@@ -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 */
 #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>
 
 /*******************************************************************
 #define QTYPE_MD        3
 #define QTYPE_CNAME    5
 #define QTYPE_SOA      6
+#define QTYPE_AAAA     28
 #define QTYPE_ANY      255
 #define        QTYPE_TKEY      249
 #define QTYPE_TSIG     250
@@ -408,6 +394,9 @@ DNS_ERROR dns_create_name_not_in_use_record(TALLOC_CTX *mem_ctx,
 DNS_ERROR dns_create_a_record(TALLOC_CTX *mem_ctx, const char *host,
                              uint32 ttl, const struct sockaddr_storage *pss,
                              struct dns_rrec **prec);
+DNS_ERROR dns_create_aaaa_record(TALLOC_CTX *mem_ctx, const char *host,
+                                uint32 ttl, const struct sockaddr_storage *pss,
+                                struct dns_rrec **prec);
 DNS_ERROR dns_unmarshall_tkey_record(TALLOC_CTX *mem_ctx, struct dns_rrec *rec,
                                     struct dns_tkey_record **ptkey);
 DNS_ERROR dns_create_tsig_record(TALLOC_CTX *mem_ctx, const char *keyname,
@@ -479,7 +468,7 @@ const char *dns_errstr(DNS_ERROR err);
 
 /* from dnsgss.c */
 
-#ifdef HAVE_GSSAPI_SUPPORT
+#ifdef HAVE_KRB5
 
 void display_status( const char *msg, OM_uint32 maj_stat, OM_uint32 min_stat ); 
 DNS_ERROR dns_negotiate_sec_ctx( const char *target_realm,
@@ -493,6 +482,6 @@ DNS_ERROR dns_sign_update(struct dns_update_request *req,
                          const char *algorithmname,
                          time_t time_signed, uint16 fudge);
 
-#endif /* HAVE_GSSAPI_SUPPORT */
+#endif /* HAVE_KRB5 */
 
 #endif /* _DNS_H */