syntax error in source3/locking/brlock.c

[Christof Schmitt]

On Fri, Mar 20, 2015 at 10:58:50AM +0100, Michael Adam wrote:
> pushed

Thank you. The autobuild finished; i just attached the cherry-picked
patch for 4.2 to https://bugzilla.samba.org/show_bug.cgi?id=11140

Christof

> 
> On 2015-03-19 at 18:42 +0100, Michael Adam wrote:
> > On 2015-03-19 at 13:36 -0400, Thomas Schulz wrote:
> > > > From: Michael Adam <obnox at samba.org>
> > > > To: Christof Schmitt <cs at samba.org>
> > > > 
> > > > Reviewed-by: me
> > > > 
> > > > But this function is never used. Should we remove it?
> > > > 
> > > > Michael
> > > 
> > > In a later email, Stefan (metze) Metzmacher said:
> > > 
> > > > I'd like to keep that function, it's designed to be used
> > > > in torture tests later.
> > > 
> > > So, should we go with this patch?
> > 
> > Yep, definitely.
> > Will push later.
> > (Unless Christof does :)
> > 
> > Michael
> > 
> > 
> > > > On 2015-03-16 at 10:26 -0700, Christof Schmitt wrote:
> > > >> On Mon, Mar 16, 2015 at 10:46:10AM -0400, Thomas Schulz wrote:
> > > >> > Note that bug 11140 is another problem uncovered by the Solaris C
> > > >> > compiler and the bug report containes a patch. If that could be taken
> > > >> > care of then all the problems with the Solaris C compiler would be reso=
> > > > lved.
> > > >>=20
> > > >> Thank you for reporting this. Attached is the patch from the bugzilla
> > > >> with my sign-off for master. Can we get a second sign-off to push this
> > > >> to autobuid? After that, the patch can be backported.
> > > >>=20
> > > >> Christof
> > > > 
> > > >> From abd1870f8a9c906a765eda67edb9b510c929e6ee Mon Sep 17 00:00:00 2001
> > > >> From: Thomas Schulz <schulz at adi.com>
> > > >> Date: Mon, 16 Mar 2015 10:21:46 -0700
> > > >> Subject: [PATCH] libcli/auth: Match Declaration of  netlogon_creds_cli_co=
> > > > ntext_tmp with implementation
> > > >>=20
> > > >> 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
> > > >>=20
> > > >> BUG: https://bugzilla.samba.org/show_bug.cgi?id=3D11140
> > > >>=20
> > > >> Signed-off-by: Christof Schmitt <cs at samba.org>
> > > >> ---
> > > >>  libcli/auth/netlogon_creds_cli.h |    2 +-
> > > >>  1 files changed, 1 insertions(+), 1 deletions(-)
> > > >>=20
> > > >> diff --git a/libcli/auth/netlogon_creds_cli.h b/libcli/auth/netlogon_cred=
> > > > s_cli.h
> > > >> index 401ce8c..006367a 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 loadp=
> > > > arm_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,
> > > >> --=20
> > > >> 1.7.1
> > > 
> > > Tom Schulz
> > > Applied Dynamics Intl.
> > > schulz at adi.com
> 
>