From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Mon, 9 Feb 2009 05:47:17 +0000 (-0500)
Subject: break su_monkeysphere_user into common function, since it will likely
X-Git-Tag: monkeysphere_0.23~117
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=55369617d8c00de548fabfbad02ba444f701be43;p=monkeysphere.git

break su_monkeysphere_user into common function, since it will likely
be needed by both m-host and m-auth for communicating with keyservers.
---

diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
index 4485bd4..6d2e72c 100755
--- a/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@ -70,19 +70,6 @@ subcommands:
 EOF
 }
 
-# function to run command as monkeysphere user
-su_monkeysphere_user() {
-    # if the current user is the monkeysphere user, then just eval
-    # command
-    if [ $(id -un) = "$MONKEYSPHERE_USER" ] ; then
-	eval "$@"
-
-    # otherwise su command as monkeysphere user
-    else
-	su "$MONKEYSPHERE_USER" -c "$@"
-    fi
-}
-
 # function to interact with the gpg core keyring
 gpg_core() {
     GNUPGHOME="$GNUPGHOME_CORE"
@@ -184,7 +171,7 @@ case $COMMAND in
 	list_certifiers "$@"
 	;;
 
-    'expert'|'e')
+    'expert')
 	SUBCOMMAND="$1"
 	shift
 	case "$SUBCOMMAND" in
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 3c2e3ee..506dcf9 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -68,19 +68,6 @@ subcommands:
 EOF
 }
 
-# function to run command as monkeysphere user
-su_monkeysphere_user() {
-    # if the current user is the monkeysphere user, then just eval
-    # command
-    if [ $(id -un) = "$MONKEYSPHERE_USER" ] ; then
-	eval "$@"
-
-    # otherwise su command as monkeysphere user
-    else
-	su "$MONKEYSPHERE_USER" -c "$@"
-    fi
-}
-
 # function to interact with the gpg keyring
 gpg_host() {
     GNUPGHOME="$GNUPGHOME_HOST" gpg "$@"
diff --git a/src/share/common b/src/share/common
index 00a1008..2a20c1c 100644
--- a/src/share/common
+++ b/src/share/common
@@ -90,6 +90,19 @@ log() {
     done
 }
 
+# run command as monkeysphere user
+su_monkeysphere_user() {
+    # if the current user is the monkeysphere user, then just eval
+    # command
+    if [ $(id -un) = "$MONKEYSPHERE_USER" ] ; then
+	eval "$@"
+
+    # otherwise su command as monkeysphere user
+    else
+	su "$MONKEYSPHERE_USER" -c "$@"
+    fi
+}
+
 # cut out all comments(#) and blank lines from standard input
 meat() {
     grep -v -e "^[[:space:]]*#" -e '^$' "$1"