Merge branch 'master' of git.rlworkman.net:slacknetsetup

1 files changed, 4 insertions, 26 deletions

diff --git a/netconfig b/netconfig
index 7583fdb..bb11b3e 100644
--- a/netconfig
+++ b/netconfig
@@ -461,17 +461,8 @@ EOF
   fi
   HOSTNM="`cat $TMP/SeThost`"
   rm -f $TMP/SeThost $TMP/tempmsg
-  if [ "$HOSTNM" = "" ] || [[ ! "$HOSTNM" =~ ^[[:alnum:]-]+$ ]] || \
-      [ "${HOSTNM:0:1}" == "-" ] || [ "${HOSTNM: -1:1}" == "-" ]; then
-    dialog --title "HOSTNAME" --ok-button "Back" --msgbox \
-        "That doesn't appear to be a valid hostname.\n
-Hostnames can only contain letters, numbers and hyphens,
-and may not begin or end with a hyphen." 7 60
-    if [ $? = 1 -o $? = 255 ]; then
-      exit
-    fi
-  else
-    break
+  if [ ! "$HOSTNM" = "" ]; then
+    break;
   fi
 done
 
@@ -491,21 +482,8 @@ EOF
   fi
   DOMAIN="`cat $TMP/SeTdom`"
   rm -f $TMP/SeTdom $TMP/tempmsg
-  # These regexes doon't catch everything, just basic syntax mistakes.
-  DN="${DOMAIN%.*}"
-  TLD="${DOMAIN##*.}"
-  if [ -z "$DOMAIN" ] || [ -z "$TLD" ] || [ -z "$DN" ] || [[ ! "$DOMAIN" =~ ^[^.-][[:alnum:].-]+[^.-]$ ]] || \
-      [[ ! "$DN" =~ ^[^.-][[:alnum:].-]+[^.-]$ ]] || [[ "$DN" =~ \.\. ]] || [[ "$DN" =~ -- ]] || \
-      [[ ! "$TLD" =~ ^[^-][[:alnum:]-]+[^-]$ ]]; then
-    dialog --title "DOMAINNAME" --ok-button "Back" --msgbox \
-      "That doesn't appear to be a valid domain name.\n
-Domain names can only contain letters and numbers, hyphens
-and dots, and may not begin or end with a hyphen or dot." 7 68
-    if [ $? = 1 -o $? = 255 ]; then
-      exit
-    fi
-  else
-    break
+  if [ ! "$DOMAIN" = "" ]; then
+    break;
   fi
 done