Allow A/AAAA records without a weight

abh · Dec 20, 2012 · 381d230 · 381d230
1 parent 2ba7029
commit 381d230
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/config.go b/config.go
@@ -235,14 +235,17 @@ func setupZoneData(data map[string]interface{}, Zone *Zone) {
  rec := records[rType][i].([]interface{})
  ip := rec[0].(string)
  var err error
- switch rec[1].(type) {
- case string:
- record.Weight, err = strconv.Atoi(rec[1].(string))
- if err != nil {
- panic("Error converting weight to integer")
+
+ if len(rec) > 1 {
+ switch rec[1].(type) {
+ case string:
+ record.Weight, err = strconv.Atoi(rec[1].(string))
+ if err != nil {
+ panic("Error converting weight to integer")
+ }
+ case float64:
+ record.Weight = int(rec[1].(float64))
  }
- case float64:
- record.Weight = int(rec[1].(float64))
  }
  switch dnsType {
  case dns.TypeA:

diff --git a/dns/test.example.com.json b/dns/test.example.com.json
@@ -19,7 +19,7 @@
  "max_hosts": "1"
  },
  "bar": { 
- "a": [ [ "192.168.1.2", 10 ] ],
+ "a": [ [ "192.168.1.2" ] ],
  "ttl": "601"
  },
  "bar.no": { "a": [] },