[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  93ad34c s3:test: catch more errors in test_access_check() in the smbclient_s3 test
       via  4af8615 s3:registry: update copyright for the registry db implementation
       via  f5bc4de examples/VFS: try to fix the build on openbsd, adding alternative spellings of autoconf/header
      from  310fff0 s3:sharesec: also initialize pgranted if get_share_security() returns NULL

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


- Log -----------------------------------------------------------------
commit 93ad34c4ad1a8c0e68eed0ddf69a332a71ba860c
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jul 6 12:24:13 2011 +0200

    s3:test: catch more errors in test_access_check() in the smbclient_s3 test
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Wed Jul  6 14:07:13 CEST 2011 on sn-devel-104

commit 4af8615da8494b65eae189c697bcfecb4ce7c889
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jul 6 12:09:52 2011 +0200

    s3:registry: update copyright for the registry db implementation

commit f5bc4de1cd1f2453eb18e8056d1c09d41570caba
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jul 6 10:37:40 2011 +0200

    examples/VFS: try to fix the build on openbsd, adding alternative spellings of autoconf/header
    
    The host "samba-amd64" on the build farm running openbsd 4.8 broke.
    Taking over the additional spellings of autoconf and autoheader from
    the source3/autogen.sh script should fix it.

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

Summary of changes:
 examples/VFS/autogen.sh                   |    5 +++--
 source3/registry/reg_backend_db.c         |    3 ++-
 source3/script/tests/test_smbclient_s3.sh |   16 ++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/VFS/autogen.sh b/examples/VFS/autogen.sh
index 2239198..8c6c909 100755
--- a/examples/VFS/autogen.sh
+++ b/examples/VFS/autogen.sh
@@ -4,8 +4,9 @@
 
 ## insert all possible names (only works with 
 ## autoconf 2.x
-TESTAUTOHEADER="autoheader autoheader-2.53 autoheader2.50"
-TESTAUTOCONF="autoconf autoconf-2.53 autoconf2.50"
+TESTAUTOHEADER="autoheader autoheader-2.53 autoheader2.50 autoheader259 autoheader253"
+TESTAUTOCONF="autoconf autoconf-2.53 autoconf2.50 autoconf259 autoconf253"
+
 
 AUTOHEADERFOUND="0"
 AUTOCONFFOUND="0"
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index 88ac393..65ff0ae 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -2,7 +2,8 @@
  *  Unix SMB/CIFS implementation.
  *  Virtual Windows Registry Layer
  *  Copyright (C) Gerald Carter                     2002-2005
- *  Copyright (C) Michael Adam                      2007-2009
+ *  Copyright (C) Michael Adam                      2007-2011
+ *  Copyright (C) Gregor Beck                       2011
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 167b5ae..fa721cb 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -410,6 +410,14 @@ EOF
 test_ccache_access()
 {
     $WBINFO --ccache-save="${USERNAME}%${PASSWORD}"
+    ret=$?
+
+    if [ $ret != 0 ] ; then
+	echo "wbinfo failed to store creds in cache (user='${USERNAME}', pass='${PASSWORD}')"
+	false
+	return
+    fi
+
     $SMBCLIENT //$SERVER_IP/tmp -C -U "${USERNAME}%" \
 	-c quit 2>&1
     ret=$?
@@ -421,6 +429,14 @@ test_ccache_access()
     fi
 
     $WBINFO --ccache-save="${USERNAME}%GarBage"
+    ret=$?
+
+    if [ $ret != 0 ] ; then
+	echo "wbinfo failed to store creds in cache (user='${USERNAME}', pass='GarBage')"
+	false
+	return
+    fi
+
     $SMBCLIENT //$SERVER_IP/tmp -C -U "${USERNAME}%" \
 	-c quit 2>&1
     ret=$?


-- 
Samba Shared Repository