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 4485bd4ffcdfcbbd92fd8152badaea6fd3071686..6d2e72cbe34d62aa82843f9121b9a8fa7e5e2297 100755 (executable)
--- 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 3c2e3eead29106f3c15d43824ef13e47b98c9c6e..506dcf9eed02bc9fb68c5174e96618d83c3a6e6e 100755 (executable)
--- 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 00a10080008571b4cd89b40f10fcc59015f26dfd..2a20c1c9311e203f0f30009da0ba91172fad1ca3 100644 (file)
--- 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"