diff options
| -rw-r--r-- | CHANGES | 8 | ||||
| -rwxr-xr-x | bin/brancid.in | 8 | ||||
| -rwxr-xr-x | bin/do-diffs.in | 4 | ||||
| -rwxr-xr-x | bin/jlogin.in | 8 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 2 |
6 files changed, 22 insertions, 10 deletions
@@ -1,6 +1,14 @@ +2.2b7 + brancid: patch to filter community strings from Mark Cooper + + do-diffs: trap'ing SEGV (11) causes error on solaris. + 2.2b6 baynetworks/nortel support from Mark Cooper. thanks mark! + jlogin was overloading -p's variable causing proc login to fail on 2nd + router on cmd-line + 2.2b5 fix regex error in clogin affecting catalysts diff --git a/bin/brancid.in b/bin/brancid.in index 5614ccc..6beb78f 100755 --- a/bin/brancid.in +++ b/bin/brancid.in @@ -140,8 +140,12 @@ sub ShowConfig { last if (/^$prompt/); next if (/^(\s*|\s*$cmd\s*)$/); next if (/^Reading configuration information/); - return(1) if /(Invalid input detected|Type help or )/; - return(-1) if (/command authorization failed/i); + if (/community label /) { + if (defined($ENV{'NOCOMMSTR'})) { + $_ =~ s/community label .*$/community label <removed>/; + } + } + return(1) if /(invalid command name)/; ProcessHistory("","","","$_"); } # ProcessHistory("","","","!$_"); diff --git a/bin/do-diffs.in b/bin/do-diffs.in index e5d1f62..940203f 100755 --- a/bin/do-diffs.in +++ b/bin/do-diffs.in @@ -69,13 +69,13 @@ END rm -f $TMPDIR/.$GROUP.old else - trap 'rm -fr $LOCKFILE;exit 1' 1 2 3 6 10 11 15 + trap 'rm -fr $LOCKFILE;exit 1' 1 2 3 6 10 15 touch $LOCKFILE if [ $? -eq 0 ] ; then control_rancid $GROUP rm -f $LOCKFILE fi - trap '' 1 2 3 6 10 11 15 + trap '' 1 2 3 6 10 15 fi echo diff --git a/bin/jlogin.in b/bin/jlogin.in index 9ff0626..ee49d31 100755 --- a/bin/jlogin.in +++ b/bin/jlogin.in @@ -95,9 +95,9 @@ for {set i 0} {$i < $argc} {incr i} { # user Password } -p* - -P* { - if {! [ regexp .\[pP\](.+) $arg ignore userpswd]} { + if {! [ regexp .\[pP\](.+) $arg ignore userpasswd]} { incr i - set userpswd [ lindex $argv $i ] + set userpasswd [ lindex $argv $i ] } set do_passwd 0 # passphrase @@ -447,9 +447,9 @@ foreach router [lrange $argv $i end] { } # Figure out loginname's password (if different from the vty password) - if {[info exists userpswd]} { + if {[info exists userpasswd]} { # command line passwd - set passwd $userpswd + set passwd $userpasswd } else { set userpswd [lindex [find userpassword $loginname@$router] 0] if { "$userpswd" == "" } { @@ -792,7 +792,7 @@ PACKAGE=rancid # VERSION needs to be updated such that 'make dist' uses the correct # filename for the directory name and tarball. -VERSION=2.2b6 +VERSION=2.2b7 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 echo "configure:799: checking whether to enable maintainer-specific portions of Makefiles" >&5 diff --git a/configure.in b/configure.in index 8fa0c3c..5bba3f2 100644 --- a/configure.in +++ b/configure.in @@ -14,7 +14,7 @@ PACKAGE=rancid # VERSION needs to be updated such that 'make dist' uses the correct # filename for the directory name and tarball. AC_SUBST(VERSION) -VERSION=2.2b6 +VERSION=2.2b7 AM_MAINTAINER_MODE() |