pyldb: avoid segfault when adding an element with no name

[kai/samba-autobuild/.git] / source4 / scripting / bin / ktpass.sh

diff --git a/source4/scripting/bin/ktpass.sh b/source4/scripting/bin/ktpass.sh
index 7c13fe4ac0e7ab3d002cb530c9b151118dfedf93..e758eb3bfb7f07fb550651382d760abb53014a43 100755 (executable)
--- a/source4/scripting/bin/ktpass.sh
+++ b/source4/scripting/bin/ktpass.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # vim: expandtab
 #
 # Copyright (C) Matthieu Patou <mat@matws.net>  2010
@@ -23,7 +23,7 @@ TEMP=`getopt -o h --long princ:,pass:,out:,host:,ptype:,enc:,path-to-ldbsearch:
      -n "$name" -- "$@"`
 eval set -- "$TEMP"
 
-function usage {
+usage () {
   echo -ne "$name --out <keytabfile> --princ <principal> --pass <password>|*\n"
   echo -ne "      [--host hostname] [--enc <encryption>]\n"
   echo -ne "      [--ptype <type>] [--path-to-ldbsearch <path>]\n"
@@ -66,8 +66,9 @@ fi
 if [ -z $host ]; then
   host=`hostname`
 fi
-kvno=`${path}ldbsearch -H ldap://$host "(|(samaccountname=$princ)(serviceprincipalname=$princ))" msds-keyversionnumber  -k 1 -N 2>/dev/null| grep -i msds-keyversionnumber`
-if [ "$kvno" == "" ]; then
+
+kvno=`${path}ldbsearch -H ldap://$host "(|(samaccountname=$princ)(serviceprincipalname=$princ)(userprincipalname=$princ))" msds-keyversionnumber  -k 1 -N 2>/dev/null| grep -i msds-keyversionnumber`
+if [ x"$kvno" = x"" ]; then
   echo -ne "Unable to find kvno for principal $princ\n"
   echo -ne " check that you are authentified with kerberos\n"
   exit 1
@@ -75,7 +76,7 @@ else
   kvno=`echo $kvno | sed 's/^.*: //'`
 fi
 
-if [ "$pass" == "*" ]; then
+if [ "$pass" = "*" ]; then
   echo -n "Enter password for $princ: "
   stty -echo
   read pass