[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  a6c5376 Merge suggested fix from bug 7511 and enhance it
       via  8ee76b1 s3:test_registry_upgrade: make more portable and eliminate "local" keyword
      from  98ec5e9 s3-torture: Use static printer for smbd spooler test

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


- Log -----------------------------------------------------------------
commit a6c5376b978bbe58a2a632764a721ba60317f8ad
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Jun 26 11:33:36 2012 +0200

    Merge suggested fix from bug 7511 and enhance it
    
    Changes from Lars Müller and Olaf Flebbe:
    
    a) The location in the filesystem defaults to STATEDIR/usershare
    b) If undefined the default location is used; if set to zero (the
       default) user defined shares are ignored.
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Tue Jun 26 19:55:00 CEST 2012 on sn-devel-104

commit 8ee76b173baaca3fc392116622eb1bb7e584526b
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Jun 25 21:21:31 2012 +0200

    s3:test_registry_upgrade: make more portable and eliminate "local" keyword
    
    prefer to use function syntax with (...)  to make variables local

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

Summary of changes:
 docs-xml/smbdotconf/misc/usersharepath.xml    |    5 ++---
 source3/script/tests/test_registry_upgrade.sh |   12 ++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/misc/usersharepath.xml b/docs-xml/smbdotconf/misc/usersharepath.xml
index 9e0bfe5..cad64be 100644
--- a/docs-xml/smbdotconf/misc/usersharepath.xml
+++ b/docs-xml/smbdotconf/misc/usersharepath.xml
@@ -11,8 +11,7 @@
 	"sticky" bit must also be set, restricting rename and delete to
 	owners of a file (in the same way the /tmp directory is usually configured).
 	Members of the group owner of this directory are the users allowed to create
-	usershares. If this parameter is undefined then no user defined
-	shares are allowed.
+	usershares.
 	</para>
 	<para>
 	For example, a valid usershare directory might be /usr/local/samba/lib/usershares,
@@ -29,5 +28,5 @@
 	</para>
 
 </description>
-<value type="default">NULL</value>
+<value type="default">STATEDIR/usershare</value> with the compile time value of STATEDIR.
 </samba:parameter>
diff --git a/source3/script/tests/test_registry_upgrade.sh b/source3/script/tests/test_registry_upgrade.sh
index 8e012bf..4e97153 100755
--- a/source3/script/tests/test_registry_upgrade.sh
+++ b/source3/script/tests/test_registry_upgrade.sh
@@ -31,11 +31,11 @@ REGPATH="HKLM\Software\Samba"
 LOGDIR_PREFIX="registry_upgrade"
 
 registry_check()
-{
-    local CHECKNO="$1"
-    local CHECKDIFF="$2"
-    local REGVER=""
-    local ALLOWEDERR="INFO: version =|Check database:|overwrite registry format version 0 with 1|no INFO/version found"
+(
+    CHECKNO="$1"
+    CHECKDIFF="$2"
+    REGVER=""
+    ALLOWEDERR="INFO: version =|Check database:|overwrite registry format version 0 with 1|no INFO/version found"
 
     test "x$CHECKNO" = "x0" && {
         REGVER="--reg-version=1"
@@ -71,7 +71,7 @@ registry_check()
     }
 
     return 0
-}
+)
 
 registry_upgrade()
 {


-- 
Samba Shared Repository