s4-drsdevel: support sites in drs developer scripts

diff --git a/source4/scripting/devel/drs/unvampire_ad.sh b/source4/scripting/devel/drs/unvampire_ad.sh
index 7f9763e18ae507c369ca50bc15b799fbfa424c43..dbd3cfb431ada20032ed566e2e22fb33fcc76c3c 100755 (executable)
--- a/source4/scripting/devel/drs/unvampire_ad.sh
+++ b/source4/scripting/devel/drs/unvampire_ad.sh
@@ -4,8 +4,11 @@ set -x
 
 . `dirname $0`/vars
 
+if [ -z "$site" ]; then
+    site="Default-First-Site-Name"
+fi
 
 bin/ldbdel -r -H ldap://$server.$DNSDOMAIN -U$workgroup/administrator%$pass "CN=$machine,CN=Computers,$dn"
 bin/ldbdel -r -H ldap://$server.$DNSDOMAIN -U$workgroup/administrator%$pass "CN=$machine,OU=Domain Controllers,$dn"
-bin/ldbdel -r -H ldap://$server.$DNSDOMAIN -U$workgroup/administrator%$pass "CN=$machine,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,$dn"
+bin/ldbdel -r -H ldap://$server.$DNSDOMAIN -U$workgroup/administrator%$pass "CN=$machine,CN=Servers,CN=$site,CN=Sites,CN=Configuration,$dn"
 rm -f $PREFIX/private/*.ldb

diff --git a/source4/scripting/devel/drs/vampire_ad.sh b/source4/scripting/devel/drs/vampire_ad.sh
index 7a6be506fc9e9d7e9642682a901fdbdb8bec9b13..28f3c5a0bcdf9559e0d3f9e89f9a04a1a70f28a1 100755 (executable)
--- a/source4/scripting/devel/drs/vampire_ad.sh
+++ b/source4/scripting/devel/drs/vampire_ad.sh
@@ -16,5 +16,5 @@ sudo rndc reconfig
 REALM="$(echo $DNSDOMAIN | tr '[a-z]' '[A-Z]')"
 
 sudo $GDB bin/net vampire $DNSDOMAIN -Uadministrator%$pass -s $PREFIX/etc/smb.conf --option=realm=$REALM --option="ads:dc function level=4" --option="ads:min function level=0" -d2 "$@" || exit 1
-PRIVATEDIR=$PREFIX/private sudo -E scripting/bin/setup_dns.sh $machine $DNSDOMAIN $machine_ip || exit 1
-sudo rndc flush
+# PRIVATEDIR=$PREFIX/private sudo -E scripting/bin/setup_dns.sh $machine $DNSDOMAIN $machine_ip || exit 1
+#sudo rndc flush

diff --git a/source4/scripting/devel/drs/vars b/source4/scripting/devel/drs/vars
index e1fe53c61a189e39513c5fdf043b0bd884c94e70..b69b9f9a39158d42a57d49f7ee162b3d9488961c 100644 (file)
--- a/source4/scripting/devel/drs/vars
+++ b/source4/scripting/devel/drs/vars
@@ -8,4 +8,5 @@ workgroup=adruth
 dn="DC=ad,DC=samba,DC=example,DC=com"
 server=win2008-1
 server_ip=192.168.122.53
+site="Default-First-Site-Name"