pyldb: avoid segfault when adding an element with no name

[nivanova/samba-autobuild/.git] / source4 / scripting / bin / setup_dns.sh

diff --git a/source4/scripting/bin/setup_dns.sh b/source4/scripting/bin/setup_dns.sh
index f296de2b8e7af1fcd4d03e135b2e5c4aba37cd49..166a2b84351f9faf4c1246d0b3e491a7865cc5b6 100755 (executable)
--- a/source4/scripting/bin/setup_dns.sh
+++ b/source4/scripting/bin/setup_dns.sh
@@ -13,15 +13,20 @@ IP="$3"
 RSUFFIX=$(echo $DOMAIN | sed s/[\.]/,DC=/g)
 
 [ -z "$PRIVATEDIR" ] && {
-    PRIVATEDIR=$(bin/testparm --section-name=global --parameter-name='private dir' --suppress-prompt 2> /dev/null)
+    PRIVATEDIR=$(bin/samba-tool 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)
+OBJECTGUID=$(bin/ldbsearch -s base -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)
+
+samba4kinit=kinit
+if test -x $BINDIR/samba4kinit; then
+       samba4kinit=bin/samba4kinit
+fi
 
 echo "Found objectGUID $OBJECTGUID"
 
 echo "Running kinit for $HOSTNAME\$@$DOMAIN"
-bin/samba4kinit -e arcfour-hmac-md5 -k -t "$PRIVATEDIR/secrets.keytab" $HOSTNAME\$@$DOMAIN || exit 1
+$samba4kinit -e arcfour-hmac-md5 -k -t "$PRIVATEDIR/secrets.keytab" $HOSTNAME\$@$DOMAIN || exit 1
 echo "Adding $HOSTNAME.$DOMAIN"
 scripting/bin/nsupdate-gss --noverify $HOSTNAME $DOMAIN $IP 300 || {
     echo "Failed to add A record"
@@ -33,5 +38,6 @@ scripting/bin/nsupdate-gss --realm=$DOMAIN --noverify --ntype="CNAME" $OBJECTGUI
     exit 1
 }
 echo "Checking"
+rndc flush
 host $HOSTNAME.$DOMAIN
 host $OBJECTGUID._msdcs.$DOMAIN