diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2009-07-26 22:18:38 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2009-07-26 22:18:38 -0400 |
| commit | 37c39c434872a2fc48da7e8d1d78ec2382090426 (patch) | |
| tree | 191a66bb2d9c2d41fb369dac864519e4f52d95e6 | |
| parent | 6ef7064d32718cc3b93f1c240e5e88c48fa4cf66 (diff) | |
ensuring that STRICT_MODES gets passed through to the monkeysphere subshell properly, and that we set it to a literal "false" in the tests. This should resolve the FTBFS associated with MS #659
| -rw-r--r-- | packaging/debian/changelog | 6 | ||||
| -rw-r--r-- | src/share/ma/update_users | 2 | ||||
| -rwxr-xr-x | tests/basic | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 75957bc..28b9637 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -3,8 +3,12 @@ monkeysphere (0.26~pre-1) unstable; urgency=low * New upstream release: - add 'refresh-keys' subcommand to monkeysphere-authentication - improve marginal UI (closes MS #1141) + - add MONKEYSPHERE_STRICT_MODES configuration to avoid + permission-checking (closes MS #649) + - test scripts use STRICT_MODES to avoid failure when built under /tmp + (Closes: #527765) - -- Jameson Graef Rollins <jrollins@finestructure.net> Fri, 24 Jul 2009 10:12:25 -0400 + -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Sun, 26 Jul 2009 22:18:20 -0400 monkeysphere (0.25-1) unstable; urgency=low diff --git a/src/share/ma/update_users b/src/share/ma/update_users index c5c74cf..31b53bf 100644 --- a/src/share/ma/update_users +++ b/src/share/ma/update_users @@ -93,7 +93,7 @@ for uname in $unames ; do # process authorized_user_ids file, as monkeysphere user su_monkeysphere_user \ - ". ${SYSSHAREDIR}/common; process_authorized_user_ids $TMP_AUTHORIZED_USER_IDS" \ + ". ${SYSSHAREDIR}/common; STRICT_MODES='$STRICT_MODES' process_authorized_user_ids $TMP_AUTHORIZED_USER_IDS" \ || returnCode="$?" else log debug "not processing authorized_user_ids." diff --git a/tests/basic b/tests/basic index dc5edb5..159f9dc 100755 --- a/tests/basic +++ b/tests/basic @@ -187,7 +187,7 @@ EOF # permission checks. # it should operate by analogy with StrictModes from sshd_config(5) - export MONKEYSPHERE_STRICT_MODES=no + export MONKEYSPHERE_STRICT_MODES=false fi |