diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-19 00:59:03 -0500 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-19 00:59:03 -0500 |
| commit | a7d9d68be60e5d46c016806a47227cd2f2e5a6c7 (patch) | |
| tree | 93259f1aceeebd54b3c70aef76b44604aad7ab19 /src/share | |
| parent | d09b0814096b1660c3a300e939091a58622a57a6 (diff) | |
| parent | 68299f9faebcf3c54382aca3d662b35172f6a968 (diff) | |
Merge commit 'dkg/master'
Diffstat (limited to 'src/share')
| -rw-r--r-- | src/share/ma/add_certifier | 3 | ||||
| -rw-r--r-- | src/share/ma/setup | 2 | ||||
| -rw-r--r-- | src/share/ma/update_users | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier index 2f29759..b917a74 100644 --- a/src/share/ma/add_certifier +++ b/src/share/ma/add_certifier @@ -84,7 +84,8 @@ if [ -f "$keyID" ] ; then # + failure 'could not read key from '\''/root/dkg.gpg'\''' # + echo 'could not read key from '\''/root/dkg.gpg'\''' - keyID=$(echo "$importinfo" | grep '^gpg: key ' | cut -f2 -d: | cut -f3 -d\ ) + keyID=$(echo "$importinfo" | grep '^gpg: key ' | cut -f2 -d: | cut -f3 -d\ ) || \ + failure "There were no gpg keys in the file $keyID." if [ -z "$keyID" ] || [ $(echo "$keyID" | wc -l) -ne 1 ] ; then failure "There was not exactly one gpg key in the file." fi diff --git a/src/share/ma/setup b/src/share/ma/setup index 6969d71..248406f 100644 --- a/src/share/ma/setup +++ b/src/share/ma/setup @@ -19,7 +19,7 @@ setup() { chmod 700 "${GNUPGHOME_CORE}" mkdir -p "${GNUPGHOME_SPHERE}" chmod 700 "${GNUPGHOME_SPHERE}" - mkdir -p "${MADATADIR}"/authorized_keys + mkdir -p "${SYSDATADIR}"/authorized_keys # deliberately replace the config files via truncation # FIXME: should we be dumping to tmp files and then moving atomically? diff --git a/src/share/ma/update_users b/src/share/ma/update_users index e9e3cc6..092d108 100644 --- a/src/share/ma/update_users +++ b/src/share/ma/update_users @@ -35,7 +35,7 @@ MODE="authorized_keys" GNUPGHOME="$GNUPGHOME_SPHERE" # the authorized_keys directory -authorizedKeysDir="${MADATADIR}/authorized_keys" +authorizedKeysDir="${SYSDATADIR}/authorized_keys" # check to see if the gpg trust database has been initialized if [ ! -s "${GNUPGHOME}/trustdb.gpg" ] ; then |