Make authdir mount every time it is needed

@@ -44,9 +44,12 @@ function ssh-init-agent() {
 	local PS="/bin/ps"
 	local ECHO="/bin/echo"
 	local SSH_AGENT="/usr/bin/ssh-agent"
+	local MKTEMP="/usr/bin/mktemp"
 
 	[[ -e "${SSH_AGENT_FILE}" ]] && eval $(${CAT} "${SSH_AGENT_FILE}") >/dev/null
 
+	# printf "|ssh-agent| %s\n" "${SSH_AUTH_SOCK}" "${SSH_AGENT_PID}"
+
 	if [[ "x" != x${SSH_AGENT_PID} ]]
 	then
 		if [[ "ssh-agent" = "$(${PS} -p ${SSH_AGENT_PID} -o comm=)" ]]
@@ -55,8 +58,13 @@ function ssh-init-agent() {
 		fi
 	fi
 
+    insert_keypair "/authdata/${USER}/.ecryptfs" authdata
+    mount_crypt authdata
+
 	${ECHO} -n "start ssh-agent ... "
-	${SSH_AGENT} >"${SSH_AGENT_FILE}"
+
+	local SOCKDIR="$(${MKTEMP} -d -p "${TMPDIR}" agent-XXXXXXXX)"
+	${SSH_AGENT} -a "${SOCKDIR}/agent.${PPID}" >"${SSH_AGENT_FILE}"
 	if [[ 0 -eq $? ]]
 	then
 		eval $(${CAT} "${SSH_AGENT_FILE}") >/dev/null
@@ -65,6 +73,8 @@ function ssh-init-agent() {
 	else
 		${ECHO} "FAILED"
 	fi
+
+	umount_crypt authdata
 }
 
 function gpg-init-agent() {
@@ -83,16 +93,25 @@ function gpg-init-agent() {
 	local SUBKEYGRIP="BE4A9914142B488736792B9CBE01AE3A94D96E7A"
 
 	export GPG_AGENT_SOCK="${RUNDIR}/gnupg/S.gpg-agent"
-	local SOCK_OPEN_PID="$(test -e "${GPG_AGENT_SOCK}" &&\
-		${LSOF} -F p ${GPG_AGENT_SOCK} | sed '/p/s/^.//;te;d;:e')"
+	if [[ -e "${GPG_AGENT_SOCK}" ]]
+	then
+		local SOCK_OPEN_PID="$(${LSOF} -w -F p ${GPG_AGENT_SOCK}|tr -d "p ")"
+	fi
+
+	GPG_AGENT_PID="$(${PS} -C gpg-agent -o pid=|tr -d " ")"
 
-	GPG_AGENT_PID="$(${PS} -h -U ${USER} -o pid -o comm |\
-		${AWK} '/gpg-agent/{print $1}')"
+	# printf "|gpg-agent| %s\n" \
+	# 	"${GPG_AGENT_SOCK}" \
+	# 	"${GPG_AGENT_PID}" \
+	# 	"open socket on: ${SOCK_OPEN_PID}"
 
-	if [[ "${SOCK_OPEN_PID}" && ${GPG_AGENT_PID} == ${SOCK_OPEN_PID} ]]
+	if [[ "${SOCK_OPEN_PID}" && ${GPG_AGENT_PID} -eq ${SOCK_OPEN_PID} ]]
 	then
-		return
+		:
 	else
+		insert_keypair "/authdata/${USER}/.ecryptfs" authdata
+		mount_crypt authdata
+
 		${ECHO} -n "start gpg-agent ... "
 		eval ${GPG_AGENT} ${GPG_AGENT_ARGS}
 		if [[ 0 -eq $? ]]
@@ -100,12 +119,14 @@ function gpg-init-agent() {
 			${CAT} "${CREDDIR}/gpg.pw" | ${GPG_PRESET} --preset ${KEYGRIP}
 			${CAT} "${CREDDIR}/gpg.pw" | ${GPG_PRESET} --preset ${SUBKEYGRIP}
 			${ECHO} "OK"
-			export GPG_AGENT_PID="$(${PS} -h -U ${USER} -o pid -o comm |\
-				${AWK} '/gpg-agent/{print $1}')"
+			GPG_AGENT_PID="$(${PS} -C ${USER} -o pid=|tr -d "")"
 		else
 			${ECHO} "FAILED"
 		fi
+
+		umount_crypt authdata
 	fi
+	export GPG_AGENT_PID
 }
 
 # vim: set ft=sh ts=4 sw=4: