[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-7-161-g3fbd714

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  3fbd714a688abc21a088ebbe0dd1716a6eb1b522 (commit)
       via  21aac4a0cd90ae631246c2eb741b2d2abc5252f9 (commit)
       via  e9b429d0e2f378bf7486078bf1291c4dcc464a5e (commit)
       via  8c8503ab8d3df532f6e4e036e0481570f714530e (commit)
      from  600fe29cf3581e70373f33798bc07939d32b96e8 (commit)

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


- Log -----------------------------------------------------------------
commit 3fbd714a688abc21a088ebbe0dd1716a6eb1b522
Author: Karolin Seeger <kseeger@xxxxxxxxx>
Date:   Tue Feb 3 09:48:40 2009 +0100

    WHATSNEW: Update changes since 3.2.7.
    
    Karolin
    (cherry picked from commit c415b6a48dae2809d5d60b0af23eb7781f1146db)

commit 21aac4a0cd90ae631246c2eb741b2d2abc5252f9
Author: Lars Müller <lars@xxxxxxxxx>
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 1c3313dea793a7eea72afb990da125f6c2a8444c)

commit e9b429d0e2f378bf7486078bf1291c4dcc464a5e
Author: Lars Müller <lars@xxxxxxxxx>
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 b44b29e5d9047f79202fa8fb3ca0eb86b2a98090)

commit 8c8503ab8d3df532f6e4e036e0481570f714530e
Author: Karolin Seeger <kseeger@xxxxxxxxx>
Date:   Mon Feb 2 11:46:39 2009 +0100

    docs: Describe "service" in man mount.cifs.
    
    This fixes bug #5346.
    Thanks to the Debian Samba package maintainers for reporting and providing a
    patch!
    
    Karolin
    (cherry picked from commit 73f4fc1f802f31459b70dba4777d142d00fcdd92)
    (cherry picked from commit ab4768452811e67f6606253b5a79101184f777d0)
    (cherry picked from commit 876b0b001976226a7c1887570c08178d72842a48)

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

Summary of changes:
 WHATSNEW.txt                         |    2 ++
 docs-xml/manpages-3/mount.cifs.8.xml |   11 +++++++----
 source/script/installman.sh          |    3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 699caa7..a492967 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -132,6 +132,8 @@ o   Stefan Metzmacher <metze@xxxxxxxxx>
 
 o   Lars Müller <lars@xxxxxxxxx>
     * Tweak with pam defines of older Linux versions.
+    * Adjust regex to match variable names including underscores.
+    * Conditional install of the cifs.upcall man page.
 
 
 o   Tim Prouty <tprouty@xxxxxxxxx>
diff --git a/docs-xml/manpages-3/mount.cifs.8.xml 
b/docs-xml/manpages-3/mount.cifs.8.xml
index 54fbc13..00711e0 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -43,10 +43,13 @@ by the popular Open Source server Samba.
        </para>
 
        <para>
-       The mount.cifs utility attaches the UNC name (exported network 
resource) to
-       the local directory <emphasis>mount-point</emphasis>. It is possible to 
set the mode for mount.cifs to 
-setuid root to allow non-root users to mount shares to directories for which 
they
-have write permission.
+       The mount.cifs utility attaches the UNC name (exported network resource)
+       specified as <emphasis>service</emphasis> (using //server/share syntax,
+       where "server" is the server name or IP address and "share" is the name
+       of the share) to the local directory <emphasis>mount-point</emphasis>.
+       It is possible to set the mode for mount.cifs to setuid root to allow
+       non-root users to mount shares to directories for which they
+       have write permission.
        </para>
 
        <para>
diff --git a/source/script/installman.sh b/source/script/installman.sh
index 869ce6e..c13c119 100755
--- a/source/script/installman.sh
+++ b/source/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