From c8fecfb40e0e65823f3429e0f4787bcef4109c8c Mon Sep 17 00:00:00 2001 From: Stig Thormodsrud Date: Wed, 30 Apr 2008 11:19:18 -0700 Subject: Fix 3139 Check for previous authentication type before allowing another --- .../node.tag/ip/rip/authentication/md5/node.def | 5 ++++- .../rip/authentication/plaintext-password/node.def | 20 ++++++++++---------- .../node.tag/ip/rip/authentication/md5/node.def | 5 ++++- .../rip/authentication/plaintext-password/node.def | 22 ++++++++++++---------- .../node.tag/ip/rip/authentication/md5/node.def | 5 ++++- .../rip/authentication/plaintext-password/node.def | 22 ++++++++++++---------- 6 files changed, 46 insertions(+), 33 deletions(-) (limited to 'templates/interfaces/serial') diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.def index e1819c01..8d165fe6 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.def @@ -1,5 +1,8 @@ tag: type: u32 help: Set MD5 authentication key ID -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255" +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; \ + "ID must be between 1 and 255" +commit:expression: $VAR(../plaintext-password/) == "" ; \ + "plaintext-password already set" diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def index 438d260f..4a7f96b8 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -6,17 +6,17 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ - -c \"ip rip authentication mode text \" \ - -c \"ip rip authentication string $VAR(@) \"; " +update: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ + -c "ip rip authentication mode text" \ + -c "ip rip authentication string $VAR(@)" -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ - -c \"no ip rip authentication mode \" \ - -c \"no ip rip authentication string $VAR(@) \"; " +delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ + -c "no ip rip authentication mode" \ + -c "no ip rip authentication string $VAR(@)" comp_help: possible completions: Plain text password (16 characters or less) diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.def index e1819c01..8d165fe6 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.def @@ -1,5 +1,8 @@ tag: type: u32 help: Set MD5 authentication key ID -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255" +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; \ + "ID must be between 1 and 255" +commit:expression: $VAR(../plaintext-password/) == "" ; \ + "plaintext-password already set" diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def index 1e124e8d..cc83f470 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -6,17 +6,19 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ - -c \"ip rip authentication mode text \" \ - -c \"ip rip authentication string $VAR(@) \"; " +commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ - -c \"no ip rip authentication mode \" \ - -c \"no ip rip authentication string $VAR(@) \"; " +update: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ + -c "ip rip authentication mode text" \ + -c "ip rip authentication string $VAR(@)" + +delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ + -c "no ip rip authentication mode" \ + -c "no ip rip authentication string $VAR(@)" comp_help: possible completions: Plain text password (16 characters or less) diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.def index e1819c01..8d165fe6 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.def @@ -1,5 +1,8 @@ tag: type: u32 help: Set MD5 authentication key ID -syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255" +syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; \ + "ID must be between 1 and 255" +commit:expression: $VAR(../plaintext-password/) == "" ; \ + "plaintext-password already set" diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def index 438d260f..1bc3c650 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -6,17 +6,19 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ - -c \"ip rip authentication mode text \" \ - -c \"ip rip authentication string $VAR(@) \"; " +commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal \" \ - -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ - -c \"no ip rip authentication mode \" \ - -c \"no ip rip authentication string $VAR(@) \"; " +update: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ + -c "ip rip authentication mode text" \ + -c "ip rip authentication string $VAR(@)" + +delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c "configure terminal" \ + -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ + -c "no ip rip authentication mode" \ + -c "no ip rip authentication string $VAR(@)" comp_help: possible completions: Plain text password (16 characters or less) -- cgit v1.2.3