diff options
| author | Jameson Rollins <jrollins@finestructure.net> | 2010-10-29 20:14:24 -0400 |
|---|---|---|
| committer | Jameson Rollins <jrollins@finestructure.net> | 2010-10-29 20:14:24 -0400 |
| commit | 8019e159c585f0374bccac08f247830ac84ad2d4 (patch) | |
| tree | cf1cfe8ac4fd85485ca27a95c401ad77d10deebf /src/share/common | |
| parent | 875b9873b351a1a4643cfe635131253150d335e9 (diff) | |
fix ssh_proxycommand marginal ui
After the last big code cleanup, the bookkeeping of numbers of
processed/valid keys was removed. This was done because most things
don't use that info, and it was confusing return codes of top-level
functions.
The one thing that did use that, though, was the ssh_proxycommand. We
fix this by using a global variable to keep track of the number of
processed and valid keys. The proxy command can now easily determine
when it should output it's marginal ui block.
Diffstat (limited to 'src/share/common')
| -rw-r--r-- | src/share/common | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/share/common b/src/share/common index b26b57e..025c991 100644 --- a/src/share/common +++ b/src/share/common @@ -841,6 +841,8 @@ process_keys_for_file() { esac fi + ((++KEYS_PROCESSED)) + # if key OK, add new key line if [ "$ok" -eq '0' ] ; then case "$FILE_TYPE" in @@ -862,8 +864,13 @@ process_keys_for_file() { else echo "$keyLine" >>"$keyFile" fi + + ((++KEYS_VALID)) fi done + + log debug "KEYS_PROCESSED=$KEYS_PROCESSED" + log debug "KEYS_VALID=$KEYS_VALID" } # process an authorized_user_ids file on stdin for authorized_keys |