From 5e7ac922fd95f66ff18931b1297e4a76d811e901 Mon Sep 17 00:00:00 2001 From: Ben Klang Date: Thu, 8 Jun 2006 16:48:46 +0000 Subject: [PATCH] Fix one more Makefile formatting issue Improve debugging support Make SRV records work for BIND outputs git-svn-id: https://svn.alkaloid.net/gpl/ldap2dns/trunk@321 06cd67b6-e706-0410-b29e-9de616bca6e9 --- Makefile | 6 +++--- ldap2dns.c | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c1cdcf4..888e918 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VERSION=0.3.7 RELEASE=0 CC=gcc -O2 -CCDEBUG=gcc -g +CCDEBUG=gcc -g -ggdb CFLAGS=$(INC) -DVERSION='"$(VERSION)"' LIBS=-lldap -llber LD=gcc @@ -36,8 +36,8 @@ ldap2dns: ldap2dns.o ldap2dnsd: ldap2dns ln -f ldap2dns ldap2dnsd -ldap2dns-dbg: ldap2dns.o-dbg $(LIBS) - $(LD) $(LDFLAGS) -o $@ $+ +ldap2dns-dbg: ldap2dns.o-dbg + $(LD) $(LDFLAGS) $(LIBS) -o $@ $+ ldap2dns.o: ldap2dns.c $(CC) $(CFLAGS) -c $< -o $@ diff --git a/ldap2dns.c b/ldap2dns.c index 221bd13..bea6d98 100644 --- a/ldap2dns.c +++ b/ldap2dns.c @@ -492,7 +492,7 @@ static void write_rr(struct resourcerecord* rr, int ipdx, int znix) if (namedzone) fprintf(namedzone, "%s.\tIN TXT\t%s.\n", rr->dnsdomainname, rr->cname); } else if (strcasecmp(rr->type, "SRV")==0) { - if (tinyfile) + if (tinyfile) { fprintf(tinyfile, ":%s:33:\\%03o\\%03o\\%03o\\%03o\\%03o\\%03o", rr->dnsdomainname, rr->dnssrvpriority >> 8, rr->dnssrvpriority & 0xff, rr->dnssrvweight >> 8, rr->dnssrvweight & 0xff, rr->dnssrvport >> 8, rr->dnssrvport & 0xff); tmp = strdup(rr->cname); while (p = strchr(tmp, '.')) { @@ -503,6 +503,10 @@ static void write_rr(struct resourcerecord* rr, int ipdx, int znix) } fprintf(tinyfile, "\\%03o%s", strlen(tmp), tmp); fprintf(tinyfile, "\\000:%s:%s:%s\n", rr->ttl, rr->timestamp, rr->location); + } + if (namedzone) { + fprintf(namedzone, "%s\tIN SRV\t%d\t%d\t%d\t%s.\n", rr->dnsdomainname, rr->dnssrvpriority, rr->dnssrvweight, rr->dnssrvport, rr->cname); + } } }