[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  240a552 build: use -fstack-protector if available
       via  d537d64 Revert "wafbuild: use -Wstack-protector if available"
       via  ac9620b build/autoconf: put ld check variable in quotes
      from  e4d85fa dsdb-descriptor: Avoid segfault copying an SD without an owner or group

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


- Log -----------------------------------------------------------------
commit 240a55249d00c1e73400b480d4bc924edae94022
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Feb 19 19:09:25 2013 +0100

    build: use -fstack-protector if available
    
    Signed-off-by: Bjoern Jacke <bj at sernet.de>
    Reviewed-by: Matthieu Patou <mat at samba.org>
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Fri Feb 22 15:38:21 CET 2013 on sn-devel-104

commit d537d64ab88ed3526425a71730acc0a36f7aab63
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Feb 19 19:07:34 2013 +0100

    Revert "wafbuild: use -Wstack-protector if available"
    
    This reverts commit e6643fbf48afccd0acedb65fbe24d3ce84d44c40.
    
    Signed-off-by: Bjoern Jacke <bj at sernet.de>
    Reviewed-by: Matthieu Patou <mat at samba.org>

commit ac9620b942d6d51a1c35c4177c3f241351fc1ebd
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Feb 20 17:06:49 2013 +0100

    build/autoconf: put ld check variable in quotes
    
    Signed-off-by: Bjoern Jacke <bj at sernet.de>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

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

Summary of changes:
 lib/replace/wscript  |    4 ++--
 source3/configure.in |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 475cd24..47735be 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -53,8 +53,8 @@ struct foo bar = { .y = 'X', .x = 1 };
                 conf.ADD_CFLAGS(f)
             break
 
-    if conf.CHECK_CFLAGS(['-Wstack-protector']):
-	    conf.ADD_CFLAGS('-Wstack-protector')
+    if conf.CHECK_CFLAGS(['-fstack-protector']):
+        conf.ADD_CFLAGS('-fstack-protector')
 
     # Try to find the right extra flags for -Werror behaviour
     for f in ["-Werror",       # GCC
diff --git a/source3/configure.in b/source3/configure.in
index 56c9190..552535b 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -229,7 +229,7 @@ dnl warnings when building modules.
 if test "$ac_cv_prog_gnu_ld" = "yes"; then
 	ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2> /dev/null < /dev/null | grep "GNU ld"`
 	# we need to make a 2nd (separate!) check on the output of stderr, see bug #7825:
-	if test -z ${ac_cv_gnu_ld_version} ; then
+	if test -z "$ac_cv_gnu_ld_version" ; then
 	  ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>&1 > /dev/null < /dev/null | grep "GNU ld"`
 	fi
 	AC_MSG_CHECKING(GNU ld release date)


-- 
Samba Shared Repository