diff options
| author | Günther Deschner <gd@samba.org> | 2011-04-15 12:37:55 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-04-15 12:37:55 +0200 |
| commit | 6768b651232a9b65c9d090db7c445e3e9047f056 (patch) | |
| tree | 461f87963e7a4236a606dbf26c7a23655dbd0d24 | |
| parent | 53f50c2268122e648a09e4b0643cd29fcc7a4bfd (diff) | |
| download | samba-6768b651232a9b65c9d090db7c445e3e9047f056.tar.gz samba-6768b651232a9b65c9d090db7c445e3e9047f056.tar.bz2 samba-6768b651232a9b65c9d090db7c445e3e9047f056.zip | |
s3-waf: try to fix the non-ldap-but-krb5 build.
Guenther
| -rw-r--r-- | source3/libads/kerberos_keytab.c | 4 | ||||
| -rw-r--r-- | source3/utils/net_ads.c | 2 | ||||
| -rwxr-xr-x | source3/wscript_build | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c index 721a8c6f53..6e1b7c08fe 100644 --- a/source3/libads/kerberos_keytab.c +++ b/source3/libads/kerberos_keytab.c @@ -250,6 +250,8 @@ out: return (int)ret; } +#ifdef HAVE_ADS + /********************************************************************** Adds a single service principal, i.e. 'host' to the system keytab ***********************************************************************/ @@ -724,6 +726,8 @@ done: return ret; } +#endif /* HAVE_ADS */ + /********************************************************************** List system keytab. ***********************************************************************/ diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index ca5c1bffd7..4b4b0a8031 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -2862,4 +2862,4 @@ int net_ads(struct net_context *c, int argc, const char **argv) return net_ads_noads(); } -#endif /* WITH_ADS */ +#endif /* HAVE_ADS */ diff --git a/source3/wscript_build b/source3/wscript_build index 0b924cad4d..b40939405a 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -829,8 +829,7 @@ bld.SAMBA3_LIBRARY('ads', source=LIBADS_SRC, deps='cli-ldap-common krb5 gssapi gssapi_krb5 ldap lber', private_library=True, - vars=locals(), - enabled=bld.env.HAVE_ADS) + vars=locals()) bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER', source=LIBADS_SERVER_SRC, |