X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=make-secnet-sites;h=4d8aacdb9d2b01da078dc4092bbfa21470cd40ff;hb=c9fb510e23e466f2b040c8325ec96fe68b2cb8d4;hp=f90d150dd1b53dc5b9c41d6a4f1fc976c6f8e5ff;hpb=5ceef56b0c983ad69214eff94d36c94c7887d2cc;p=secnet.git

diff --git a/make-secnet-sites b/make-secnet-sites
index f90d150..4d8aacd 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -660,7 +660,21 @@ class sitelevel(level):
 			os.rename(pa+'~tmp',pa+'~update')
 			w.write("peer-keys \"%s\";\n"%pa);
 		else:
-			w.write("key %s;\n"%str(self.properties["pub"].list[0]))
+			use = None
+			indefault = True
+			for k in self.properties["pub"].list:
+				debugrepr('pub write', (use,indefault,k))
+				if isinstance(k,pubkey):
+					if indefault:
+						use = k
+						break
+					if use is None:
+						use = k
+				else:
+					raise RuntimeError('bad '+repr(k))
+			if use is None:
+				complain("site with no public key");
+			w.write("key %s;\n"%str(use))
 		self.output_props(w,ind+2)
 		self.indent(w,ind+2)
 		w.write("link netlink {\n");