summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-01-31 18:58:26 -0500
committerMicah Anderson <micah@riseup.net>2009-01-31 18:58:26 -0500
commit6923ef580f068ff535af273714e59235260ab7b6 (patch)
treeb57cb7cf80a357b0c3c198d3366492ff087e6d2c /src
parent7bf7ac9986b93cc910f5a1002d88da8b1f9e885a (diff)
parent8001b4523c665ee7d9ded64cbdb7081b023b75c1 (diff)
Merge commit 'dkg/master'
Diffstat (limited to 'src')
-rw-r--r--src/common1
-rw-r--r--[-rwxr-xr-x]src/subcommands/m/ssh-proxycommand10
-rw-r--r--[-rwxr-xr-x]src/subcommands/ma/add-certifier9
-rw-r--r--[-rwxr-xr-x]src/subcommands/ma/diagnostics9
-rw-r--r--[-rwxr-xr-x]src/subcommands/ma/list-certifiers7
-rw-r--r--[-rwxr-xr-x]src/subcommands/ma/remove-certifier9
-rw-r--r--[-rwxr-xr-x]src/subcommands/ma/update-users9
-rw-r--r--[-rwxr-xr-x]src/subcommands/mh/add-hostname9
-rw-r--r--[-rwxr-xr-x]src/subcommands/mh/add-revoker5
-rw-r--r--[-rwxr-xr-x]src/subcommands/mh/diagnostics9
-rw-r--r--[-rwxr-xr-x]src/subcommands/mh/extend-key9
-rw-r--r--[-rwxr-xr-x]src/subcommands/mh/gen-key9
-rw-r--r--[-rwxr-xr-x]src/subcommands/mh/import-key9
-rw-r--r--[-rwxr-xr-x]src/subcommands/mh/publish-key7
-rw-r--r--[-rwxr-xr-x]src/subcommands/mh/revoke-hostname9
-rw-r--r--[-rwxr-xr-x]src/subcommands/mh/revoke-key9
16 files changed, 73 insertions, 56 deletions
diff --git a/src/common b/src/common
index 815aacc..5df8f6a 100644
--- a/src/common
+++ b/src/common
@@ -1,4 +1,5 @@
# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Shared sh functions for the monkeysphere
#
diff --git a/src/subcommands/m/ssh-proxycommand b/src/subcommands/m/ssh-proxycommand
index a609199..56a266e 100755..100644
--- a/src/subcommands/m/ssh-proxycommand
+++ b/src/subcommands/m/ssh-proxycommand
@@ -1,12 +1,14 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# monkeysphere-ssh-proxycommand: MonkeySphere ssh ProxyCommand hook
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
+# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# They are Copyright 2008, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2009, and are all released under the GPL,
+# version 3 or later.
# This is meant to be run as an ssh ProxyCommand to initiate a
# monkeysphere known_hosts update before an ssh connection to host is
diff --git a/src/subcommands/ma/add-certifier b/src/subcommands/ma/add-certifier
index 451506d..9ad0515 100755..100644
--- a/src/subcommands/ma/add-certifier
+++ b/src/subcommands/ma/add-certifier
@@ -1,14 +1,15 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Monkeysphere authentication add-certifier subcommand
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# They are Copyright 2008, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2009, and are all released under the GPL,
+# version 3 or later.
# retrieve key from web of trust, import it into the host keyring, and
# ltsign the key in the host keyring so that it may certify other keys
diff --git a/src/subcommands/ma/diagnostics b/src/subcommands/ma/diagnostics
index 66aa6b4..73e93a0 100755..100644
--- a/src/subcommands/ma/diagnostics
+++ b/src/subcommands/ma/diagnostics
@@ -1,14 +1,15 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Monkeysphere authentication diagnostics subcommand
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# They are Copyright 2008, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2009, and are all released under the GPL,
+# version 3 or later.
# check on the status and validity of the key and public certificates
diff --git a/src/subcommands/ma/list-certifiers b/src/subcommands/ma/list-certifiers
index e920888..83f7786 100755..100644
--- a/src/subcommands/ma/list-certifiers
+++ b/src/subcommands/ma/list-certifiers
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Monkeysphere authentication list-certifiers subcommand
#
@@ -7,8 +8,8 @@
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# They are Copyright 2008, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2009, and are all released under the GPL,
+# version 3 or later.
# list the host certifiers
diff --git a/src/subcommands/ma/remove-certifier b/src/subcommands/ma/remove-certifier
index 117bad4..59d3f0c 100755..100644
--- a/src/subcommands/ma/remove-certifier
+++ b/src/subcommands/ma/remove-certifier
@@ -1,14 +1,15 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Monkeysphere authentication remove-certifier subcommand
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# They are Copyright 2008, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2009, and are all released under the GPL,
+# version 3 or later.
# delete a certifiers key from the host keyring
diff --git a/src/subcommands/ma/update-users b/src/subcommands/ma/update-users
index 0861364..0335e31 100755..100644
--- a/src/subcommands/ma/update-users
+++ b/src/subcommands/ma/update-users
@@ -1,14 +1,15 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Monkeysphere authentication update-users subcommand
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# They are Copyright 2008, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2009, and are all released under the GPL,
+# version 3 or later.
update_users() {
diff --git a/src/subcommands/mh/add-hostname b/src/subcommands/mh/add-hostname
index 591f52e..10d5f58 100755..100644
--- a/src/subcommands/mh/add-hostname
+++ b/src/subcommands/mh/add-hostname
@@ -1,14 +1,15 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Monkeysphere host add-hostname subcommand
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# They are Copyright 2008, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2009, and are all released under the GPL,
+# version 3 or later.
# add hostname user ID to server key
diff --git a/src/subcommands/mh/add-revoker b/src/subcommands/mh/add-revoker
index 8c4651e..f9d0bb6 100755..100644
--- a/src/subcommands/mh/add-revoker
+++ b/src/subcommands/mh/add-revoker
@@ -1,9 +1,10 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Monkeysphere host add-revoker subcommand
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
diff --git a/src/subcommands/mh/diagnostics b/src/subcommands/mh/diagnostics
index 5b04b14..7e76da6 100755..100644
--- a/src/subcommands/mh/diagnostics
+++ b/src/subcommands/mh/diagnostics
@@ -1,14 +1,15 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Monkeysphere host diagnostics subcommand
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# They are Copyright 2008, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2009, and are all released under the GPL,
+# version 3 or later.
# check on the status and validity of the key and public certificates
diff --git a/src/subcommands/mh/extend-key b/src/subcommands/mh/extend-key
index 8f1ecc2..ccbaf0e 100755..100644
--- a/src/subcommands/mh/extend-key
+++ b/src/subcommands/mh/extend-key
@@ -1,14 +1,15 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Monkeysphere host extend-key subcommand
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# They are Copyright 2008, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2009, and are all released under the GPL,
+# version 3 or later.
# extend the lifetime of a host key:
diff --git a/src/subcommands/mh/gen-key b/src/subcommands/mh/gen-key
index 72b9138..aad213a 100755..100644
--- a/src/subcommands/mh/gen-key
+++ b/src/subcommands/mh/gen-key
@@ -1,14 +1,15 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Monkeysphere host gen-key subcommand
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# They are Copyright 2008, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2009, and are all released under the GPL,
+# version 3 or later.
gen_key() {
diff --git a/src/subcommands/mh/import-key b/src/subcommands/mh/import-key
index 9ba51d2..386e02d 100755..100644
--- a/src/subcommands/mh/import-key
+++ b/src/subcommands/mh/import-key
@@ -1,14 +1,15 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Monkeysphere host import-key subcommand
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# They are Copyright 2008, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2009 and are all released under the GPL,
+# version 3 or later.
import_key() {
diff --git a/src/subcommands/mh/publish-key b/src/subcommands/mh/publish-key
index 8b36a18..6c69569 100755..100644
--- a/src/subcommands/mh/publish-key
+++ b/src/subcommands/mh/publish-key
@@ -1,13 +1,14 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Monkeysphere host publish-key subcommand
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# They are Copyright 2008, and are all released under the GPL, version 3
+# They are Copyright 2008-2009, and are all released under the GPL, version 3
# or later.
# publish server key to keyserver
diff --git a/src/subcommands/mh/revoke-hostname b/src/subcommands/mh/revoke-hostname
index 01f6ee0..b519cf6 100755..100644
--- a/src/subcommands/mh/revoke-hostname
+++ b/src/subcommands/mh/revoke-hostname
@@ -1,14 +1,15 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Monkeysphere host revoke-hostname subcommand
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# They are Copyright 2008, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2009, and are all released under the GPL,
+# version 3 or later.
# revoke hostname user ID from host key
diff --git a/src/subcommands/mh/revoke-key b/src/subcommands/mh/revoke-key
index 3810a0b..cccdc22 100755..100644
--- a/src/subcommands/mh/revoke-key
+++ b/src/subcommands/mh/revoke-key
@@ -1,14 +1,15 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Monkeysphere host revoke-key subcommand
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# They are Copyright 2008, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2009, and are all released under the GPL,
+# version 3 or later.
# revoke host key