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

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  9aa0c85 s3: fix build without ads support
      from  0e2fb6c Fix bug #8974 - Kernel oplocks are broken when uid(file) != uid(process).

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


- Log -----------------------------------------------------------------
commit 9aa0c85e84b1e66142b65631a244aec8b2111bbc
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Jun 13 19:28: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 :-)
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    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.

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

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 553402a..91078bb 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
 }


-- 
Samba Shared Repository