/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-10-24 17:48:13 UTC
  • mto: This revision was merged to the branch mainline in revision 791.
  • Revision ID: teddy@recompile.se-20151024174813-56h6prp05qt30fx0
Tags: version-1.7.1-1
* Makefile (version): Changed to "1.7.1".
* NEWS (Version 1.7.1): New entry.
* debian/changelog (1.7.1-1): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
44
44
import argparse
45
45
import datetime
46
46
import errno
 
47
import gnutls.crypto
47
48
import gnutls.connection
48
49
import gnutls.errors
49
50
import gnutls.library.functions
1880
1881
                         self.server.child_pipe.fileno())
1881
1882
            
1882
1883
            session = gnutls.connection.ClientSession(
1883
 
                self.request, gnutls.connection.X509Credentials())
 
1884
                self.request, gnutls.connection .X509Credentials())
1884
1885
            
1885
1886
            # Note: gnutls.connection.X509Credentials is really a
1886
1887
            # generic GnuTLS certificate credentials object so long as
3063
3064
            # Don't signal the disabling
3064
3065
            client.disable(quiet=True)
3065
3066
            # Emit D-Bus signal for removal
3066
 
            if use_dbus:
3067
 
                mandos_dbus_service.client_removed_signal(client)
 
3067
            mandos_dbus_service.client_removed_signal(client)
3068
3068
        client_settings.clear()
3069
3069
    
3070
3070
    atexit.register(cleanup)