From: Volker Lendecke <vl@samba.org>
Date: Tue, 7 Mar 2023 12:54:47 +0000 (+0100)
Subject: tests: Slightly simplify test_idmap_ad.sh
X-Git-Tag: talloc-2.4.1~1257
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9849dbf4ff87e848eb323ca6ca0f612c80c3f95;p=thirdparty%2Fsamba.git

tests: Slightly simplify test_idmap_ad.sh

ldbmodify can change multiple objects in one run

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/nsswitch/tests/test_idmap_ad.sh b/nsswitch/tests/test_idmap_ad.sh
index aef74bead96..9becbb63d32 100755
--- a/nsswitch/tests/test_idmap_ad.sh
+++ b/nsswitch/tests/test_idmap_ad.sh
@@ -70,16 +70,12 @@ add: loginShell
 loginShell: /bin/tcsh
 add: gecos
 gecos: Administrator Full Name
-EOF
 
-cat <<EOF | $ldbmodify -H ldap://$DC_SERVER -U "$DOMAIN\Administrator%$DC_PASSWORD"
 dn: CN=Domain Users,CN=Users,$BASE_DN
 changetype: modify
 add: gidNumber
 gidNumber: 2000001
-EOF
 
-cat <<EOF | $ldbmodify -H ldap://$DC_SERVER -U "$DOMAIN\Administrator%$DC_PASSWORD"
 dn: CN=Domain Admins,CN=Users,$BASE_DN
 changetype: modify
 add: gidNumber
@@ -95,18 +91,12 @@ dn: CN=Administrator,CN=Users,$TRUST_BASE_DN
 changetype: modify
 add: uidNumber
 uidNumber: 2500000
-EOF
 
-cat <<EOF | $ldbmodify -H ldap://$TRUST_SERVER \
-	-U "$TRUST_DOMAIN\Administrator%$TRUST_PASSWORD"
 dn: CN=Domain Users,CN=Users,$TRUST_BASE_DN
 changetype: modify
 add: gidNumber
 gidNumber: 2500001
-EOF
 
-cat <<EOF | $ldbmodify -H ldap://$TRUST_SERVER \
-	-U "$TRUST_DOMAIN\Administrator%$TRUST_PASSWORD"
 dn: CN=Domain Admins,CN=Users,$TRUST_BASE_DN
 changetype: modify
 add: gidNumber
@@ -209,16 +199,12 @@ delete: loginShell
 loginShell: /bin/tcsh
 delete: gecos
 gecos: Administrator Full Name
-EOF
 
-cat <<EOF | $ldbmodify -H ldap://$DC_SERVER -U "$DOMAIN\Administrator%$DC_PASSWORD"
 dn: CN=Domain Users,CN=Users,$BASE_DN
 changetype: modify
 delete: gidNumber
 gidNumber: 2000001
-EOF
 
-cat <<EOF | $ldbmodify -H ldap://$DC_SERVER -U "$DOMAIN\Administrator%$DC_PASSWORD"
 dn: CN=Domain Admins,CN=Users,$BASE_DN
 changetype: modify
 delete: gidNumber
@@ -234,18 +220,12 @@ dn: CN=Administrator,CN=Users,$TRUST_BASE_DN
 changetype: modify
 delete: uidNumber
 uidNumber: 2500000
-EOF
 
-cat <<EOF | $ldbmodify -H ldap://$TRUST_SERVER \
-	-U "$TRUST_DOMAIN\Administrator%$TRUST_PASSWORD"
 dn: CN=Domain Users,CN=Users,$TRUST_BASE_DN
 changetype: modify
 delete: gidNumber
 gidNumber: 2500001
-EOF
 
-cat <<EOF | $ldbmodify -H ldap://$TRUST_SERVER \
-	-U "$TRUST_DOMAIN\Administrator%$TRUST_PASSWORD"
 dn: CN=Domain Admins,CN=Users,$TRUST_BASE_DN
 changetype: modify
 delete: gidNumber