From 1a3dbe38c0f061958ba6a9fad097969d8338604e Mon Sep 17 00:00:00 2001 From: Ben Klang Date: Thu, 24 Jul 2008 19:18:47 +0000 Subject: [PATCH] Fix error messages when a zone is defined with no records git-svn-id: https://svn.alkaloid.net/gpl/ldap2dns/trunk@463 06cd67b6-e706-0410-b29e-9de616bca6e9 --- ldap2dns.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ldap2dns.c b/ldap2dns.c index 8466890..31a5848 100644 --- a/ldap2dns.c +++ b/ldap2dns.c @@ -671,7 +671,7 @@ static void read_resourcerecords(char* dn, int znix) if ( (ldaperr = ldap_search_ext_s(ldap_con, dn, LDAP_SCOPE_SUBTREE, "objectclass=DNSrrset", NULL, 0, NULL, NULL, &options.searchtimeout, options.reclimit, &res))!=LDAP_SUCCESS ) die_ldap(ldaperr); if (ldap_count_entries(ldap_con, res) < 1) { - fprintf(stderr, "[**] Warning: No records returned from search. Check for correct credentials,\n[**] LDAP hostname, and search base DN.\n\n"); + fprintf(stderr, "\n[**] Warning: No DNS records found for domain %s.\n\n", zone.domainname); return; } for (m = ldap_first_entry(ldap_con, res); m; m = ldap_next_entry(ldap_con, m)) { @@ -876,7 +876,7 @@ static void calc_checksum(int* num, int* sum) if ( ldaperr = ldap_search_ext_s(ldap_con, options.searchbase[0] ? options.searchbase : NULL, LDAP_SCOPE_ONELEVEL, "objectclass=DNSzone", attr_list, 0, NULL, NULL, &options.searchtimeout, options.reclimit, &res)!=LDAP_SUCCESS ) die_ldap(ldaperr); if (ldap_count_entries(ldap_con, res) < 1) { - fprintf(stderr, "[**] Warning: No records returned from search. Check for correct credentials,\n[**] LDAP hostname, and search base DN.\n\n"); + fprintf(stderr, "\n[**] Warning: No records returned from search. Check for correct credentials,\n[**] LDAP hostname, and search base DN.\n\n"); return; } @@ -913,7 +913,7 @@ static void read_dnszones(void) if ( (ldaperr = ldap_search_ext_s(ldap_con, options.searchbase[0] ? options.searchbase : NULL, LDAP_SCOPE_SUBTREE, "objectclass=DNSzone", NULL, 0, NULL, NULL, &options.searchtimeout, options.reclimit, &res))!=LDAP_SUCCESS ) die_ldap(ldaperr); if (ldap_count_entries(ldap_con, res) < 1) { - fprintf(stderr, "[**] Warning: No records returned from search. Check for correct credentials,\n[**] LDAP hostname, and search base DN.\n\n"); + fprintf(stderr, "\n[**] Warning: No records returned from search. Check for correct credentials,\n[**] LDAP hostname, and search base DN.\n\n"); return; } for (m = ldap_first_entry(ldap_con, res); m; m = ldap_next_entry(ldap_con, m)) { @@ -1220,13 +1220,13 @@ int main(int argc, char** argv) /* Initialization complete. If we're in daemon mode, fork and continue */ if (options.is_daemon) { + fprintf(stdout, "ldap2dns v%s starting up\n", VERSION); if (options.is_daemon==1 && fork()) { if (options.verbose) fprintf(stdout, "Sending process to background."); exit(0); } - fprintf(stdout, "ldap2dns v%s starting up", VERSION); /* lowest priority */ nice(19); }