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

* Catch errors where ldap2dns doesn't know any hosts to connect

Browse Source 
* Clean up usage output


git-svn-id: https://svn.alkaloid.net/gpl/ldap2dns/trunk@317 06cd67b6-e706-0410-b29e-9de616bca6e9
This commit is contained in:
Ben Klang
2006-06-02 21:19:33 +00:00
parent f0d1c5d399
commit 221e666036
1 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
ldap2dns.c
View File

@@ -43,6 +43,7 @@ static void print_version(void)
printf("\n"); printf("\n");
printf(" Released under the terms of the GPL.\n"); printf(" Released under the terms of the GPL.\n");
printf(" http://projects.alkaloid.net\n"); printf(" http://projects.alkaloid.net\n");
printf("\n");
} }
@@ -151,28 +152,30 @@ static void set_datadir(void)
static void print_usage(void) static void print_usage(void)
{ {
print_version(); print_version();
printf("usage: ldap2dns[d] [-D binddn] [-b searchbase] [-o data|db] [-h host] [-p port] [-H hostURI] " printf("usage: ldap2dns[d] [-o data|db] [-h host] [-p port] \\\n");
"[-w password] [-L[filename]] [-u numsecs] [-v[v]] [-V]\n\n"); printf("\t\t[-H hostURI] [-w password] [-L[filename]] [-u numsecs] \\\n");
printf("ldap2dns connects to an LDAP server reads the DNS information stored in objectclasses\n" printf("\t\t[-D binddn] [-b searchbase] [-v[v]] [-V]\n");
"\t\tDNSzone and DNSrrset and writes a file to be used by tinydns or named.\n" printf("\n");
"\t\tldap2dnsd starts as background-job and continouesly updates DNS information.\n"); printf(" *\tldap2dns formats DNS information from an LDAP server for tinydns or BIND\n");
printf(" *\tldap2dnsd runs backgrounded refreshing the data on regular intervals\n");
printf("\n");
printf("options:\n"); printf("options:\n");
printf(" -D binddn\tUse the distinguished name binddn to bind to the LDAP directory\n"); printf(" -D binddn\tUse the distinguished name binddn to bind to the LDAP directory\n");
printf(" -w bindpasswd\tUse bindpasswd as the password for simple authentication\n"); printf(" -w bindpasswd\tUse bindpasswd as the password for simple authentication\n");
printf(" -b Use searchbase as the starting point for the search instead of the default\n"); printf(" -b\t\tSearch base to use instead of default\n");
printf(" -o data\tGenerate a \"data\" file to be processed by tinydns-data\n"); printf(" -o data\tGenerate a tinydns compatible \"data\" file\n");
printf(" -o db\tFor each zone generate a \"<zonename>.db\" file to be used by named\n"); printf(" -o db\t\tGenerate a BIND compatible zone files\n");
printf(" -L[filename] Print output in LDIF format for reimport\n"); printf(" -L [filename]\tPrint output in LDIF format for reimport\n");
printf(" -h host\tHostname of LDAP server, defaults to localhost\n"); printf(" -h host\tHostname of LDAP server, defaults to localhost\n");
printf(" -p port\tPortnumber to connect to LDAP server, defaults to %d\n", LDAP_PORT); printf(" -p port\tPortnumber to connect to LDAP server, defaults to %d\n", LDAP_PORT);
printf(" -H hostURI\tURI (ldap://hostname or ldaps://hostname of LDAP server\n"); printf(" -H hostURI\tURI (ldap://hostname or ldaps://hostname of LDAP server\n");
printf(" -u numsecs\tUpdate DNS data after numsecs. Defaults to %d if started as daemon.\n\t\t" printf(" -u numsecs\tUpdate DNS data after numsecs. Defaults to %d. Daemon mode only\n\t\t", UPDATE_INTERVAL);
"Important notice: data.cdb is rewritten only after DNSserial in DNSzone is increased.\n", printf("\n");
UPDATE_INTERVAL); printf(" -e \"exec-cmd\"\tCommand to execute after data is generated\n");
printf(" -e \"exec-cmd\" This command is executed after ldap2dns regenerated its data files\n"); printf(" -v\t\trun in verbose mode, repeat for more verbosity\n");
printf(" -v\t\trun in verbose mode\n"); printf(" -V\t\tprint version and exit\n\n");
printf(" -vv\t\teven more verbose\n"); printf("\n");
printf(" -V\t\tprint version and exit\n\n"); printf("Note: Zone data are only updated after zone serials increment.\n");
} }
static void parse_hosts(char* buf) static void parse_hosts(char* buf)
@@ -983,9 +986,15 @@ static void read_loccodes(void)
} }
static int connect() static int do_connect()
{ {
int i, version, res; int i, version, res;
if (options.usedhosts < 1) {
fprintf(stderr, "\n[!!] Must define at least one LDAP host with which to connect.\n\n");
print_usage();
exit(1);
}
for (i = 0; i<options.usedhosts; i++) { for (i = 0; i<options.usedhosts; i++) {
if ( strlen(options.urildap[i]) > 0) { if ( strlen(options.urildap[i]) > 0) {
res = ldap_initialize(&ldap_con, options.urildap[i]); res = ldap_initialize(&ldap_con, options.urildap[i]);
@@ -1016,7 +1025,7 @@ static int connect()
} else if (options.verbose&1) { } else if (options.verbose&1) {
printf("Connected to %s:%d as \"%s\"\n", options.hostname[i], options.port[i], options.binddn); printf("Connected to %s:%d as \"%s\"\n", options.hostname[i], options.port[i], options.binddn);
} }
return 0; return res;
} }
} }
} }
@@ -1051,8 +1060,8 @@ int main(int argc, char** argv)
set_datadir(); set_datadir();
for (;;) { for (;;) {
int ldaperr = -1; int ldaperr = -1;
res = connect(); res = do_connect();
if (!res) { if (res != LDAP_SUCCESS || ldap_con == NULL) {
fprintf(stderr, "Warning - Problem while connecting to LDAP server:\n\t%s\n", ldap_err2string(res)); fprintf(stderr, "Warning - Problem while connecting to LDAP server:\n\t%s\n", ldap_err2string(res));
if (options.is_daemon==0) if (options.is_daemon==0)
break; break;