From: david-sarah <david-sarah@jacaranda.org>
Date: Sun, 16 May 2010 01:40:45 +0000 (-0700)
Subject: SFTP: fix error in SFTPUserHandler arguments introduced by execCommand patch.
X-Git-Tag: trac-4400~27
X-Git-Url: https://git.rkrishnan.org/%5B/htmlfontify-example.html?a=commitdiff_plain;h=31994aaf745e54fcf86b4f65d782c444b3f4fb35;p=tahoe-lafs%2Ftahoe-lafs.git

SFTP: fix error in SFTPUserHandler arguments introduced by execCommand patch.
---

diff --git a/src/allmydata/frontends/sftpd.py b/src/allmydata/frontends/sftpd.py
index 5407ebad..b36d29b8 100644
--- a/src/allmydata/frontends/sftpd.py
+++ b/src/allmydata/frontends/sftpd.py
@@ -805,11 +805,10 @@ class Reason:
 
 class SFTPUserHandler(ConchUser, PrefixingLogMixin):
     implements(ISFTPServer, ISession)
-    def __init__(self, check_abort, client, rootnode, username):
+    def __init__(self, client, rootnode, username):
         ConchUser.__init__(self)
         PrefixingLogMixin.__init__(self, facility="tahoe.sftp")
-        if noisy: self.log(".__init__(%r, %r, %r, %r)" %
-                           (check_abort, client, rootnode, username), level=NOISY)
+        if noisy: self.log(".__init__(%r, %r, %r)" % (client, rootnode, username), level=NOISY)
 
         self.channelLookup["session"] = session.SSHSession
         self.subsystemLookup["sftp"] = FileTransferServer
diff --git a/src/allmydata/test/test_sftp.py b/src/allmydata/test/test_sftp.py
index de0561a9..418ba09d 100644
--- a/src/allmydata/test/test_sftp.py
+++ b/src/allmydata/test/test_sftp.py
@@ -90,7 +90,6 @@ class Handler(GridTestMixin, ShouldFailMixin, unittest.TestCase):
         self.basedir = "sftp/" + basedir
         self.set_up_grid(num_clients=num_clients, num_servers=num_servers)
 
-        self.check_abort = lambda: False
         self.client = self.g.clients[0]
         self.username = "alice"
 
@@ -98,7 +97,7 @@ class Handler(GridTestMixin, ShouldFailMixin, unittest.TestCase):
         def _created_root(node):
             self.root = node
             self.root_uri = node.get_uri()
-            self.handler = sftpd.SFTPUserHandler(self.check_abort, self.client, self.root, self.username)
+            self.handler = sftpd.SFTPUserHandler(self.client, self.root, self.username)
         d.addCallback(_created_root)
         return d