Merge commit 'dkg/master'

diff --git a/doc/george/changelog b/doc/george/changelog
index c157cece509409d639acded1880535d103c13262..22807d1410a5cd4c6d3bb2a26b486268b736e2de 100644 (file)
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -7,7 +7,14 @@
 *  changes to this system                                                   *
 ******************************************************************************
 
-2008-06-20 - dkg
+2008-06-20 - micah
+       * Commented out the 'export SSHD_OOM_ADJUST=-17' from the
+       /etc/init.d/ssh initscript, and the 'SSHD_OOM_ADJUST=-17' from
+       /etc/default/ssh in order to make this error go away:
+       "error writing /proc/self/oom_adj: Operation not permitted"
+       (c.f. Debian #487325)
+         
+200r-06-20 - dkg
        * touched /etc/environment to get rid of some spurious auth.log
        entries.
        * turned up sshd's LogLevel from INFO to DEBUG

diff --git a/src/common b/src/common
index 7df6908b348bc88f1f805de47f426179017cd667..c90fdd09c0d861e07328e41748fc3912994fe2e0 100644 (file)
--- a/src/common
+++ b/src/common
@@ -103,8 +103,9 @@ translate_ssh_variables() {
     # get the user's home directory
     userHome=$(getent passwd "$uname" | cut -d: -f6)
 
-    # translate ssh-style path variables
+    # translate '%u' to user name
     path=${path/\%u/"$uname"}
+    # translate '%h' to user home directory
     path=${path/\%h/"$userHome"}
 
     echo "$path"

diff --git a/src/monkeysphere b/src/monkeysphere
index 58f0fdc632edaeb8f7aa679b24dbfa6e6c81809c..e111d8e2cf5a9305d207560b02f295ff14137693 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -54,11 +54,27 @@ gen_subkey(){
     gpgOut=$(gpg --quiet --fixed-list-mode --list-keys --with-colons \
        "$keyID" 2> /dev/null)
 
-    # return 1 if there only "tru" lines are output from gpg
+    # fail if there only "tru" lines are output from gpg, which
+    # indicates the key was not found.
     if [ -z "$(echo "$gpgOut" | grep -v '^tru:')" ] ; then
        failure "Key ID '$keyID' not found."
     fi
 
+    # fail if multiple pub lines are returned, which means the id given
+    # is not unique
+    if [ $(echo "$gpgOut" | grep '^pub:' | wc -l) -gt '1' ] ; then
+       failure "Key ID '$keyID' is not unique."
+    fi
+
+    # prompt if an authentication subkey already exists
+    if echo "$gpgOut" | egrep "^(pub|sub):" | cut -d: -f 12 | grep -q a ; then
+       echo "An authentication subkey already exists for key '$keyID'."
+       read -p "Are you sure you would like to generate another one? [y|N]: " OK; OK=${OK:N}
+       if [ "${OK/y/Y}" != 'Y' ] ; then
+           failure "aborting."
+       fi
+    fi
+
     # set subkey defaults
     SUBKEY_TYPE=${SUBKEY_TYPE:-"RSA"}
     #SUBKEY_LENGTH=${SUBKEY_LENGTH:-"2048"}