diff options
| -rw-r--r-- | doc/george/changelog | 9 | ||||
| -rw-r--r-- | src/common | 3 | ||||
| -rwxr-xr-x | src/monkeysphere | 18 |
3 files changed, 27 insertions, 3 deletions
diff --git a/doc/george/changelog b/doc/george/changelog index c157cec..22807d1 100644 --- 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 @@ -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 58f0fdc..e111d8e 100755 --- 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"} |