KCC: ignore SMTP transport and warn about unknown ones
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Fri, 5 Jun 2015 00:05:30 +0000 (12:05 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 12 Jun 2015 04:57:15 +0000 (06:57 +0200)
An info line is enough for SMTP. Warn about other as yet unknown
transports, because we want to know if they turn up.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
python/samba/kcc/__init__.py

index f37e41e411cea577d031d731322b6c483fd6d7a3..90e1a6aa218e6761e47bc75b12805d866926cd42 100644 (file)
@@ -168,6 +168,12 @@ class KCC(object):
                                             transport)
             if transport.name == 'IP':
                 self.ip_transport = transport
+            elif transport.name == 'SMTP':
+                logger.info("Samba KCC is ignoring the obsolete SMTP transport.")
+
+            else:
+                logger.warning("Samba KCC does not support the transport called %r."
+                               % (transport.name,))
 
         if self.ip_transport is None:
             raise KCCError("there doesn't seem to be an IP transport")
@@ -1551,8 +1557,7 @@ class KCC(object):
         for t_guid, transport in self.transport_table.items():
             if transport.name != 'IP':
                 #XXX well this is cheating a bit
-                logger.warning("WARNING: we are ignoring a transport named %r"
-                               % transport.name)
+                DEBUG_FN("ignoring a transport named %r" % transport.name)
                 continue
 
             if vertex not in graph.connected_vertices: