diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2012-02-28 14:14:07 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2012-03-02 00:24:50 +1100 |
| commit | 0c8a10ecb0f5eca08ca58f86c18aa1bae25d1353 (patch) | |
| tree | 1475e7cd436034d15408ffb6caea260d4ad1f592 | |
| parent | 7b8cd6fcf39d047f10fe31be09f74bd1287975a7 (diff) | |
| download | samba-0c8a10ecb0f5eca08ca58f86c18aa1bae25d1353.tar.gz samba-0c8a10ecb0f5eca08ca58f86c18aa1bae25d1353.tar.bz2 samba-0c8a10ecb0f5eca08ca58f86c18aa1bae25d1353.zip | |
dlz_bind9: Fix handling of TXT records with multiple quoted strings
| -rw-r--r-- | source4/dns_server/dlz_bind9.c | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c index 6b38bc31dc..f383e948c5 100644 --- a/source4/dns_server/dlz_bind9.c +++ b/source4/dns_server/dlz_bind9.c @@ -110,6 +110,9 @@ static bool b9_format(struct dlz_bind9_data *state, struct dnsp_DnssrvRpcRecord *rec, const char **type, const char **data) { + uint32_t i; + char *tmp; + switch (rec->wType) { case DNS_TYPE_A: *type = "a"; @@ -128,7 +131,11 @@ static bool b9_format(struct dlz_bind9_data *state, case DNS_TYPE_TXT: *type = "txt"; - *data = rec->data.txt; + tmp = talloc_asprintf(mem_ctx, "\"%s\"", rec->data.txt.str[0]); + for (i=1; i<rec->data.txt.count; i++) { + tmp = talloc_asprintf_append(tmp, " \"%s\"", rec->data.txt.str[i]); + } + *data = tmp; break; case DNS_TYPE_PTR: @@ -271,7 +278,7 @@ static bool b9_parse(struct dlz_bind9_data *state, struct dnsp_DnssrvRpcRecord *rec) { char *full_name, *dclass, *type; - char *str, *saveptr=NULL; + char *str, *tmp, *saveptr=NULL; int i; str = talloc_strdup(rec, rdatastr); @@ -312,7 +319,21 @@ static bool b9_parse(struct dlz_bind9_data *state, break; case DNS_TYPE_TXT: - DNS_PARSE_STR(rec->data.txt, NULL, "\t", saveptr); + rec->data.txt.count = 0; + rec->data.txt.str = talloc_array(rec, const char *, rec->data.txt.count); + tmp = strtok_r(NULL, "\t", &saveptr); + while (tmp) { + rec->data.txt.str = talloc_realloc(rec, rec->data.txt.str, const char *, + rec->data.txt.count+1); + if (tmp[0] == '"') { + /* Strip quotes */ + rec->data.txt.str[rec->data.txt.count] = talloc_strndup(rec, &tmp[1], strlen(tmp)-2); + } else { + rec->data.txt.str[rec->data.txt.count] = talloc_strdup(rec, tmp); + } + rec->data.txt.count++; + tmp = strtok_r(NULL, " ", &saveptr); + } break; case DNS_TYPE_PTR: @@ -1307,6 +1328,9 @@ static bool dns_name_equal(const char *name1, const char *name2) static bool b9_record_match(struct dlz_bind9_data *state, struct dnsp_DnssrvRpcRecord *rec1, struct dnsp_DnssrvRpcRecord *rec2) { + bool status; + int i; + if (rec1->wType != rec2->wType) { return false; } @@ -1324,7 +1348,12 @@ static bool b9_record_match(struct dlz_bind9_data *state, case DNS_TYPE_CNAME: return dns_name_equal(rec1->data.cname, rec2->data.cname); case DNS_TYPE_TXT: - return strcmp(rec1->data.txt, rec2->data.txt) == 0; + status = (rec1->data.txt.count == rec2->data.txt.count); + if (!status) return status; + for (i=0; i<rec1->data.txt.count; i++) { + status &= (strcmp(rec1->data.txt.str[i], rec2->data.txt.str[i]) == 0); + } + return status; case DNS_TYPE_PTR: return strcmp(rec1->data.ptr, rec2->data.ptr) == 0; case DNS_TYPE_NS: |