ensuring that STRICT_MODES gets passed through to the monkeysphere subshell properly...

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 75957bc25d52d640fbb8ddafcea72180aac64c18..28b9637b82d9ad9197bddfe42b7153d21aefd538 100644 (file)
--- 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 c5c74cf7bbfaedff9d410146b08ccb6a8193b153..31b53bfc1df13bdebc26e3dd9c24dd411f8b3aae 100644 (file)
--- 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 dc5edb5bd0c25dee3bd53a10910a218694cf06ee..159f9dcc30337cd8323347a8ca7ae8e68186d6f7 100755 (executable)
--- 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