[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  efa73ba s3:test_net_registry_check.sh: grep -E isn't portable, use egrep
       via  94afad2 tests: make test_ldb portable, eliminate "local" keyword
      from  ac4899e s3:net registry import: implement dry-run with "--test"

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


- Log -----------------------------------------------------------------
commit efa73ba52aa8d7e2dada74c422d22508c3b5703e
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Jun 27 00:25:53 2012 +0200

    s3:test_net_registry_check.sh: grep -E isn't portable, use egrep
    
    grep -E doesn't work on Solaris /usr/bin/grep e.g.
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Wed Jun 27 02:18:07 CEST 2012 on sn-devel-104

commit 94afad20b5177ef18a337a853fd033edd3b8b862
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Jun 26 12:23:41 2012 +0200

    tests: make test_ldb portable, eliminate "local" keyword
    
    this is BASH only, don't use it.

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

Summary of changes:
 source3/script/tests/test_net_registry_check.sh |    2 +-
 testprogs/blackbox/test_ldb.sh                  |   16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/tests/test_net_registry_check.sh b/source3/script/tests/test_net_registry_check.sh
index ca8da76..4b2c542 100755
--- a/source3/script/tests/test_net_registry_check.sh
+++ b/source3/script/tests/test_net_registry_check.sh
@@ -30,7 +30,7 @@ failed=0
 regcheck()
 {
 	ALLOWEDERR="Check database:|INFO: version ="
-	ERRSTR=$(${NETREG} check $REG $@ 2>&1 | grep -E -v "$ALLOWEDERR")
+	ERRSTR=$(${NETREG} check $REG $@ 2>&1 | egrep -v "$ALLOWEDERR")
 }
 
 # try to repair registry
diff --git a/testprogs/blackbox/test_ldb.sh b/testprogs/blackbox/test_ldb.sh
index 1609a95..f326672 100755
--- a/testprogs/blackbox/test_ldb.sh
+++ b/testprogs/blackbox/test_ldb.sh
@@ -121,15 +121,11 @@ echo "Search Options Control Query test returned 0 items"
 failed=`expr $failed + 1`
 fi
 
-wellknown_object_test() {
-	local guid=$1
-	local object=$2
-	local basedns
-	local dn
-	local r
-	local c
-	local n
-	local failed=0
+wellknown_object_test()
+(
+	guid=$1
+	object=$2
+	failed=0
 
 	basedns="<WKGUID=${guid},${BASEDN}> <wkGuId=${guid},${BASEDN}>"
 	for dn in ${basedns}; do
@@ -151,7 +147,7 @@ wellknown_object_test() {
 	done
 
 	return $failed
-}
+)
 
 wellknown_object_test 22B70C67D56E4EFB91E9300FCA3DC1AA ForeignSecurityPrincipals
 st=$?


-- 
Samba Shared Repository