From 9a0a7f1375ef33849927dabbf32bd6ccf634e565 Mon Sep 17 00:00:00 2001
From: Aaron Johnson <ajohnson@skyfalltech.net>
Date: Sun, 16 Sep 2018 23:38:23 -0500
Subject: [PATCH] Fixed multi-IP bug.

---
 README.md      |  6 ++++--
 tab-sorcery.sh | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index beeb382..6e0ba33 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,13 @@
 # Tab Sorcery
 
-This is still under development and will eventually cover more variables and connection types.
+A helpful script for simplifying connections to servers and devices on your network.
 
 ## To use:
 
 Add the script as a source file in your shell prompt, such as a line similar to this:
-```. $HOME/git/tab-sorcery/tab-sorcery.sh example.com 127.0.0.1 bob.user```
+```
+. $HOME/git/tab-sorcery/tab-sorcery.sh example.com 127.0.0.1 bob.user
+```
 Arguments are:
 ```
 Scan Domain (example.com)
diff --git a/tab-sorcery.sh b/tab-sorcery.sh
index 3ffe0be..a956b8f 100644
--- a/tab-sorcery.sh
+++ b/tab-sorcery.sh
@@ -3,32 +3,33 @@
 # ARGUMENTS:
 # $1 == Domain to scan
 # $2 == Nameserver to do the zone transfer from
+# $3 == Default username for connections
 
 scan_domain=$1
 scan_ns=$2
-user_name=$3
 
 zone_xfer=`dig $scan_domain @$scan_ns AXFR | egrep -v 'SOA|NS|MX|DiG' | grep $scan_domain | awk '{print $1,$4,$5}'`
-for host in `echo $zone_xfer | awk -F. '{print $1}'`; do
+for host in `echo $zone_xfer | awk '{print $1}'`; do
 	user_name=$3
 	connect_cmd="ssh -t"
+	host_short=`echo ${host} | awk -F. '{print $1}'`
 	if echo $zone_xfer | grep $host | grep TXT; then
 		if [ "`echo $zone_xfer | grep $host | grep TXT | awk '{print $3}'`" = '"lxc"' ]; then
 			user_name="root"
-			host_ip=`echo $zone_xfer | grep $host | grep A | awk '{print $3}'`
-			alias ${host}="${connect_cmd} ${user_name}@${host_ip}"
+			host_ip=`echo $zone_xfer | grep ${host} | grep A | awk '{print $3}'`
+			alias ${host_short}="${connect_cmd} ${user_name}@${host_ip}"
 		elif [ "`echo $zone_xfer | grep $host | grep TXT | awk '{print $3}'`" = '"windows"' ]; then
 			connect_cmd="rdesktop -g 1600x900"
-			host_ip=`echo $zone_xfer | grep $host | grep A | awk '{print $3}'`
-			alias ${host}="${connect_cmd} -u ${user_name} ${host_ip}"
+			host_ip=`echo $zone_xfer | grep ${host} | grep A | awk '{print $3}'`
+			alias ${host_short}="${connect_cmd} -u ${user_name} ${host_ip}"
 		elif [ "`echo $zone_xfer | grep $host | grep TXT | awk '{print $3}'`" = '"cisco"' ]; then
 			connect_cmd="telnet"
-			host_ip=`echo $zone_xfer | grep $host | grep A | awk '{print $3}'`
-			alias ${host}="${connect_cmd} ${host_ip}"
+			host_ip=`echo $zone_xfer | grep ${host} | grep A | awk '{print $3}'`
+			alias ${host_short}="${connect_cmd} ${host_ip}"
 		fi
 	else
 		host_ip=`echo $zone_xfer | grep $host | grep A | awk '{print $3}'`
-		alias ${host}="${connect_cmd} ${user_name}@${host_ip}"
+		alias ${host_short}="${connect_cmd} ${user_name}@${host_ip}"
 	fi >/dev/null
 done