/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-08-10 16:19:28 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150810161928-bnukog7l47j3pjix
Depend on Avahi and the network in the server's systemd service file.

* mandos.service ([Unit]/After): New; set to "network.target" and
  "avahi-daemon.service".
  ([Unit]/RequisiteOverridable): New; set to "avahi-daemon.service".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
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
103
104
if sys.version_info.major == 2:
104
105
    str = unicode
105
106
 
106
 
version = "1.7.1"
 
107
version = "1.6.9"
107
108
stored_state_file = "clients.pickle"
108
109
 
109
110
logger = logging.getLogger()
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)