r2306 - forward-port the change to trunk

diff --git a/ChangeLog b/ChangeLog
index 031c487..0825b59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
        update: combined two forms on object properties page into one.  closes tickets 36 and 87 (by Aaron)
        bugfix: show error message if snmp module isn't loaded.  closes ticket 43 (by Aaron)
        bugfix: show error message for duplicate IPv4 network record
+       update: enable username handling in Cisco switch connector
 0.16.4 2008-11-04
        bugfix: display VS/RS config block in RS pool view
        bugfix: resolve tabindex issues in many forms

diff --git a/gateways/switchvlans/cisco.connector b/gateways/switchvlans/cisco.connector
index fd9b074..c1bb0d2 100755 (executable)
--- a/gateways/switchvlans/cisco.connector
+++ b/gateways/switchvlans/cisco.connector
@@ -47,7 +47,9 @@ prepare_connect_commands()
                        # Don't be too smart at the moment, just be able to handle
                        # the known-good case ;-)
 
-                       echo $line | cut -s -d' ' -f6 > $CMDS1
+                       username=`echo $line | cut -s -d' ' -f5`
+                       [ "$username" != "-" ] && echo $username > $CMDS1
+                       echo $line | cut -s -d' ' -f6 >> $CMDS1
                        echo en >> $CMDS1
                        echo $line | cut -s -d' ' -f7 >> $CMDS1
                        # same for ports

diff --git a/gateways/switchvlans/cisco.secrets.php-sample b/gateways/switchvlans/cisco.secrets.php-sample
index 6ffd081..454263e 100644 (file)
--- a/gateways/switchvlans/cisco.secrets.php-sample
+++ b/gateways/switchvlans/cisco.secrets.php-sample
@@ -8,6 +8,7 @@ exit();
 # S-T-A-R-T
 switch1 telnet - - - password2 enablepassword
 switch2 telnet - - - password enablepassword
+switch3 telnet - - username3 password3 enablepassword3
 # S-T-O-P
 
 ?>