diff options
author | Andrew Tridgell <tridge@samba.org> | 2009-09-12 18:42:37 +1000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2009-09-12 18:42:37 +1000 |
commit | 72fcc6344f1ddfece4dd41790fc1add9c6d2c0f7 (patch) | |
tree | 579600893b32e6dcdc767497496e6b826f620fb0 /source4 | |
parent | 766774feaea925dd2fdffbfdc55ced66962564b8 (diff) | |
parent | 0be268bf5538dcf57f9534d864be1960dfab0f72 (diff) | |
download | samba-72fcc6344f1ddfece4dd41790fc1add9c6d2c0f7.tar.gz samba-72fcc6344f1ddfece4dd41790fc1add9c6d2c0f7.tar.bz2 samba-72fcc6344f1ddfece4dd41790fc1add9c6d2c0f7.zip |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source4')
-rwxr-xr-x | source4/scripting/bin/setup_dns.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/scripting/bin/setup_dns.sh b/source4/scripting/bin/setup_dns.sh index e6a42811b8..f296de2b8e 100755 --- a/source4/scripting/bin/setup_dns.sh +++ b/source4/scripting/bin/setup_dns.sh @@ -12,7 +12,9 @@ IP="$3" RSUFFIX=$(echo $DOMAIN | sed s/[\.]/,DC=/g) -PRIVATEDIR=$(bin/testparm --section-name=global --parameter-name='private dir' --suppress-prompt 2> /dev/null) +[ -z "$PRIVATEDIR" ] && { + PRIVATEDIR=$(bin/testparm --section-name=global --parameter-name='private dir' --suppress-prompt 2> /dev/null) +} OBJECTGUID=$(bin/ldbsearch -H "$PRIVATEDIR/sam.ldb" -b "CN=NTDS Settings,CN=$HOSTNAME,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=$RSUFFIX" objectguid|grep ^objectGUID| cut -d: -f2) |