X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=make-secnet-sites;h=0c19a78c35815ee11519e98bd6e7131a1b8bcfa3;hb=6d8cd9b228325a1f49a3e50233e4b0fa96c19529;hp=9e0072075a8c69ae3a7cbb865d0d46188b25c7e2;hpb=4a9b680b609b28274a8ae704819f3b59b4e3b4d7;p=secnet.git

diff --git a/make-secnet-sites b/make-secnet-sites
index 9e00720..0c19a78 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -267,7 +267,7 @@ class sitelevel(level):
 	 'networks':None,
 	 'peer':None,
 	 'pubkey':(lambda n,v:"key %s;\n"%v),
-	 'address':None,
+	 'address':(lambda n,v:"address %s;\n"%v),
 	 'mobile':sp,
 	})
 	require_properties={
@@ -333,7 +333,7 @@ def set_property(obj,w):
 def pline(i,allow_include=False):
 	"Process a configuration file line"
 	global allow_defs, obstack, root
-	w=string.split(i)
+	w=string.split(i.rstrip('\n'))
 	if len(w)==0: return
 	keyword=w[0]
 	current=obstack[len(obstack)-1]
@@ -407,7 +407,6 @@ def pfile(name,lines,allow_include=False):
 	for i in lines:
 		line=line+1
 		if (i[0]=='#'): continue
-		if (i[len(i)-1]=='\n'):	i=i[:len(i)-1] # strip trailing LF
 		pline(i,allow_include=allow_include)
 
 def outputsites(w):