summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2014-05-12 16:56:29 +0200
committerAndreas Schneider <asn@cryptomilk.org>2014-09-01 15:47:33 +0200
commit7982c373b04377da7eb998f94846db5f9e56dbb7 (patch)
treed3a8d806bf47ae4f09eaf3a8e81dc913d92c39ba /source4/scripting
parent980ce21a5b80f4cd40f9c3876c09a885918491ce (diff)
downloadsamba-7982c373b04377da7eb998f94846db5f9e56dbb7.tar.gz
testprogs: Use the system binaries for KRB5 if we don't build in-tree heimdal.
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Guenther Deschner <gd@samba.org> Reviewed-by: Andrew Bartlet <abartlet@samba.org>
Diffstat (limited to 'source4/scripting')
-rwxr-xr-xsource4/scripting/bin/setup_dns.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/source4/scripting/bin/setup_dns.sh b/source4/scripting/bin/setup_dns.sh
index bc2ae96b845..166a2b84351 100755
--- a/source4/scripting/bin/setup_dns.sh
+++ b/source4/scripting/bin/setup_dns.sh
@@ -18,10 +18,15 @@ RSUFFIX=$(echo $DOMAIN | sed s/[\.]/,DC=/g)
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"