summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-10-17 16:50:03 +0200
committerGitHub <noreply@github.com>2019-10-17 16:50:03 +0200
commit6a559331538b43d88bafab6463a999fe6052daa2 (patch)
treea43f22dc71f720c07ad79252cb3dd9151ab4d8fb
parentec4c1c035172dc82b26d2befa4c5ab886537661c (diff)
parent716e78fa6d52e873b347180087faa461d7511d80 (diff)
downloadvyatta-cfg-quagga-6a559331538b43d88bafab6463a999fe6052daa2.tar.gz
vyatta-cfg-quagga-6a559331538b43d88bafab6463a999fe6052daa2.zip
Merge pull request #37 from DmitriyEshenko/ospf-virt-link
T1740 Fixed OSPFv2 virtual-link authentication
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def3
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def2
2 files changed, 3 insertions, 2 deletions
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
index 3a5c98de..afaad490 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
@@ -13,7 +13,8 @@ end:expression: "\
vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no area $VAR(../../../../@) \
- virtual-link $VAR(../../../@) message-digest-key $VAR(@)\"; \
+ virtual-link $VAR(../../../@) message-digest-key $VAR(@) \
+ md5 _\"; \
rm /tmp/ospf-md5.$PPID; \
else \
vtysh -c \"configure terminal\" \
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
index 312efb87..e04a2036 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
@@ -4,7 +4,7 @@ commit:expression: $VAR(../plaintext-password/) == "" ; "plaintext-password alre
create: vtysh -c "configure terminal" \
-c "router ospf" \
-c "no area $VAR(../../../@) virtual-link $VAR(../../@) \
- authentication-key" \
+ authentication-key _" \
-c "area $VAR(../../../@) virtual-link $VAR(../../@) \
authentication message-digest";