[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  cb2fbdd s3-install: Don't let MANDIR and SRCDIR be overwritten
      from  13182e7 s4:dsdb/password_hash: require a "Primary:Kerberos" blob in supplementalCredentials

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


- Log -----------------------------------------------------------------
commit cb2fbdd4b47aa5256d365ca3678e14e17adbe721
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Jan 16 16:43:10 2012 +0100

    s3-install: Don't let MANDIR and SRCDIR be overwritten
    
    In installman.sh, we get them via cmd line args
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Mon Jan 16 18:55:40 CET 2012 on sn-devel-104

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

Summary of changes:
 source3/script/installman.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/installman.sh b/source3/script/installman.sh
index ab9bfe5..2f79996 100755
--- a/source3/script/installman.sh
+++ b/source3/script/installman.sh
@@ -20,7 +20,8 @@ fi
 
 # Get the configured feature set
 test -f "${SRCDIR}/config.log" && \
-	eval `grep "^[[:alnum:]]*=.*" "${SRCDIR}/config.log"`
+	eval `grep "^[[:alnum:]]*=.*" "${SRCDIR}/config.log" |
+	      grep -v ^MANDIR | grep -v ^SRCDIR`
 
 for lang in $langs; do
     if [ "X$lang" = XC ]; then


-- 
Samba Shared Repository