Attachment 7957 Details for Bug 9223 – git-am fix for 4.0.0rc2

[patch] git-am fix for 4.0.0rc2

0001-s4-Fix-a-Wunused-value-warning.patch (text/plain), 1.00 KB, created by Jeremy Allison on 2012-09-28 21:13:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2012-09-28 21:13:17 UTC

Size: 1.00 KB

patch

obsolete

>From 00502a859c1e214b85fe5589f489d9fc51ea1c66 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Wed, 26 Sep 2012 10:07:32 -0700
>Subject: [PATCH] s4: Fix a -Wunused-value warning
>
>Autobuild-User(master): Volker Lendecke <vl@samba.org>
>Autobuild-Date(master): Wed Sep 26 21:52:00 CEST 2012 on sn-devel-104
>(cherry picked from commit 5022b3d8c183181b922e3ccac49e5819eb453035)
>---
> source4/cldap_server/netlogon.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c
>index ce257e9..6d5efb5 100644
>--- a/source4/cldap_server/netlogon.c
>+++ b/source4/cldap_server/netlogon.c
>@@ -241,7 +241,7 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx,
> 	}
> 
> 	if (str_list_check(services, "ntp_signd")) {
>-		server_type | DS_SERVER_TIMESERV | DS_SERVER_GOOD_TIMESERV;
>+		server_type |= DS_SERVER_TIMESERV | DS_SERVER_GOOD_TIMESERV;
> 	}
> 
> 	if (samdb_rodc(sam_ctx, &am_rodc) == LDB_SUCCESS && !am_rodc) {
>-- 
>1.7.7.3
>

Flags:

vl: review+

Actions: View

Attachments on bug 9223: 7957