← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ftp/_gssapi.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-10-06 22:32:27 UTC
  • mfrom: (3763.2.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20081006223227-11nq4m186th9ljeq
Remove use of optional parameter in GSSAPI FTP support since it
        breaks newer versions of Python-Kerberos. (Jelmer)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ftp/_gssapi.py
44
44
    """Extended version of ftplib.FTP that can authenticate using GSSAPI."""
45
45
 
46
46
    def mic_putcmd(self, line):
47
 
        rc = kerberos.authGSSClientWrap(self.vc, 
48
 
            base64.b64encode(line), kerberos.authGSSClientUserName(self.vc))
 
47
        rc = kerberos.authGSSClientWrap(self.vc, base64.b64encode(line))
49
48
        wrapped = kerberos.authGSSClientResponse(self.vc)
50
49
        ftplib.FTP.putcmd(self, "MIC " + wrapped)
51
50