1 files changed, 11 insertions, 7 deletions

diff --git a/bin/cryptonomic-dyndns-command b/bin/cryptonomic-dyndns-command
index dc420d7..8e1cbce 100755
--- a/bin/cryptonomic-dyndns-command
+++ b/bin/cryptonomic-dyndns-command
@@ -9,7 +9,9 @@ sql_string()
 
 powerdns_sqlite_add_replace_record()
 {
-        local sql_new_domain="$(sql_string "$1.$3")"
+        local fqdn="$1.$3"
+        fqdn=${fqdn: -64 : 64}
+        local sql_new_domain="$(sql_string "$fqdn")"
         local sql_ip_address="$(sql_string "$2")"
         local sql_domain="$(sql_string "$3")"
         local record_type="$(sql_string "$4")"
@@ -46,6 +48,10 @@ BEGIN;
                 WHERE name=$sql_domain;
 COMMIT;
 END
+        r=$?
+        [ $r = 0 ] || return $r
+
+        printf '%s %s\n' "$fqdn" "$2"
 }
 
 add()
@@ -57,8 +63,7 @@ add()
                 *) exit 1 ;;
         esac
 
-        powerdns_sqlite_add_replace_record "$1" "$2" "$domain" "$record_type" \
-        && printf '%s %s\n' "$1.$domain $2"
+        powerdns_sqlite_add_replace_record "$1" "$2" "$domain" "$record_type"
 }
 
 main()
@@ -66,16 +71,15 @@ main()
         add "$subdomain" "$ip_address"
 
         set -- $SSH_ORIGINAL_COMMAND
-        while [ $# -ge 2 ]; do
+        while [ $# -ge 1 ]; do
                 d=$1
-                ip=$2
-                shift 2
+                shift
 
                 case "$d" in
                         *.*) continue;;
                 esac
 
-                add "$d.$subdomain" "$ip"
+                add "$d.$subdomain" "$ip_address"
         done
 }