echo "$keyExpire"
}
+passphrase_prompt() {
+ local prompt="$1"
+ local fifo="$2"
+ local PASS
+
+ if [ "$DISPLAY" ] && which "${SSH_ASKPASS:-ssh-askpass}" >/dev/null; then
+ "${SSH_ASKPASS:-ssh-askpass}" "$prompt" > "$fifo"
+ else
+ read -s -p "$prompt" PASS
+ # Uses the builtin echo, so should not put the passphrase into
+ # the process table. I think. --dkg
+ echo "$PASS" > "$fifo"
+ fi
+}
+
# remove all lines with specified string from specified file
remove_line() {
local file
# if the user ID does matches...
if [ "$(echo "$uidfpr" | gpg_unescape)" = "$userID" ] ; then
# and the user ID validity is ok
- if [ "$validity" != 'u' -a "$validity" != 'f' ] ; then
+ if [ "$validity" = 'u' -o "$validity" = 'f' ] ; then
# mark user ID acceptable
uidOK=true
fi