[SCM] Samba Shared Repository - branch master updated
Uri Simchoni
uri at samba.org
Mon Feb 19 11:32:04 UTC 2018
The branch, master has been updated
via d35a22c Fix incorrect `ldbsearch` invocation
via e2023e8 Remove some bashisms from the test scripts
via 3450dd6 Don't load LDB_MODULESDIR as a module file
from f8313d7 winbind: Don't send "server_id" explicitly for DUMP_DOMAIN_LIST
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d35a22cc445795faf8331b6d4b195e0c35eab99e
Author: Timur I. Bakeyev <timur at iXsystems.com>
Date: Mon Dec 11 05:05:19 2017 +0100
Fix incorrect `ldbsearch` invocation
Signed-off-by: Timur I. Bakeyev <timur at iXsystems.com>
Reviewed-by: Uri Simchoni <uri at samba.org>
Reviewed-by: Björn Jacke <bjacke at samba.org>
Autobuild-User(master): Uri Simchoni <uri at samba.org>
Autobuild-Date(master): Mon Feb 19 12:31:38 CET 2018 on sn-devel-144
commit e2023e86d54be86784a18ccbeced4e2a046c710d
Author: Timur I. Bakeyev <timur at iXsystems.com>
Date: Mon Dec 11 02:47:21 2017 +0100
Remove some bashisms from the test scripts
Signed-off-by: Timur I. Bakeyev <timur at iXsystems.com>
Reviewed-by: Uri Simchoni <uri at samba.org>
Reviewed-by: Christof Schmitt <cs at samba.org>
commit 3450dd6a50d1d08f49de5ff98f2ce20f31081636
Author: Timur I. Bakeyev <timur at iXsystems.com>
Date: Wed Feb 14 02:31:58 2018 +0100
Don't load LDB_MODULESDIR as a module file
We are setting modules directory here(LDB_MODULESDIR) so treat it this
way, no need to attempt to load it as a module file.
Signed-off-by: Timur I. Bakeyev <timur at iXsystems.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Uri Simchoni <uri at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/ldb/common/ldb_modules.c | 2 +-
source3/script/smbaddshare | 4 ++--
source3/script/smbchangeshare | 8 ++++----
source3/script/smbdeleteshare | 2 +-
source3/script/tests/test_forceuser_validusers.sh | 2 +-
source3/script/tests/test_smbclient_s3.sh | 4 ++--
testprogs/blackbox/dbcheck-oldrelease.sh | 2 +-
testprogs/blackbox/test_wintest.sh | 3 +--
8 files changed, 13 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/common/ldb_modules.c b/lib/ldb/common/ldb_modules.c
index 25551e1..cc067ab 100644
--- a/lib/ldb/common/ldb_modules.c
+++ b/lib/ldb/common/ldb_modules.c
@@ -1103,7 +1103,7 @@ static int ldb_modules_load_dir(const char *modules_dir, const char *version)
*/
void ldb_set_modules_dir(struct ldb_context *ldb, const char *path)
{
- int ret = ldb_modules_load_path(path, LDB_VERSION);
+ int ret = ldb_modules_load_dir(path, LDB_VERSION);
if (ret != LDB_SUCCESS) {
ldb_asprintf_errstring(ldb, "Failed to load modules from: %s\n", path);
}
diff --git a/source3/script/smbaddshare b/source3/script/smbaddshare
index 62f1bdf..704c9f4 100755
--- a/source3/script/smbaddshare
+++ b/source3/script/smbaddshare
@@ -19,14 +19,14 @@ NETCONF="$BINDIR/net --configfile=$CONF conf"
$NETCONF addshare "$SHARENAME" "$SHAREPATH" writeable=no guest_ok=no "$COMMENT"
RC=$?
-if [[ $RC -ne 0 ]]; then
+if [ $RC -ne 0 ]; then
echo Failure during addshare: rc=$RC
exit $RC
fi
$NETCONF setparm "$SHARENAME" 'max connections' "$MAX_CONN"
RC=$?
-if [[ $RC -ne 0 ]]; then
+if [ $RC -ne 0 ]; then
echo Failure during setparm for max connections: rc=$RC
exit $RC
fi
diff --git a/source3/script/smbchangeshare b/source3/script/smbchangeshare
index 2f3fa3b..098e968 100755
--- a/source3/script/smbchangeshare
+++ b/source3/script/smbchangeshare
@@ -20,28 +20,28 @@ NETCONF="$BINDIR/net --configfile=$CONF conf"
$NETCONF setparm "$SHARENAME" 'path' "$SHAREPATH"
RC=$?
-if [[ $RC -ne 0 ]]; then
+if [ $RC -ne 0 ]; then
echo Failure during setparm for path: rc=$RC
exit $RC
fi
$NETCONF setparm "$SHARENAME" 'comment' "$COMMENT"
RC=$?
-if [[ $RC -ne 0 ]]; then
+if [ $RC -ne 0 ]; then
echo Failed during setparm for comment: rc=$RC
exit $RC
fi
$NETCONF setparm "$SHARENAME" 'max connections' "$MAX_CONN"
RC=$?
-if [[ $RC -ne 0 ]]; then
+if [ $RC -ne 0 ]; then
echo Failure during setparm for max connections: rc=$RC
exit $RC
fi
$NETCONF setparm "$SHARENAME" 'csc policy' "$CSC_POLICY"
RC=$?
-if [[ $RC -ne 0 ]]; then
+if [ $RC -ne 0 ]; then
echo Failure during setparm for csc policy: rc=$RC
exit $RC
fi
diff --git a/source3/script/smbdeleteshare b/source3/script/smbdeleteshare
index 8cd8d1f..8f70678 100755
--- a/source3/script/smbdeleteshare
+++ b/source3/script/smbdeleteshare
@@ -15,7 +15,7 @@ SHARENAME="$2"
NETCONF="$BINDIR/net --configfile=$CONF conf"
$NETCONF delshare "$SHARENAME"
RC=$?
-if [[ $RC -ne 0 ]]; then
+if [ $RC -ne 0 ]; then
echo Failure during delshare command: rc=$RC
exit $RC
fi
diff --git a/source3/script/tests/test_forceuser_validusers.sh b/source3/script/tests/test_forceuser_validusers.sh
index 07aa1a5..4b6d66e 100755
--- a/source3/script/tests/test_forceuser_validusers.sh
+++ b/source3/script/tests/test_forceuser_validusers.sh
@@ -29,7 +29,7 @@ incdir=`dirname $0`/../../../testprogs/blackbox
run_cmd_nooutput() {
CMD="$1"
- out=`eval ${CMD} &> TESTOUT`
+ out=`eval ${CMD} > TESTOUT 2>&1`
if [ $? != 0 ] ; then
cat TESTOUT
rm -f TESTOUT
diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 8017d19..db77eb1 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -835,7 +835,7 @@ EOF
echo "$out" | grep 'NT_STATUS'
ret=$?
- if [ $ret == 0 ] ; then
+ if [ $ret = 0 ] ; then
echo "$out"
echo "failed - NT_STATUS_XXXX listing \\manglenames_share\\FF4GBY~Q"
return 1
@@ -971,7 +971,7 @@ EOF
echo "$out" | grep 'NT_STATUS'
ret=$?
- if [ $ret == 0 ] ; then
+ if [ $ret = 0 ] ; then
echo "$out"
echo "failed - NT_STATUS_XXXX listing \\widelinks_share\\dot"
return 1
diff --git a/testprogs/blackbox/dbcheck-oldrelease.sh b/testprogs/blackbox/dbcheck-oldrelease.sh
index a525f54..55e6ddf 100755
--- a/testprogs/blackbox/dbcheck-oldrelease.sh
+++ b/testprogs/blackbox/dbcheck-oldrelease.sh
@@ -240,7 +240,7 @@ check_expected_after_values() {
elif [ x$RELEASE = x"release-4-5-0-pre1" ]; then
echo $RELEASE checking after values
tmpldif=$PREFIX_ABS/$RELEASE/expected-links-after-dbcheck.ldif.tmp
- $BINDIR/ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --show-recycled --show-deleted --show-deactivated-link --reveal member memberOf lastKnownParent objectCategory lastKnownParent wellKnownObjects legacyExchangeDN sAMAccountType uSNChanged --sorted > $tmpldif
+ $ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --show-recycled --show-deleted --show-deactivated-link --reveal member memberOf lastKnownParent objectCategory lastKnownParent wellKnownObjects legacyExchangeDN sAMAccountType uSNChanged --sorted > $tmpldif
diff $tmpldif $release_dir/expected-links-after-dbcheck.ldif
if [ "$?" != "0" ]; then
return 1
diff --git a/testprogs/blackbox/test_wintest.sh b/testprogs/blackbox/test_wintest.sh
index f13e94b..5019900 100755
--- a/testprogs/blackbox/test_wintest.sh
+++ b/testprogs/blackbox/test_wintest.sh
@@ -26,8 +26,7 @@ if [ -z "$WINTEST_CONF_DIR" ]; then
exit 0;
fi
-SOCKET_WRAPPER_DIR=
-export -n SOCKET_WRAPPER_DIR
+unset SOCKET_WRAPPER_DIR
failed=0
--
Samba Shared Repository
More information about the samba-cvs
mailing list