Rev 3766: Remove use of optional parameter in GSSAPI FTP support since it in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3766
revision-id: pqm at pqm.ubuntu.com-20081006223227-11nq4m186th9ljeq
parent: pqm at pqm.ubuntu.com-20081006074114-ky4ocpmlyl6hb1wk
parent: jelmer at samba.org-20081003001815-v72n2dv35fik5uke
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-10-06 23:32:27 +0100
message:
  Remove use of optional parameter in GSSAPI FTP support since it
  	breaks newer versions of Python-Kerberos. (Jelmer)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
    ------------------------------------------------------------
    revno: 3763.2.1
    revision-id: jelmer at samba.org-20081003001815-v72n2dv35fik5uke
    parent: pqm at pqm.ubuntu.com-20081002172844-d6df1l8dzpsqzyup
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: bzr.dev
    timestamp: Fri 2008-10-03 02:18:15 +0200
    message:
      Remove use of optional parameter in GSSAPI FTP support since it breaks newer versions of Python-Kerberos.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
=== modified file 'NEWS'
--- a/NEWS	2008-10-02 17:28:44 +0000
+++ b/NEWS	2008-10-03 00:18:15 +0000
@@ -107,6 +107,9 @@
     * Make the first line of the manpage preamble a comment again.
       (David Futcher, #242106)
 
+    * Remove use of optional parameter in GSSAPI FTP support, since 
+      it breaks newer versions of Python-Kerberos. (Jelmer Vernooij)
+
     * The autopacking logic will now always create a single new pack from
       all of the content which it deems is worth moving. This avoids the
       'repack a single pack' bug and should result in better packing

=== modified file 'bzrlib/transport/ftp/_gssapi.py'
--- a/bzrlib/transport/ftp/_gssapi.py	2008-08-28 16:44:20 +0000
+++ b/bzrlib/transport/ftp/_gssapi.py	2008-10-03 00:18:15 +0000
@@ -44,8 +44,7 @@
     """Extended version of ftplib.FTP that can authenticate using GSSAPI."""
 
     def mic_putcmd(self, line):
-        rc = kerberos.authGSSClientWrap(self.vc, 
-            base64.b64encode(line), kerberos.authGSSClientUserName(self.vc))
+        rc = kerberos.authGSSClientWrap(self.vc, base64.b64encode(line))
         wrapped = kerberos.authGSSClientResponse(self.vc)
         ftplib.FTP.putcmd(self, "MIC " + wrapped)