[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  f8ed881 s3: fix build without ads support
      from  7a56042 s3: readd h_errno struct member but rename it

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit f8ed8815adc6acc42bab2f1b69085dcda8bb9894
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Jul 2 00:46:06 2012 +0200

    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
    
    Fix bug #8996 - build without ads support (e.g. plain solaris 8) broken.

-----------------------------------------------------------------------

Summary of changes:
 libgpo/gpo_util.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

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
 }


-- 
Samba Shared Repository