diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-10-15 08:49:21 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-10-15 08:49:21 +1100 |
| commit | b41290c10dc3e6c783b7a51477be903d202ed074 (patch) | |
| tree | fb51e47d6f8d2fefac3b07b26b87d1b23039648f /source4 | |
| parent | d1784e7ca92ba8c6579da6a6238a3f95d67a463d (diff) | |
| download | samba-b41290c10dc3e6c783b7a51477be903d202ed074.tar.gz samba-b41290c10dc3e6c783b7a51477be903d202ed074.tar.bz2 samba-b41290c10dc3e6c783b7a51477be903d202ed074.zip | |
s4-devel: for devel scripts its better to use bin/ than $PREFIX/bin
This avoids having to do make install after each change when using the
drs devel scripts
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/scripting/devel/drs/unvampire_ad.sh | 8 | ||||
| -rwxr-xr-x | source4/scripting/devel/drs/vampire_ad.sh | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/source4/scripting/devel/drs/unvampire_ad.sh b/source4/scripting/devel/drs/unvampire_ad.sh index f44edafee7..e4b9dccf1a 100755 --- a/source4/scripting/devel/drs/unvampire_ad.sh +++ b/source4/scripting/devel/drs/unvampire_ad.sh @@ -5,8 +5,8 @@ set -x . `dirname $0`/vars -$PREFIX/bin/ldbdel -H ldap://$server.$DNSDOMAIN -U$workgroup/administrator%$pass "CN=$machine,CN=Computers,$dn" -$PREFIX/bin/ldbdel -H ldap://$server.$DNSDOMAIN -U$workgroup/administrator%$pass "CN=$machine,OU=Domain Controllers,$dn" -$PREFIX/bin/ldbdel -H ldap://$server.$DNSDOMAIN -U$workgroup/administrator%$pass "CN=NTDS Settings,CN=$machine,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,$dn" -$PREFIX/bin/ldbdel -H ldap://$server.$DNSDOMAIN -U$workgroup/administrator%$pass "CN=$machine,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,$dn" +bin/ldbdel -H ldap://$server.$DNSDOMAIN -U$workgroup/administrator%$pass "CN=$machine,CN=Computers,$dn" +bin/ldbdel -H ldap://$server.$DNSDOMAIN -U$workgroup/administrator%$pass "CN=$machine,OU=Domain Controllers,$dn" +bin/ldbdel -H ldap://$server.$DNSDOMAIN -U$workgroup/administrator%$pass "CN=NTDS Settings,CN=$machine,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,$dn" +bin/ldbdel -H ldap://$server.$DNSDOMAIN -U$workgroup/administrator%$pass "CN=$machine,CN=Servers,CN=Default-First-Site-Name,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 3843388a47..baba02d5ac 100755 --- a/source4/scripting/devel/drs/vampire_ad.sh +++ b/source4/scripting/devel/drs/vampire_ad.sh @@ -9,8 +9,9 @@ cp `dirname $0`/named.conf.ad.template $namedtmp sed -i "s/DNSDOMAIN/$DNSDOMAIN/g" $namedtmp sed -i "s/SERVERIP/$server_ip/g" $namedtmp chmod a+r $namedtmp -mv $namedtmp $PREFIX/private/named.conf +mv -f $namedtmp $PREFIX/private/named.conf sudo rndc reconfig `dirname $0`/unvampire_ad.sh -sudo $PREFIX/bin/net vampire $DNSDOMAIN -Uadministrator%$pass -s $PREFIX/etc/smb.conf -d2 || exit 1 +sudo bin/net vampire $DNSDOMAIN -Uadministrator%$pass -s $PREFIX/etc/smb.conf -d2 || exit 1 PRIVATEDIR=$PREFIX/private sudo -E scripting/bin/setup_dns.sh $machine $DNSDOMAIN $machine_ip || exit 1 +sudo rndc flush |