Mirrors/ldap2dns
1
0
Fork 0
mirror of https://github.com/bklang/ldap2dns.git synced 2025-10-26 22:04:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make sure we check for IPv6 addresses with DNScipaddr too

Browse Source 
git-svn-id: https://svn.alkaloid.net/gpl/ldap2dns/trunk@519 06cd67b6-e706-0410-b29e-9de616bca6e9
This commit is contained in:
Ben Klang
2010-02-18 20:51:06 +00:00
parent ccf2f10a31
commit e29f21085a
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ldap2dns.c
View File

@@ -648,7 +648,11 @@ static void write_rr(struct resourcerecord* rr, int ipdx, int znix)
} else if (strcasecmp(rr->type, "AAAA")==0) {
/* Even though we don't use the result of inet_pton() for BIND,
* we can use it to validate the address. */
res = inet_pton(AF_INET6, rr->ipaddr[0], in6addr);
if (strlen(rr->cipaddr) > 0) {
res = inet_pton(AF_INET6, rr->cipaddr, in6addr);
} else {
res = inet_pton(AF_INET6, rr->ipaddr[0], in6addr);
}
if (res == 1) {
/* Valid IPv6 address found. */
if (tinyfile) {
@@ -780,20 +784,24 @@ static void read_resourcerecords(char* dn, int znix)
unsigned char in6addr[sizeof(struct in6_addr)];
for (ipaddresses = 0; bvals[ipaddresses] && ipaddresses<256; ipaddresses++) {
rr.ipaddr[ipaddresses][0] = '\0';
if (sscanf(bvals[ipaddresses]->bv_val, "%d.%d.%d.%d", &ip[0], &ip[1], &ip[2], &ip[3])==4) {
snprintf(rr.ipaddr[ipaddresses], sizeof(rr.ipaddr[ipaddresses]), "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
if (options.ldifname[0])
fprintf(ldifout, "%s: %s\n", attr, rr.ipaddr[ipaddresses]);
}
if (inet_pton(AF_INET6, bvals[ipaddresses]->bv_val, in6addr)==1) {
snprintf(rr.ipaddr[ipaddresses], sizeof(rr.ipaddr[ipaddresses]), "%s", bvals[ipaddresses]->bv_val);
if (options.ldifname[0])
fprintf(ldifout, "%s: %s\n", attr, rr.ipaddr[ipaddresses]);
} else if (sscanf(bvals[ipaddresses]->bv_val, "%d.%d.%d.%d", &ip[0], &ip[1], &ip[2], &ip[3])==4) {
snprintf(rr.ipaddr[ipaddresses], sizeof(rr.ipaddr[ipaddresses]), "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
if (options.ldifname[0])
fprintf(ldifout, "%s: %s\n", attr, rr.ipaddr[ipaddresses]);
}
}
} else if (strcasecmp(attr, "DNScipaddr")==0) {
int ip[4];
if (sscanf(bvals[0]->bv_val, "%d.%d.%d.%d", &ip[0], &ip[1], &ip[2], &ip[3])==4) {
unsigned char in6addr[sizeof(struct in6_addr)];
if (inet_pton(AF_INET6, bvals[0]->bv_val, in6addr)==1) {
snprintf(rr.cipaddr, sizeof(rr.cipaddr), "%s", bvals[0]->bv_val);
if (options.ldifname[0])
fprintf(ldifout, "%s: %s\n", attr, rr.cipaddr);
} else if (sscanf(bvals[0]->bv_val, "%d.%d.%d.%d", &ip[0], &ip[1], &ip[2], &ip[3])==4) {
snprintf(rr.cipaddr, sizeof(rr.cipaddr), "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
if (options.ldifname[0])
fprintf(ldifout, "%s: %s\n", attr, rr.cipaddr);