summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/addns/dns.h4
-rw-r--r--lib/addns/dnsgss.c4
-rwxr-xr-xlib/addns/wscript_build2
-rwxr-xr-xlib/krb5_wrap/wscript_build10
-rw-r--r--lib/replace/system/gssapi.h2
5 files changed, 13 insertions, 9 deletions
diff --git a/lib/addns/dns.h b/lib/addns/dns.h
index 2e80577642..2864bdf539 100644
--- a/lib/addns/dns.h
+++ b/lib/addns/dns.h
@@ -436,7 +436,7 @@ const char *dns_errstr(DNS_ERROR err);
/* from dnsgss.c */
-#ifdef HAVE_KRB5
+#ifdef HAVE_GSSAPI
void display_status( const char *msg, OM_uint32 maj_stat, OM_uint32 min_stat );
DNS_ERROR dns_negotiate_sec_ctx( const char *target_realm,
@@ -450,6 +450,6 @@ DNS_ERROR dns_sign_update(struct dns_update_request *req,
const char *algorithmname,
time_t time_signed, uint16 fudge);
-#endif /* HAVE_KRB5 */
+#endif /* HAVE_GSSAPI */
#endif /* _DNS_H */
diff --git a/lib/addns/dnsgss.c b/lib/addns/dnsgss.c
index 4fef832926..4f7571f87d 100644
--- a/lib/addns/dnsgss.c
+++ b/lib/addns/dnsgss.c
@@ -26,7 +26,7 @@
#include <ctype.h>
-#ifdef HAVE_KRB5
+#ifdef HAVE_GSSAPI
/*********************************************************************
*********************************************************************/
@@ -331,4 +331,4 @@ DNS_ERROR dns_sign_update(struct dns_update_request *req,
return err;
}
-#endif /* HAVE_KRB5 */
+#endif /* HAVE_GSSAPI */
diff --git a/lib/addns/wscript_build b/lib/addns/wscript_build
index 921815ac3a..f1bab053c3 100755
--- a/lib/addns/wscript_build
+++ b/lib/addns/wscript_build
@@ -2,6 +2,6 @@
bld.SAMBA_LIBRARY('addns',
source='dnsquery.c dnsrecord.c dnsutils.c dnssock.c dnsgss.c dnsmarshall.c error.c',
- public_deps='DNS_HOSTS_FILE samba-util krb5 gssapi_krb5 uuid resolv',
+ public_deps='DNS_HOSTS_FILE samba-util gssapi uuid resolv',
private_library=True,
vars=locals())
diff --git a/lib/krb5_wrap/wscript_build b/lib/krb5_wrap/wscript_build
index 2a61f5633f..f5190bc001 100755
--- a/lib/krb5_wrap/wscript_build
+++ b/lib/krb5_wrap/wscript_build
@@ -1,7 +1,11 @@
#!/usr/bin/env python
+add_deps = ''
+if bld.CONFIG_SET('SAMBA4_USES_HEIMDAL'):
+ add_deps = ' asn1'
+
bld.SAMBA_LIBRARY('krb5samba',
source='krb5_samba.c keytab_util.c',
- deps='samba-util asn1util talloc krb5 com_err',
- private_library=True
- )
+ deps='samba-util asn1util talloc krb5 com_err' + add_deps,
+ private_library=True
+ )
diff --git a/lib/replace/system/gssapi.h b/lib/replace/system/gssapi.h
index c22663c1d0..6386c7b21a 100644
--- a/lib/replace/system/gssapi.h
+++ b/lib/replace/system/gssapi.h
@@ -27,7 +27,7 @@
*/
-#ifdef HAVE_LIBGSSAPI
+#ifdef HAVE_GSSAPI
#ifdef HAVE_GSSAPI_GSSAPI_EXT_H
#include <gssapi/gssapi_ext.h>