[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  7fa4795 waf: add -fstack-protector to LDFLAGS if detected.
       via  511e575 Documentation: Add a warning to "socket options"
      from  90cbfc9 Make sure to set umask() before calling mkstemp().

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


- Log -----------------------------------------------------------------
commit 7fa4795607f018590caa26b5eca5abb68922c039
Author: Ira Cooper <ira at samba.org>
Date:   Wed Mar 6 00:54:43 2013 +0000

    waf: add -fstack-protector to LDFLAGS if detected.
    
    If we compile with -fstack-protector, we should link
    with it.
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Wed Mar  6 04:06:04 CET 2013 on sn-devel-104

commit 511e575e29a62c5d7dece91e41dd965e9546147c
Author: Scott Lovenberg <scott.lovenberg at gmail.com>
Date:   Mon Mar 4 19:09:12 2013 -0500

    Documentation: Add a warning to "socket options"
    
     Add a warning to the "socket options" section of the
     smb.conf man page that changing socket options can be
     dangerous to performance.  Hopefully this will cut down on
     users reporting poor performance after changing socket
     options.
    
    Signed-off-by: Scott Lovenberg <scott.lovenberg at gmail.com>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 docs-xml/smbdotconf/tuning/socketoptions.xml |   17 +++++++++++++++++
 lib/replace/wscript                          |    1 +
 2 files changed, 18 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/tuning/socketoptions.xml b/docs-xml/smbdotconf/tuning/socketoptions.xml
index 7a5c221..27ae5fd 100644
--- a/docs-xml/smbdotconf/tuning/socketoptions.xml
+++ b/docs-xml/smbdotconf/tuning/socketoptions.xml
@@ -4,6 +4,23 @@
                  developer="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
+    <para>
+        <warning>
+        <para>Modern server operating systems are tuned for high
+        network performance in the majority of situations; when you set socket
+        options you are overriding those settings.  Linux in particular has an
+        auto-tuning mechanism for buffer sizes that will be disabled if you
+        specify a socket buffer size.  This can potentially cripple your
+        TCP/IP stack.</para>
+
+        <para> Getting the socket options correct can make a big difference to
+        your performance, but getting them wrong can degrade it by just as
+        much.  As with any other low level setting, if you must make changes
+        to it, make small changes and <emphasis>test</emphasis> the effect
+        before making any large changes.</para>
+        </warning>
+    </para>
+
     <para>This option allows you to set socket options 
     to be used when talking with the client.</para>
 
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 36a9f6a..9483e23 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -55,6 +55,7 @@ struct foo bar = { .y = 'X', .x = 1 };
 
     if conf.CHECK_CFLAGS(['-fstack-protector']):
         conf.ADD_CFLAGS('-fstack-protector')
+        conf.ADD_LDFLAGS('-fstack-protector')
 
     # Try to find the right extra flags for -Werror behaviour
     for f in ["-Werror",       # GCC


-- 
Samba Shared Repository