[minion-cvs] Oops. We need to regenerate descriptors when services b...

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria:/tmp/cvs-serv3529/lib/mixminion/server

Modified Files:
	ServerKeys.py 
Log Message:
Oops. We need to regenerate descriptors when services become non-advertised.

Index: ServerKeys.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerKeys.py,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- ServerKeys.py	20 Dec 2004 04:16:21 -0000	1.71
+++ ServerKeys.py	8 Dec 2005 16:11:36 -0000	1.72
@@ -926,9 +926,11 @@
 
     for section in ('Outgoing/MMTP', 'Delivery/MBOX', 'Delivery/SMTP'):
         info_out = info[section].get('Version')
-        config_out = config[section].get('Enabled')
+        config_out = (config[section].get('Enabled') and
+                      config[section].get('Advertise',1))
         if not config_out and section == 'Delivery/SMTP':
-            config_out = config['Delivery/SMTP-Via-Mixmaster'].get("Enabled")
+            config_out = (config['Delivery/SMTP-Via-Mixmaster'].get("Enabled")
+                 and config['Delivery/SMTP-Via-Mixmaster'].get("Advertise", 1))
         if info_out and not config_out:
             warn("%s published, but not enabled.", section)
         if config_out and not info_out: