Import release 0.1.14

[secnet.git] / make-secnet-sites

diff --git a/make-secnet-sites b/make-secnet-sites
index fb8802863adeaacacb2760a407e18f9d2e778300..682840f1415d2da1b967a5ec81b420f2f128ceb5 100755 (executable)
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -58,7 +58,7 @@ sys.path.append("/usr/local/share/secnet")
 sys.path.append("/usr/share/secnet")
 import ipaddr
 
-VERSION="0.1.9"
+VERSION="0.1.13"
 
 class vpn:
        def __init__(self,name):
@@ -100,12 +100,12 @@ class nets:
                i=sc.intersection(self.set)
                return i.is_empty()
        def out(self):
-               rn=''
-               if (self.w[0]=='restrict-nets'): rn='# '
-               return '%s%s %s;'%(rn,self.w[0],
-                       string.join(map(lambda x:'"%s/%s"'%(x.ip_str(),
+               if (self.w[0]=='restrict-nets'): pattern="# restrict-nets %s;"
+               else:
+                       pattern="link netlink { routes %s; };"
+               return pattern%string.join(map(lambda x:'"%s/%s"'%(x.ip_str(),
                                x.mask.netmask_bits_str),
-                               self.set.as_list_of_networks()),","))
+                               self.set.as_list_of_networks()),",")
 
 class dhgroup:
        def __init__(self,w):
@@ -477,10 +477,10 @@ if service:
        f.close()
        os.rename(groupfiledir+"/T"+group,groupfiledir+"/R"+group)
        f=open(sitesfile+"-tmp",'w')
-       f.write("# sites file autogenerated by make-secnet-sites.py\n")
+       f.write("# sites file autogenerated by make-secnet-sites\n")
        f.write("# generated %s, invoked by %s\n"%
                (time.asctime(time.localtime(time.time())),user))
-       f.write("# use make-secnet-sites.py to turn this file into a\n")
+       f.write("# use make-secnet-sites to turn this file into a\n")
        f.write("# valid /etc/secnet/sites.conf file\n\n")
        for i in headerinput: f.write(i)
        files=os.listdir(groupfiledir)