summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-06-18 23:48:37 -0400
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-06-18 23:48:37 -0400
commitdcba8ebebf480a051f2b872f89ccbe68ad642f61 (patch)
treeb005d719b47a93b2c3ee1d184df1620181663842 /src/common
parent1a19643197dafa975de9cae717cef3f4608879d8 (diff)
Update to new agreed default host key usage flag (only "a" required
for users and hosts). Update TODO file. Some other small changes.
Diffstat (limited to 'src/common')
-rw-r--r--src/common8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common b/src/common
index ac43f0a..9b06b1d 100644
--- a/src/common
+++ b/src/common
@@ -73,7 +73,7 @@ unescape() {
}
# remove all lines with specified string from specified file
-remove_file_line() {
+remove_line() {
local file
local string
@@ -395,7 +395,7 @@ remove_userid() {
# remove user ID from file
log -n " removing user ID '$userID'... "
- remove_file_line "$AUTHORIZED_USER_IDS" "^${userID}$"
+ remove_line "$AUTHORIZED_USER_IDS" "^${userID}$"
loge "done."
}
@@ -416,7 +416,7 @@ process_host_known_hosts() {
while read -r ok keyid ; do
sshKey=$(gpg2ssh "$keyid")
# remove the old host key line
- remove_file_line "$KNOWN_HOSTS" "$sshKey"
+ remove_line "$KNOWN_HOSTS" "$sshKey"
# if key OK, add new host line
if [ "$ok" -eq '0' ] ; then
# hash if specified
@@ -449,7 +449,7 @@ process_uid_authorized_keys() {
while read -r ok keyid ; do
sshKey=$(gpg2ssh "$keyid")
# remove the old host key line
- remove_file_line "$AUTHORIZED_KEYS" "$sshKey"
+ remove_line "$AUTHORIZED_KEYS" "$sshKey"
# if key OK, add new host line
if [ "$ok" -eq '0' ] ; then
ssh2authorized_keys "$userID" "$sshKey" >> "$AUTHORIZED_KEYS"