X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=make-secnet-sites;h=5f271e3bc80731c27fe112d6b2c7c62191ae2bbc;hb=14f78812a935c8f050f12112c19f359eb12f0686;hp=7747c23254c90b9bb4e4023b9851c81318dcdfec;hpb=9c6a8729f6553615786878b382d4d44d2a54eec0;p=secnet.git

diff --git a/make-secnet-sites b/make-secnet-sites
index 7747c23..5f271e3 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -267,7 +267,6 @@ class sitelevel(level):
 	 'networks':None,
 	 'peer':None,
 	 'pubkey':(lambda n,v:"key %s;\n"%v),
-	 'address':(lambda n,v:"address %s;\n"%v),
 	 'mobile':sp,
 	})
 	require_properties={
@@ -381,13 +380,16 @@ def pline(i,allow_include=False):
 			current=nl
 		obstack.append(current)
 		return [i]
-	if current.allow_properties.has_key(keyword):
-		set_property(current,w)
-		return [i]
-	else:
+	if not current.allow_properties.has_key(keyword):
 		complain("Property %s not allowed at %s level"%
 			(keyword,current.type))
 		return []
+	elif current.depth == vpnlevel.depth < allow_defs:
+		complain("Not allowed to set VPN properties here")
+		return []
+	else:
+		set_property(current,w)
+		return [i]
 
 	complain("unknown keyword '%s'"%(keyword))