=== modified file 'mandos'
--- mandos	2012-05-12 15:45:57 +0000
+++ mandos	2012-05-12 16:37:14 +0000
@@ -379,6 +379,7 @@
                                  self.server_state_changed)
         self.server_state_changed(self.server.GetState())
 
+
 class AvahiServiceToSyslog(AvahiService):
     def rename(self):
         """Add the new name to the syslog messages"""
@@ -389,12 +390,14 @@
                                 .format(self.name)))
         return ret
 
+
 def timedelta_to_milliseconds(td):
     "Convert a datetime.timedelta() to milliseconds"
     return ((td.days * 24 * 60 * 60 * 1000)
             + (td.seconds * 1000)
             + (td.microseconds // 1000))
 
+
 class Client(object):
     """A representation of a client host served by this server.
     
@@ -1925,14 +1928,18 @@
                                            str(self.interface
                                                + '\0'))
                 except socket.error as error:
-                    if error[0] == errno.EPERM:
+                    if error.errno == errno.EPERM:
                         logger.error("No permission to"
                                      " bind to interface %s",
                                      self.interface)
-                    elif error[0] == errno.ENOPROTOOPT:
+                    elif error.errno == errno.ENOPROTOOPT:
                         logger.error("SO_BINDTODEVICE not available;"
                                      " cannot bind to interface %s",
                                      self.interface)
+                    elif error.errno == errno.ENODEV:
+                        logger.error("Interface %s does not"
+                                     " exist, cannot bind",
+                                     self.interface)
                     else:
                         raise
         # Only bind(2) the socket if we really need to.