diff options
| author |  Thomas Guyot-Sionnest <dermoth@aei.ca>
| 2010-12-23 11:40:20 -0500 |
|---|---|---|
| committer | Thomas Guyot-Sionnest <dermoth@aei.ca>
| 2010-12-23 11:40:20 -0500 |
| commit | a2a279e262ef341b95fe2511d7164cbc60f6b026 (patch) | |
| tree | e34930dcb74009637db00165fd4e39d2203f7233 /plugins/check_ldap.c | |
| parent | c49fed07c3837fb7590bd05d192d6b6f6c4ae5d4 (diff) | |
| download | monitoring-plugins-a2a279e262ef341b95fe2511d7164cbc60f6b026.tar.gz | |
Fix check_ldap overriding the port when --ssl was specified after -p
Diffstat (limited to 'plugins/check_ldap.c')
| -rw-r--r-- | plugins/check_ldap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c index b933ff28..726ffa64 100644 --- a/plugins/check_ldap.c +++ b/plugins/check_ldap.c @@ -58,7 +58,7 @@ char *ld_host = NULL; char *ld_base = NULL; char *ld_passwd = NULL; char *ld_binddn = NULL; -int ld_port = DEFAULT_PORT; +int ld_port = -1; #ifdef HAVE_LDAP_SET_OPTION int ld_protocol = DEFAULT_PROTOCOL; #endif @@ -341,7 +341,8 @@ process_arguments (int argc, char **argv) case 'S': if (! starttls) { ssl_on_connect = TRUE; - ld_port = LDAPS_PORT; + if (ld_port == -1) + ld_port = LDAPS_PORT; } else usage_va(_("%s cannot be combined with %s"), "-S/--ssl", "-T/--starttls"); break; @@ -364,6 +365,9 @@ process_arguments (int argc, char **argv) if (ld_base == NULL && argv[c]) ld_base = strdup (argv[c++]); + if (ld_port == -1) + ld_port = DEFAULT_PORT; + return validate_arguments (); } |