r1235 + don't corrupt port name, if a description was configured

diff --git a/gateways/switchvlans/cisco.connector b/gateways/switchvlans/cisco.connector
index 92f1e190612047d011dd450ea47c771f26d502ad..17010b756ba6ef0c938098cd13d33cab23850cf0 100755 (executable)
--- a/gateways/switchvlans/cisco.connector
+++ b/gateways/switchvlans/cisco.connector
@@ -84,7 +84,7 @@ do_fetch()
        nc $ENDPOINT 23 < $CMDS2 > "$OUT2"
        nc $ENDPOINT 23 < $CMDS3 > "$OUT3"
        cat "$OUT1" | fgrep ' active    ' | sed -E 's/^([[:digit:]]+)[[:space:]]+(.+)[[:space:]]+ active    (.*)/\1=\2/;s/[[:space:]]+$//' > $FILE1
-       cat "$OUT2" | egrep '^(Et|Fa|Gi|Te)' | sed -E 's/ +(notconnect|connected) +/=\1,/;s/,(trunk|([0-9]+)) .*$/,\1/' > $FILE2
+       cat "$OUT2" | egrep '^(Et|Fa|Gi|Te)' | sed -E 's/^([A-Za-z/0-9]+).+(connected|notconnect) +/\1=\2,/;s/,(trunk|([0-9]+)) .*$/,\1/' > $FILE2
        # FIXME
        # Here we need to distinguish between different platforms and IOS version,
        # cause they produce output in different formats.