[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Thu Mar 3 01:54:01 UTC 2022
The branch, master has been updated
via cb10b8704e8 s3:script: Reformat shell scripts
via 98aed0644ae s3:locale: Reformat shell scripts
via 1399b2430a0 selftest: Reformat shell scripts
via 22eb76c6d0b script: Reformat shell scripts
via 55cd39b92cf release-scripts: Reformat shell scripts
via f025cc1a12c python: Reformat shell scripts
from 0c113e652fe s3: smbd: Rename OpenDir_ntstatus() -> OpenDir().
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cb10b8704e8640dbbb4b8c3ca876b890833e54ef
Author: Andreas Schneider <asn at samba.org>
Date: Mon Feb 21 14:11:19 2022 +0100
s3:script: Reformat shell scripts
shfmt -f source3/script/ | xargs shfmt -w -p -i 0 -fn
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Thu Mar 3 01:53:16 UTC 2022 on sn-devel-184
commit 98aed0644aec14ea7d88b7812cc15bf5f7379815
Author: Andreas Schneider <asn at samba.org>
Date: Mon Feb 21 14:10:29 2022 +0100
s3:locale: Reformat shell scripts
shfmt -f source3/locale/ | xargs shfmt -w -p -i 0 -fn
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 1399b2430a06f4a4b82f99643bf41b732183b5cb
Author: Andreas Schneider <asn at samba.org>
Date: Mon Feb 21 14:06:36 2022 +0100
selftest: Reformat shell scripts
shfmt -f selftest/ | xargs shfmt -w -p -i 0 -fn
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 22eb76c6d0bfb9c6858eb0cef4211b4f833e9ae7
Author: Andreas Schneider <asn at samba.org>
Date: Mon Feb 21 14:02:15 2022 +0100
script: Reformat shell scripts
shfmt -f script/ | xargs shfmt -w -p -i 0 -fn
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 55cd39b92cf23ccf8f7714df6d269af43855d307
Author: Andreas Schneider <asn at samba.org>
Date: Mon Feb 21 14:00:54 2022 +0100
release-scripts: Reformat shell scripts
shfmt -f release-scripts/ | xargs shfmt -w -p -i 0 -fn
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit f025cc1a12cbcd3619a3f39a25dd8080a7a759c4
Author: Andreas Schneider <asn at samba.org>
Date: Mon Feb 21 13:59:33 2022 +0100
python: Reformat shell scripts
shfmt -f python/ | xargs shfmt -w -p -i 0 -fn
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
python/samba/tests/krb5/pyasn1_regen.sh | 3 +-
python/samba/tests/samba_tool/computer_edit.sh | 70 ++++---
python/samba/tests/samba_tool/contact_edit.sh | 75 ++++----
python/samba/tests/samba_tool/group_edit.sh | 97 +++++-----
python/samba/tests/samba_tool/user_edit.sh | 78 ++++----
python/samba/tests/test_pam_winbind.sh | 8 +-
python/samba/tests/test_pam_winbind_chauthtok.sh | 46 ++---
.../tests/test_pam_winbind_warn_pwd_expire.sh | 16 +-
release-scripts/build-docs | 13 +-
release-scripts/build-htmlman-git | 3 +-
release-scripts/build-htmlman-nogit | 3 +-
release-scripts/build-manpages-git | 3 +-
release-scripts/build-manpages-nogit | 3 +-
script/clean-source-tree.sh | 4 +-
script/commit_mark.sh | 10 +-
script/ctdb-import.tree-filter.sh | 1 -
script/find_python.sh | 4 +-
script/git-hooks/check-trailing-whitespace | 20 +-
script/git-hooks/pre-commit-hook | 10 +-
script/git-hooks/pre-commit-script | 6 +-
script/release.sh | 127 ++++++++-----
selftest/checkpassword_arg1.sh | 2 +-
selftest/gdb_backtrace | 91 +++++----
selftest/gdb_run | 4 +-
selftest/in_screen | 91 ++++-----
selftest/ns/add_bridge_iface.sh | 8 +-
selftest/ns/create_bridge.sh | 2 -
selftest/ns/mk_nsenter.sh | 5 +-
selftest/ns/nsenter-helper.sh | 18 +-
selftest/save.env.sh | 16 +-
source3/locale/net/genmsg | 40 ++--
source3/script/creategroup | 22 +--
source3/script/mknissmbpasswd.sh | 39 ++--
source3/script/mknissmbpwdtbl.sh | 63 ++++---
source3/script/mksyms.sh | 33 ++--
source3/script/smbtar | 205 +++++++++++----------
36 files changed, 661 insertions(+), 578 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/tests/krb5/pyasn1_regen.sh b/python/samba/tests/krb5/pyasn1_regen.sh
index 2e3995688f2..75b39888572 100755
--- a/python/samba/tests/krb5/pyasn1_regen.sh
+++ b/python/samba/tests/krb5/pyasn1_regen.sh
@@ -12,7 +12,8 @@ PATH_TO_ASN1_INPUT_FILE=$2
set -u
set -e
-usage() {
+usage()
+{
echo "usage: $0 PATH_TO_ASN1ATE_CHECKOUT PATH_TO_ASN1_INPUT_FILE > PATH_TO_PYASN1_OUTPUT_FILE"
}
diff --git a/python/samba/tests/samba_tool/computer_edit.sh b/python/samba/tests/samba_tool/computer_edit.sh
index 9830fe3f681..a52128c6589 100755
--- a/python/samba/tests/samba_tool/computer_edit.sh
+++ b/python/samba/tests/samba_tool/computer_edit.sh
@@ -3,10 +3,10 @@
# Test for 'samba-tool computer edit'
if [ $# -lt 3 ]; then
-cat <<EOF
+ cat <<EOF
Usage: computer_edit.sh SERVER USERNAME PASSWORD
EOF
-exit 1;
+ exit 1
fi
SERVER="$1"
@@ -26,13 +26,15 @@ display_name_con_b64="dGVzdCAHIHN0cmluZwo="
tmpeditor=$(mktemp --suffix .sh -p $SELFTEST_TMPDIR samba-tool-editor-XXXXXXXX)
chmod +x $tmpeditor
-create_test_computer() {
+create_test_computer()
+{
$PYTHON ${STpath}/source4/scripting/bin/samba-tool \
computer create testmachine1 \
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-edit_computer() {
+edit_computer()
+{
# create editor.sh
# enable computer account
cat >$tmpeditor <<-'EOF'
@@ -48,7 +50,8 @@ EOF
}
# Test edit computer - add base64 attributes
-add_attribute_base64() {
+add_attribute_base64()
+{
# create editor.sh
cat >$tmpeditor <<EOF
#!/usr/bin/env bash
@@ -65,12 +68,14 @@ EOF
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-get_attribute_base64() {
+get_attribute_base64()
+{
${STpath}/bin/ldbsearch '(sAMAccountName=testmachine1$)' displayName \
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-delete_attribute() {
+delete_attribute()
+{
# create editor.sh
cat >$tmpeditor <<EOF
#!/usr/bin/env bash
@@ -85,7 +90,8 @@ EOF
}
# Test edit computer - add base64 attribute value including control character
-add_attribute_base64_control() {
+add_attribute_base64_control()
+{
# create editor.sh
cat >$tmpeditor <<EOF
#!/usr/bin/env bash
@@ -101,13 +107,15 @@ EOF
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-get_attribute_base64_control() {
+get_attribute_base64_control()
+{
$PYTHON ${STpath}/source4/scripting/bin/samba-tool computer show \
testmachine1 --attributes=displayName \
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-get_attribute_force_no_base64() {
+get_attribute_force_no_base64()
+{
# LDB_FLAG_FORCE_NO_BASE64_LDIF should be used here.
$PYTHON ${STpath}/source4/scripting/bin/samba-tool computer show \
testmachine1 --attributes=displayName \
@@ -115,7 +123,8 @@ get_attribute_force_no_base64() {
}
# Test edit computer - change base64 attribute value including control character
-change_attribute_base64_control() {
+change_attribute_base64_control()
+{
# create editor.sh
cat >$tmpeditor <<EOF
#!/usr/bin/env bash
@@ -130,7 +139,8 @@ EOF
}
# Test edit computer - change attributes with LDB_FLAG_FORCE_NO_BASE64_LDIF
-change_attribute_force_no_base64() {
+change_attribute_force_no_base64()
+{
# create editor.sh
# Expects that the original attribute is available as clear text,
# because the LDB_FLAG_FORCE_NO_BASE64_LDIF should be used here.
@@ -147,13 +157,15 @@ EOF
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-get_changed_attribute_force_no_base64() {
+get_changed_attribute_force_no_base64()
+{
$PYTHON ${STpath}/source4/scripting/bin/samba-tool computer show \
- testmachine1 --attributes=displayName \
- -H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
+ testmachine1 --attributes=displayName \
+ -H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-delete_computer() {
+delete_computer()
+{
$PYTHON ${STpath}/source4/scripting/bin/samba-tool \
computer delete testmachine1 \
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
@@ -161,19 +173,19 @@ delete_computer() {
failed=0
-testit "create_test_computer" create_test_computer || failed=`expr $failed + 1`
-testit "edit_computer" edit_computer || failed=`expr $failed + 1`
-testit "add_attribute_base64" add_attribute_base64 || failed=`expr $failed + 1`
-testit_grep "get_attribute_base64" "^displayName:: $display_name_b64" get_attribute_base64 || failed=`expr $failed + 1`
-testit "delete_attribute" delete_attribute || failed=`expr $failed + 1`
-testit "add_attribute_base64_control" add_attribute_base64_control || failed=`expr $failed + 1`
-testit_grep "get_attribute_base64_control" "^displayName:: $display_name_con_b64" get_attribute_base64_control || failed=`expr $failed + 1`
-testit "change_attribute_base64_control" change_attribute_base64_control || failed=`expr $failed + 1`
-testit_grep "get_attribute_base64" "^displayName:: $display_name_b64" get_attribute_base64 || failed=`expr $failed + 1`
-testit_grep "get_attribute_force_no_base64" "^displayName: $display_name" get_attribute_force_no_base64 || failed=`expr $failed + 1`
-testit "change_attribute_force_no_base64" change_attribute_force_no_base64 || failed=`expr $failed + 1`
-testit_grep "get_changed_attribute_force_no_base64" "^displayName: $display_name_new" get_changed_attribute_force_no_base64 || failed=`expr $failed + 1`
-testit "delete_computer" delete_computer || failed=`expr $failed + 1`
+testit "create_test_computer" create_test_computer || failed=$(expr $failed + 1)
+testit "edit_computer" edit_computer || failed=$(expr $failed + 1)
+testit "add_attribute_base64" add_attribute_base64 || failed=$(expr $failed + 1)
+testit_grep "get_attribute_base64" "^displayName:: $display_name_b64" get_attribute_base64 || failed=$(expr $failed + 1)
+testit "delete_attribute" delete_attribute || failed=$(expr $failed + 1)
+testit "add_attribute_base64_control" add_attribute_base64_control || failed=$(expr $failed + 1)
+testit_grep "get_attribute_base64_control" "^displayName:: $display_name_con_b64" get_attribute_base64_control || failed=$(expr $failed + 1)
+testit "change_attribute_base64_control" change_attribute_base64_control || failed=$(expr $failed + 1)
+testit_grep "get_attribute_base64" "^displayName:: $display_name_b64" get_attribute_base64 || failed=$(expr $failed + 1)
+testit_grep "get_attribute_force_no_base64" "^displayName: $display_name" get_attribute_force_no_base64 || failed=$(expr $failed + 1)
+testit "change_attribute_force_no_base64" change_attribute_force_no_base64 || failed=$(expr $failed + 1)
+testit_grep "get_changed_attribute_force_no_base64" "^displayName: $display_name_new" get_changed_attribute_force_no_base64 || failed=$(expr $failed + 1)
+testit "delete_computer" delete_computer || failed=$(expr $failed + 1)
rm -f $tmpeditor
diff --git a/python/samba/tests/samba_tool/contact_edit.sh b/python/samba/tests/samba_tool/contact_edit.sh
index 05eac69c4e6..3c14ac8de26 100755
--- a/python/samba/tests/samba_tool/contact_edit.sh
+++ b/python/samba/tests/samba_tool/contact_edit.sh
@@ -3,10 +3,10 @@
# Test for 'samba-tool contact edit'
if [ $# -lt 3 ]; then
-cat <<EOF
+ cat <<EOF
Usage: contact_edit.sh SERVER USERNAME PASSWORD
EOF
-exit 1;
+ exit 1
fi
SERVER="$1"
@@ -15,7 +15,7 @@ PASSWORD="$3"
samba_ldbsearch=ldbsearch
if test -x $BINDIR/ldbsearch; then
- samba_ldbsearch=$BINDIR/ldbsearch
+ samba_ldbsearch=$BINDIR/ldbsearch
fi
STpath=$(pwd)
@@ -31,14 +31,16 @@ display_name_con_b64="dGVzdCAHIHN0cmluZwo="
tmpeditor=$(mktemp --suffix .sh -p $SELFTEST_TMPDIR samba-tool-editor-XXXXXXXX)
chmod +x $tmpeditor
-create_test_contact() {
+create_test_contact()
+{
$PYTHON ${STpath}/source4/scripting/bin/samba-tool \
contact create testcontact1 \
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
# Test edit contact - add base64 attributes
-add_attribute_base64() {
+add_attribute_base64()
+{
# create editor.sh
cat >$tmpeditor <<EOF
#!/usr/bin/env bash
@@ -55,13 +57,15 @@ EOF
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-get_attribute_base64() {
+get_attribute_base64()
+{
$samba_ldbsearch '(&(objectClass=contact)(name=testcontact1))' \
displayName \
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-delete_attribute() {
+delete_attribute()
+{
# create editor.sh
cat >$tmpeditor <<EOF
#!/usr/bin/env bash
@@ -76,7 +80,8 @@ EOF
}
# Test edit contact - add base64 attribute value including control character
-add_attribute_base64_control() {
+add_attribute_base64_control()
+{
# create editor.sh
cat >$tmpeditor <<EOF
#!/usr/bin/env bash
@@ -92,21 +97,24 @@ EOF
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-get_attribute_base64_control() {
+get_attribute_base64_control()
+{
$PYTHON ${STpath}/source4/scripting/bin/samba-tool contact show \
testcontact1 --attributes=displayName \
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-get_attribute_force_no_base64() {
- # LDB_FLAG_FORCE_NO_BASE64_LDIF should be used here.
- $PYTHON ${STpath}/source4/scripting/bin/samba-tool contact show \
- testcontact1 --attributes=displayName \
- -H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
+get_attribute_force_no_base64()
+{
+ # LDB_FLAG_FORCE_NO_BASE64_LDIF should be used here.
+ $PYTHON ${STpath}/source4/scripting/bin/samba-tool contact show \
+ testcontact1 --attributes=displayName \
+ -H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
# Test edit contact - change base64 attribute value including control character
-change_attribute_base64_control() {
+change_attribute_base64_control()
+{
# create editor.sh
cat >$tmpeditor <<EOF
#!/usr/bin/env bash
@@ -121,7 +129,8 @@ EOF
}
# Test edit contact - change attributes with LDB_FLAG_FORCE_NO_BASE64_LDIF
-change_attribute_force_no_base64() {
+change_attribute_force_no_base64()
+{
# create editor.sh
# Expects that the original attribute is available as clear text,
# because the LDB_FLAG_FORCE_NO_BASE64_LDIF should be used here.
@@ -138,13 +147,15 @@ EOF
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-get_changed_attribute_force_no_base64() {
+get_changed_attribute_force_no_base64()
+{
$PYTHON ${STpath}/source4/scripting/bin/samba-tool contact show \
- testcontact1 --attributes=displayName \
- -H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
+ testcontact1 --attributes=displayName \
+ -H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-delete_contact() {
+delete_contact()
+{
$PYTHON ${STpath}/source4/scripting/bin/samba-tool \
contact delete testcontact1 \
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
@@ -152,18 +163,18 @@ delete_contact() {
failed=0
-testit "create_test_contact" create_test_contact || failed=`expr $failed + 1`
-testit "add_attribute_base64" add_attribute_base64 || failed=`expr $failed + 1`
-testit_grep "get_attribute_base64" "^displayName:: $display_name_b64" get_attribute_base64 || failed=`expr $failed + 1`
-testit "delete_attribute" delete_attribute || failed=`expr $failed + 1`
-testit "add_attribute_base64_control" add_attribute_base64_control || failed=`expr $failed + 1`
-testit_grep "get_attribute_base64_control" "^displayName:: $display_name_con_b64" get_attribute_base64_control || failed=`expr $failed + 1`
-testit "change_attribute_base64_control" change_attribute_base64_control || failed=`expr $failed + 1`
-testit_grep "get_attribute_base64" "^displayName:: $display_name_b64" get_attribute_base64 || failed=`expr $failed + 1`
-testit_grep "get_attribute_force_no_base64" "^displayName: $display_name" get_attribute_force_no_base64 || failed=`expr $failed + 1`
-testit "change_attribute_force_no_base64" change_attribute_force_no_base64 || failed=`expr $failed + 1`
-testit_grep "get_changed_attribute_force_no_base64" "^displayName: $display_name_new" get_changed_attribute_force_no_base64 || failed=`expr $failed + 1`
-testit "delete_contact" delete_contact || failed=`expr $failed + 1`
+testit "create_test_contact" create_test_contact || failed=$(expr $failed + 1)
+testit "add_attribute_base64" add_attribute_base64 || failed=$(expr $failed + 1)
+testit_grep "get_attribute_base64" "^displayName:: $display_name_b64" get_attribute_base64 || failed=$(expr $failed + 1)
+testit "delete_attribute" delete_attribute || failed=$(expr $failed + 1)
+testit "add_attribute_base64_control" add_attribute_base64_control || failed=$(expr $failed + 1)
+testit_grep "get_attribute_base64_control" "^displayName:: $display_name_con_b64" get_attribute_base64_control || failed=$(expr $failed + 1)
+testit "change_attribute_base64_control" change_attribute_base64_control || failed=$(expr $failed + 1)
+testit_grep "get_attribute_base64" "^displayName:: $display_name_b64" get_attribute_base64 || failed=$(expr $failed + 1)
+testit_grep "get_attribute_force_no_base64" "^displayName: $display_name" get_attribute_force_no_base64 || failed=$(expr $failed + 1)
+testit "change_attribute_force_no_base64" change_attribute_force_no_base64 || failed=$(expr $failed + 1)
+testit_grep "get_changed_attribute_force_no_base64" "^displayName: $display_name_new" get_changed_attribute_force_no_base64 || failed=$(expr $failed + 1)
+testit "delete_contact" delete_contact || failed=$(expr $failed + 1)
rm -f $tmpeditor
diff --git a/python/samba/tests/samba_tool/group_edit.sh b/python/samba/tests/samba_tool/group_edit.sh
index 4e8c6dffa2d..3db2c66ea60 100755
--- a/python/samba/tests/samba_tool/group_edit.sh
+++ b/python/samba/tests/samba_tool/group_edit.sh
@@ -3,10 +3,10 @@
# Test for 'samba-tool group edit'
if [ $# -lt 3 ]; then
-cat <<EOF
+ cat <<EOF
Usage: group_edit.sh SERVER USERNAME PASSWORD
EOF
-exit 1;
+ exit 1
fi
SERVER="$1"
@@ -15,7 +15,7 @@ PASSWORD="$3"
samba_ldbsearch=ldbsearch
if test -x $BINDIR/ldbsearch; then
- samba_ldbsearch=$BINDIR/ldbsearch
+ samba_ldbsearch=$BINDIR/ldbsearch
fi
STpath=$(pwd)
@@ -31,34 +31,39 @@ display_name_con_b64="dGVzdCAHIHN0cmluZwo="
tmpeditor=$(mktemp --suffix .sh -p $SELFTEST_TMPDIR samba-tool-editor-XXXXXXXX)
chmod +x $tmpeditor
-create_test_group() {
+create_test_group()
+{
$PYTHON ${STpath}/source4/scripting/bin/samba-tool \
group add testgroup1 \
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-delete_test_group() {
+delete_test_group()
+{
$PYTHON ${STpath}/source4/scripting/bin/samba-tool \
group delete testgroup1 \
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-create_test_user() {
+create_test_user()
+{
$PYTHON ${STpath}/source4/scripting/bin/samba-tool \
user create testuser1 --random-password \
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-delete_test_user() {
+delete_test_user()
+{
$PYTHON ${STpath}/source4/scripting/bin/samba-tool \
user delete testuser1 \
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-add_member() {
+add_member()
+{
user_dn=$($PYTHON ${STpath}/source4/scripting/bin/samba-tool \
user show testuser1 --attributes=dn \
- -H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD" | \
+ -H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD" |
grep ^dn: | cut -d' ' -f2)
# create editor.sh
@@ -77,14 +82,16 @@ EOF
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-get_member() {
+get_member()
+{
$PYTHON ${STpath}/source4/scripting/bin/samba-tool \
group listmembers testgroup1 \
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
# Test edit group - add base64 attributes
-add_attribute_base64() {
+add_attribute_base64()
+{
# create editor.sh
cat >$tmpeditor <<EOF
#!/usr/bin/env bash
@@ -101,12 +108,14 @@ EOF
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-get_attribute_base64() {
+get_attribute_base64()
+{
$samba_ldbsearch '(sAMAccountName=testgroup1)' displayName \
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-delete_attribute() {
+delete_attribute()
+{
# create editor.sh
cat >$tmpeditor <<EOF
#!/usr/bin/env bash
@@ -121,7 +130,8 @@ EOF
}
# Test edit group - add base64 attribute value including control character
-add_attribute_base64_control() {
+add_attribute_base64_control()
+{
# create editor.sh
cat >$tmpeditor <<EOF
#!/usr/bin/env bash
@@ -137,21 +147,24 @@ EOF
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-get_attribute_base64_control() {
+get_attribute_base64_control()
+{
$PYTHON ${STpath}/source4/scripting/bin/samba-tool group show \
testgroup1 --attributes=displayName \
-H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
-get_attribute_force_no_base64() {
- # LDB_FLAG_FORCE_NO_BASE64_LDIF should be used here.
- $PYTHON ${STpath}/source4/scripting/bin/samba-tool group show \
- testgroup1 --attributes=displayName \
- -H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
+get_attribute_force_no_base64()
+{
+ # LDB_FLAG_FORCE_NO_BASE64_LDIF should be used here.
+ $PYTHON ${STpath}/source4/scripting/bin/samba-tool group show \
+ testgroup1 --attributes=displayName \
+ -H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
}
# Test edit group - change base64 attribute value including control character
-change_attribute_base64_control() {
+change_attribute_base64_control()
+{
# create editor.sh
cat >$tmpeditor <<EOF
#!/usr/bin/env bash
@@ -166,7 +179,8 @@ EOF
}
# Test edit group - change attributes with LDB_FLAG_FORCE_NO_BASE64_LDIF
-change_attribute_force_no_base64() {
+change_attribute_force_no_base64()
+{
--
Samba Shared Repository
More information about the samba-cvs
mailing list