Rev 2626: (Jelmer Vernooij) Fix bug #125955: Sanitize SSH_AUTH_SOCK environment variable in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2626
revision-id: pqm at pqm.ubuntu.com-20070719002624-zgt7cyq39hwp4p36
parent: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
parent: john at arbash-meinel.com-20070718231946-w2cdi5h14cn5chfr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-19 01:26:24 +0100
message:
  (Jelmer Vernooij) Fix bug #125955: Sanitize SSH_AUTH_SOCK environment variable
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 2625.1.1
    merged: john at arbash-meinel.com-20070718231946-w2cdi5h14cn5chfr
    parent: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
    parent: jelmer at samba.org-20070714194244-l880hn3dtlrb8jum
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Wed 2007-07-18 18:19:46 -0500
    message:
      (Jelmer Vernooij) Fix bug #125955: Sanitize SSH_AUTH_SOCK environment variable
    ------------------------------------------------------------
    revno: 2617.2.1
    merged: jelmer at samba.org-20070714194244-l880hn3dtlrb8jum
    parent: pqm at pqm.ubuntu.com-20070713074627-93zxs9uh528y0fki
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: selftest-sanitize
    timestamp: Sat 2007-07-14 22:42:44 +0300
    message:
      Sanitize SSH_AUTH_SOCK environment variable (#125955).
=== modified file 'NEWS'
--- a/NEWS	2007-07-17 11:02:03 +0000
+++ b/NEWS	2007-07-18 23:19:46 +0000
@@ -62,6 +62,9 @@
       ``--keep-output`` options, which are obsolete now that tests
       are done within directories in $TMPDIR.  (Martin Pool)
 
+    * The SSH_AUTH_SOCK environment variable is now reset to avoid 
+      interaction with any running ssh agents.  (Jelmer Vernooij, #125955)
+
 
 bzr 0.18  2007-07-17
 

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2007-07-17 11:02:03 +0000
+++ b/bzrlib/tests/__init__.py	2007-07-18 23:19:46 +0000
@@ -1081,6 +1081,8 @@
             'BZREMAIL': None, # may still be present in the environment
             'EMAIL': None,
             'BZR_PROGRESS_BAR': None,
+            # SSH Agent
+            'SSH_AUTH_SOCK': None,
             # Proxies
             'http_proxy': None,
             'HTTP_PROXY': None,