[SCM] Samba Shared Repository - branch v3-5-test updated

Karolin Seeger kseeger at samba.org
Tue Dec 1 01:29:10 MST 2009


The branch, v3-5-test has been updated
       via  57c9911... Conditional install of the cifs.upcall man page
       via  0b83d6a... Adjust regex to match variable names including underscores
      from  8e77a75... Fix DEBUG 0 -> DEBUG 10 (left over code). Fix opendir status return if access denied. Jeremy. (cherry picked from commit 48f40793ae4190ebc9eec83924aeda9e3f16bf0d)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 57c99111408e38cb68a7d194bdfd31fc0864600d
Author: Lars Müller <lars at samba.org>
Date:   Mon Feb 2 21:12:52 2009 +0100

    Conditional install of the cifs.upcall man page
    
    Only install the cifs.upcall man page if CIFSUPCALL_PROGS was set while
    configure.
    (cherry picked from commit 789963de23d46eba41cdd29c7b50100ec47e4361)
    
    Fix bug #6710 (cifs.upcall: Commits e9e2414e and 64982295 are missing in 3.4.1).

commit 0b83d6a1d8dfffc0e9f95c67afbeb0d7125060a1
Author: Lars Müller <lars at samba.org>
Date:   Mon Feb 2 21:38:38 2009 +0100

    Adjust regex to match variable names including underscores
    
    This is required to get the CIFSUPCALL_PROGS setting extracted from
    config.log.
    (cherry picked from commit 5148eefe1ea6e215dcbf4ffaa642860bd8dab45f)

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

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..085e862 100755
--- a/source3/script/installman.sh
+++ b/source3/script/installman.sh
@@ -20,7 +20,7 @@ fi
 
 # Get the configured feature set
 test -f "${SRCDIR}/config.log" && \
-	eval `grep "^[[:alnum:]]*=.*" "${SRCDIR}/config.log"`
+	eval `grep "^[[:alnum:]_]*=.*" "${SRCDIR}/config.log"`
 
 for lang in $langs; do
     if [ "X$lang" = XC ]; then
@@ -48,6 +48,7 @@ for lang in $langs; do
 
 	    # Check if this man page if required by the configured feature set
 	    case "${MP_BASENAME}" in
+		cifs.upcall.8) test -z "${CIFSUPCALL_PROGS}" && continue ;;
 	    	smbsh.1) test -z "${SMBWRAPPER}" && continue ;;
 		*) ;;
 	    esac


-- 
Samba Shared Repository


More information about the samba-cvs mailing list