The branch, v3-2-stable has been updated via fd5a58980d4fc2d0f9a8ba81a5ae9490e306b2ba (commit) from ca21a1e6eb297f65513139e201cbd212a0bd92d2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log ----------------------------------------------------------------- commit fd5a58980d4fc2d0f9a8ba81a5ae9490e306b2ba Author: Simo Sorce <[EMAIL PROTECTED]> Date: Fri Mar 7 11:33:26 2008 -0500 Enable use of Relocations Read-Only, if supported, for enhanced security. (cherry picked from commit c20c5f082162ff6c0c2931f456897334aa002e83) ----------------------------------------------------------------------- Summary of changes: source/Makefile.in | 4 ++-- source/configure.in | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 95e96d5..71b2018 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -43,8 +43,8 @@ CPPFLAGS=-DHAVE_CONFIG_H @CPPFLAGS@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @LDFLAGS@ [EMAIL PROTECTED]@ @LDFLAGS@ [EMAIL PROTECTED]@ @RELRO_LDFLAGS@ @LDFLAGS@ [EMAIL PROTECTED]@ @RELRO_LDFLAGS@ @LDFLAGS@ [EMAIL PROTECTED]@ @LDFLAGS@ [EMAIL PROTECTED]@ diff --git a/source/configure.in b/source/configure.in index ef39d6b..9e17fd1 100644 --- a/source/configure.in +++ b/source/configure.in @@ -73,6 +73,7 @@ AC_SUBST(HOST_OS) AC_SUBST(PICFLAG) AC_SUBST(PIE_CFLAGS) AC_SUBST(PIE_LDFLAGS) +AC_SUBST(RELRO_LDFLAGS) AC_SUBST(SHLIBEXT) AC_SUBST(INSTALLLIBCMD_SH) AC_SUBST(INSTALLLIBCMD_A) @@ -1524,6 +1525,32 @@ EOF fi fi +# Set defaults +RELRO_LDFLAGS="" +AC_ARG_ENABLE(relro, [AS_HELP_STRING([--enable-relro], [Turn on Relocations Read-Only (relro) support if available (default=yes)])]) + +if test "x$enable_relro" != xno +then + AC_CACHE_CHECK([for -Wl,-z,relro], samba_cv_relro, + [ + cat > conftest.c <<EOF +int foo; +main () { return 0;} +EOF + if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Wl,-z,relro -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD]) + then + samba_cv_relro=yes + else + samba_cv_relro=no + fi + rm -f conftest* + ]) + if test x"${samba_cv_relro}" = x"yes" + then + RELRO_LDFLAGS="-Wl,-z,relro" + fi +fi + # Assume non-shared by default and override below BLDSHARED="false" -- Samba Shared Repository