Attachment 7657 Details for Bug 8996 – fix for compile without ads support with solaris compiler

[patch] fix for compile without ads support with solaris compiler

0001-s3-fix-build-without-ads-support.patch (text/plain), 1.35 KB, created by Björn Jacke on 2012-06-18 10:39:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Jacke

Created: 2012-06-18 10:39:13 UTC

Size: 1.35 KB

patch

obsolete

>From 43c56dc4255a7a6cbd176e6ae66a7652c6d72d2c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
>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=UTF-8
>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 <bj@sernet.de>
>Autobuild-Date(master): Wed Jun 13 21:20:15 CEST 2012 on sn-devel-104
>---
> libgpo/gpo_util.c |    7 ++++---
> 1 Datei geÃ¤ndert, 4 Zeilen hinzugefÃ¼gt(+), 3 Zeilen entfernt(-)
>
>diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
>index ca529f8..cfb4512 100644
>--- a/libgpo/gpo_util.c
>+++ b/libgpo/gpo_util.c
>@@ -838,13 +838,11 @@ 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;
> 	NTSTATUS ntstatus;
> 
>-#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;
>@@ -855,4 +853,7 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads,
> 		return ADS_ERROR_NT(ntstatus);
> 	}
> 	return ADS_SUCCESS;
>+#else
>+	return ADS_ERROR_NT(NT_STATUS_NOT_SUPPORTED);
>+#endif
> }
>-- 
>1.7.10.3
>

Flags:

bjacke: review+

Actions: View

Attachments on bug 8996: 7657 | 7682