Attachment 10896 Details for Bug 11140 – Patch for 4.2

[patch] Patch for 4.2

patch-4.2 (text/plain), 1.41 KB, created by Christof Schmitt on 2015-03-20 16:08:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christof Schmitt

Created: 2015-03-20 16:08:14 UTC

Size: 1.41 KB

patch

obsolete

>From b16d052844b74f7f1ce3235ef46e677a68e3fe67 Mon Sep 17 00:00:00 2001
>From: Thomas Schulz <schulz@adi.com>
>Date: Mon, 16 Mar 2015 10:21:46 -0700
>Subject: [PATCH] libcli/auth: Match Declaration of netlogon_creds_cli_context_tmp with implementation
>
>I have been building 4.2.0 with the GNU C compiler but I decided to see
>how it works with the Sun C 5.11 compiler. The Sun compiler complains
>about a identifier being redeclared in libcli/auth/netlogon_creds_cli.c
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11140
>
>Reviewed-by: Christof Schmitt <cs@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 820a0a91fbd341f3172b0d048a920cb2538bbd38)
>---
> libcli/auth/netlogon_creds_cli.h |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/libcli/auth/netlogon_creds_cli.h b/libcli/auth/netlogon_creds_cli.h
>index a910259..da89e3a 100644
>--- a/libcli/auth/netlogon_creds_cli.h
>+++ b/libcli/auth/netlogon_creds_cli.h
>@@ -44,9 +44,9 @@ NTSTATUS netlogon_creds_cli_context_global(struct loadparm_context *lp_ctx,
> NTSTATUS netlogon_creds_cli_context_tmp(const char *client_computer,
> 				const char *client_account,
> 				enum netr_SchannelType type,
>-				enum dcerpc_AuthLevel auth_level,
> 				uint32_t proposed_flags,
> 				uint32_t required_flags,
>+				enum dcerpc_AuthLevel auth_level,
> 				const char *server_computer,
> 				const char *server_netbios_domain,
> 				TALLOC_CTX *mem_ctx,
>-- 
>1.7.1
>

Flags:

cs: review+
obnox: review+

Actions: View

Attachments on bug 11140: 10830 | 10896