From 3bcc66d6594d8225048373272dcf84ff391dca85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= Date: Mon, 2 Jul 2012 00:46:06 +0200 Subject: [PATCH] s3: fix build without ads support when we have no ads support we don't have the ads_get_sid_token symbol used in this unused code :-) this is the backport of 43c56dc4255a7a6cbd176e6ae66a7652c6d72d2c --- 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 7a23b5c..4e0c8ab 100644 --- a/libgpo/gpo_util.c +++ b/libgpo/gpo_util.c @@ -840,6 +840,7 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads, const char *dn, NT_USER_TOKEN **token) { +#ifdef HAVE_ADS NT_USER_TOKEN *ad_token = NULL; ADS_STATUS status; #if _SAMBA_BUILD_ == 4 @@ -848,9 +849,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; @@ -866,4 +864,7 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads, } #endif return ADS_SUCCESS; +#else + return ADS_ERROR_NT(NT_STATUS_NOT_SUPPORTED); +#endif } -- 1.7.10.3