[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  979d9db replace: Fix developer build on BSD.
       via  3baeca4 docs: Add winbindd to destination parameter in smbcontrol manpage
       via  c63e148 testparm: don't warn for TCP_NODELAY in socket options.
      from  01cae09 handle later iniparser version assigning a zero length string value for 'key='

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 979d9dbbb709c99c77b02fbc7429a0d0472ac2f4
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Nov 19 18:14:24 2013 +0100

    replace: Fix developer build on BSD.
    
    This fixes bsd_attr_list() calling geteuid().
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Nov 21 03:37:59 CET 2013 on sn-devel-104

commit 3baeca4fec7c6cc94bdf51544221d280a699fdbe
Author: Christof Schmitt <cs at samba.org>
Date:   Wed Nov 20 16:19:37 2013 -0700

    docs: Add winbindd to destination parameter in smbcontrol manpage
    
    Signed-off-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit c63e148361cdb2cc4611c97b3fe8ccb07e2d86b2
Author: Michael Adam <obnox at samba.org>
Date:   Wed Nov 20 07:03:15 2013 +0100

    testparm: don't warn for TCP_NODELAY in socket options.
    
    TCP_NODELAY is set by default, so we should not warn.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages/smbcontrol.1.xml |    4 +++-
 lib/replace/xattr.c                |    1 +
 source3/utils/testparm.c           |    6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/smbcontrol.1.xml b/docs-xml/manpages/smbcontrol.1.xml
index 234e02d..64c9d48 100644
--- a/docs-xml/manpages/smbcontrol.1.xml
+++ b/docs-xml/manpages/smbcontrol.1.xml
@@ -61,7 +61,9 @@
 
 		<varlistentry>
 		<term>destination</term>
-		<listitem><para>One of <parameter>nmbd</parameter>, <parameter>smbd</parameter> or a process ID.</para>
+		<listitem><para>One of <parameter>nmbd</parameter>,
+		<parameter>smbd</parameter>, <parameter>winbindd</parameter>
+		or a process ID.</para>
 
 		<para>The <parameter>all</parameter> destination causes the 
 		message to "broadcast" to all running daemons including nmbd and
diff --git a/lib/replace/xattr.c b/lib/replace/xattr.c
index 459b7f3..ce52d1a 100644
--- a/lib/replace/xattr.c
+++ b/lib/replace/xattr.c
@@ -25,6 +25,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#define UID_WRAPPER_NOT_REPLACE
 #include "replace.h"
 #include "system/filesys.h"
 #include "system/dir.h"
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index ce85353..7e49c08 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -137,13 +137,13 @@ static int do_global_checks(void)
 	    (strstr(socket_options, "SO_SNDBUF") ||
 	     strstr(socket_options, "SO_RCVBUF") ||
 	     strstr(socket_options, "SO_SNDLOWAT") ||
-	     strstr(socket_options, "SO_RCVLOWAT") ||
-	     strstr(socket_options, "TCP_NODELAY"))) {
+	     strstr(socket_options, "SO_RCVLOWAT")))
+	{
 		fprintf(stderr,
 			"WARNING: socket options = %s\n"
 			"This warning is printed because you set one of the\n"
 			"following options: SO_SNDBUF, SO_RCVBUF, SO_SNDLOWAT,\n"
-			"SO_RCVLOWAT, TCP_NODELAY\n"
+			"SO_RCVLOWAT\n"
 			"Modern server operating systems are tuned for\n"
 			"high network performance in the majority of situations;\n"
 			"when you set 'socket options' you are overriding those\n"


-- 
Samba Shared Repository