* Fix error output

* Update the data files even when not in daemon mode


git-svn-id: https://svn.alkaloid.net/gpl/ldap2dns/trunk@319 06cd67b6-e706-0410-b29e-9de616bca6e9
This commit is contained in:
Ben Klang
2006-06-04 01:45:56 +00:00
parent 610105004f
commit 4761d901cc

View File

@@ -49,7 +49,7 @@ static void print_version(void)
static void die_ldap(int err) static void die_ldap(int err)
{ {
fprintf(stderr, "Fatal error: %s\n", ldap_err2string(err)); fprintf(stderr, "Fatal LDAP error: %s\n", ldap_err2string(err));
exit(1); exit(1);
} }
@@ -1032,7 +1032,7 @@ static int do_connect()
// FIXME: Allow *real* SASL binds // FIXME: Allow *real* SASL binds
if ((res = ldap_sasl_bind_s(ldap_con, options.binddn, NULL, creds, NULL, NULL, &msgid)) != LDAP_SUCCESS) { if ((res = ldap_sasl_bind_s(ldap_con, options.binddn, NULL, creds, NULL, NULL, &msgid)) != LDAP_SUCCESS) {
fprintf(stderr, "LDAP bind problem:\n\t%s\n", ldap_err2string(res)); fprintf(stderr, "LDAP bind problem:\n\t%s\n", ldap_err2string(res));
fprintf(stderr, "Attempting to continue with anonymous credentials."); fprintf(stderr, "Attempting to continue with anonymous credentials.\n");
res = LDAP_SUCCESS; res = LDAP_SUCCESS;
} }
} }
@@ -1064,6 +1064,8 @@ int main(int argc, char** argv)
{ {
int soa_numzones; int soa_numzones;
int soa_checksum; int soa_checksum;
int old_numzones;
int old_checksum;
int res; int res;
umask(022); umask(022);
@@ -1110,18 +1112,17 @@ int main(int argc, char** argv)
sleep(options.update_iv); sleep(options.update_iv);
continue; continue;
} }
if (options.is_daemon) { //if (options.is_daemon) {
int num, sum; calc_checksum(&old_numzones, &old_checksum);
calc_checksum(&num, &sum); if (old_numzones!=soa_numzones || old_checksum!=soa_checksum) {
if (num!=soa_numzones || sum!=soa_checksum) {
if (options.verbose&1) if (options.verbose&1)
printf("DNSserial has changed in LDAP zone(s)\n"); printf("DNSserial has changed in LDAP zone(s)\n");
soa_numzones = num; soa_numzones = old_numzones;
soa_checksum = sum; soa_checksum = old_checksum;
} else { } else {
goto skip; goto skip;
} }
} //}
if (options.ldifname[0]) { if (options.ldifname[0]) {
if (options.ldifname[0]=='-') if (options.ldifname[0]=='-')
ldifout = stdout; ldifout = stdout;