[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

On Thu, Mar 06, 2014 at 10:22:08AM +0100, Michael Adam wrote:
> >     nsswitch: Remove fallback setting of WINBINDD_SOCKET_DIR
> >     
> >     This is the original cause of the wbc NT_STATUS_OBJECT_NAME_NOT_FOUND issues in recent git master, as the
> >     build was able to progress without the correct path being set as an override.
> >     
> >     Andrew Bartlett
> >     
> >     Change-Id: I1dbc7350695756356e869199b589eb781eb5c673
> >     Signed-off-by: Andrew Bartlett <abartlet at samba.org>
> >     Reviewed-by: Andreas Schneider <asn at samba.org>
> >     
> >     Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
> >     Autobuild-Date(master): Wed Mar  5 18:34:48 CET 2014 on sn-devel-104
> 
> 
> It is a pity that this patch has been brought
> upstream without my original negative review
> being taken into account.
> 
> See my mail to samba-technical on Wed, 19 Feb 2014 14:26:18 +0100:
> https://lists.samba.org/archive/samba-technical/2014-February/097926.html
> 
> - the commit message is misleading
> - and imho the patch also does the wrong thing.

Maybe the attached patch glosses over a bit of the
deficiences?

Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From 981d9b763b8cb301a2ce509d9eb8d9d8556e69b0 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Thu, 6 Mar 2014 10:25:32 +0100
Subject: [PATCH] nsswitch: Add a #error if no WINBINDD_SOCKET_DIR is defined

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 nsswitch/winbind_struct_protocol.h |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nsswitch/winbind_struct_protocol.h b/nsswitch/winbind_struct_protocol.h
index fc7aa6c..e26565b 100644
--- a/nsswitch/winbind_struct_protocol.h
+++ b/nsswitch/winbind_struct_protocol.h
@@ -36,6 +36,10 @@ typedef char fstring[FSTRING_LEN];
  * mechanism.
  */
 
+#ifndef WINBINDD_SOCKET_DIR
+#error You need to define WINBINDD_SOCKET_DIR
+#endif
+
 /*
  * when compiled with socket_wrapper support
  * the location of the WINBINDD_SOCKET_DIR
-- 
1.7.9.5