From aed0136b8eeacd0aece3abd1f1b2bf8ef88e61cf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Jacke?= Date: Wed, 13 Jun 2012 19:28:06 +0200 Subject: [PATCH] s3: fix build without ads support MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit when we have no ads support we don't have the ads_get_sid_token symbol used in this unused code :-) Autobuild-User(master): Björn Jacke Autobuild-Date(master): Wed Jun 13 21:20:15 CEST 2012 on sn-devel-104 (cherry picked from commit 43c56dc4255a7a6cbd176e6ae66a7652c6d72d2c) Fix bug #8996 - build without ads support (e.g. plain solaris 8) broken. (cherry picked from commit 9aa0c85e84b1e66142b65631a244aec8b2111bbc) --- libgpo/gpo_util.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c index 553402a4274..91078bb2fc5 100644 --- a/libgpo/gpo_util.c +++ b/libgpo/gpo_util.c @@ -843,6 +843,7 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads, const char *dn, struct security_token **token) { +#ifdef HAVE_ADS struct security_token *ad_token = NULL; ADS_STATUS status; #if _SAMBA_BUILD_ == 4 @@ -851,9 +852,6 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads, NTSTATUS ntstatus; #endif -#ifndef HAVE_ADS - return ADS_ERROR_NT(NT_STATUS_NOT_SUPPORTED); -#endif status = ads_get_sid_token(ads, mem_ctx, dn, &ad_token); if (!ADS_ERR_OK(status)) { return status; @@ -869,4 +867,7 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads, } #endif return ADS_SUCCESS; +#else + return ADS_ERROR_NT(NT_STATUS_NOT_SUPPORTED); +#endif } -- 2.11.4.GIT