diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-27 12:18:02 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-27 15:24:40 +1000 |
| commit | 725e48c22c92e284bb55567f2116c8ddc82a0529 (patch) | |
| tree | 167b18243d36b6fdb73d06e64eac023c2c6c4489 | |
| parent | 4679bb731b3620006249abb0f9808c755266d87a (diff) | |
| download | samba-725e48c22c92e284bb55567f2116c8ddc82a0529.tar.gz samba-725e48c22c92e284bb55567f2116c8ddc82a0529.tar.bz2 samba-725e48c22c92e284bb55567f2116c8ddc82a0529.zip | |
s4-drsdevel: support sites in drs developer scripts
| -rwxr-xr-x | source4/scripting/devel/drs/unvampire_ad.sh | 5 | ||||
| -rwxr-xr-x | source4/scripting/devel/drs/vampire_ad.sh | 4 | ||||
| -rw-r--r-- | source4/scripting/devel/drs/vars | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/source4/scripting/devel/drs/unvampire_ad.sh b/source4/scripting/devel/drs/unvampire_ad.sh index 7f9763e18a..dbd3cfb431 100755 --- 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 7a6be506fc..28f3c5a0bc 100755 --- 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 e1fe53c61a..b69b9f9a39 100644 --- 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" |