add refresh-keys subcommand to monkeysphere-authentication

diff --git a/man/man8/monkeysphere-authentication.8 b/man/man8/monkeysphere-authentication.8
index d3d3b952fd8bf3702c9876bbc3d1445ddb24cfcc..a687f4efb10a06d40bf6f86faeb5ab8298902aee 100644 (file)
--- a/man/man8/monkeysphere-authentication.8
+++ b/man/man8/monkeysphere-authentication.8
@@ -37,6 +37,11 @@ monkeysphere-controlled authorized_keys file.  If no accounts are
 specified, then all accounts on the system are processed.  `u' may be
 used in place of `update\-users'.
 .TP
+.B refresh\-keys
+Refresh all keys in the monkeysphere-authentication keyring.  If no
+accounts are specified, then all accounts on the system are processed.
+`r' may be used in place of `refresh\-keys'.
+.TP
 .B add\-id\-certifier KEYID|FILE
 Instruct system to trust user identity certifications made by KEYID.
 The key ID will be loaded from the keyserver.  A file may be loaded

diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
index 5b30628a188341d2e8c64dbc339d377220caa2f7..b37949e4e3f061425e3761029741f837cc1fb5f7 100755 (executable)
--- a/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@ -54,6 +54,7 @@ Monkeysphere authentication admin tool.
 
 subcommands:
  update-users (u) [USER]...        update user authorized_keys files
+ refresh-keys (r)                  refresh keys in keyring
 
  add-id-certifier (c+) KEYID|FILE  import and tsign a certification key
    [--domain (-n) DOMAIN]            limit ID certifications to DOMAIN
@@ -166,6 +167,12 @@ case $COMMAND in
        update_users "$@"
        ;;
 
+    'refresh-keys'|'r')
+       source "${MASHAREDIR}/setup"
+       setup
+       gpg_sphere "--keyserver $KEYSERVER --refresh-keys"
+       ;;
+
     'add-identity-certifier'|'add-id-certifier'|'add-certifier'|'c+')
        source "${MASHAREDIR}/setup"
        setup