Minor clean-up
Showing
1 changed file
with
2 additions
and
6 deletions
... | @@ -141,7 +141,7 @@ _mu_conn_setup (LDAP **pld) | ... | @@ -141,7 +141,7 @@ _mu_conn_setup (LDAP **pld) |
141 | mu_error (_("DNS SRV: Cannot convert domain=%s into a hostlist"), | 141 | mu_error (_("DNS SRV: Cannot convert domain=%s into a hostlist"), |
142 | domain); | 142 | domain); |
143 | goto dnssrv_free; | 143 | goto dnssrv_free; |
144 | } | 144 | } |
145 | 145 | ||
146 | rc = mu_argcv_get (hostlist, " ", NULL, &hostcnt, &hosts); | 146 | rc = mu_argcv_get (hostlist, " ", NULL, &hostcnt, &hosts); |
147 | if (rc) | 147 | if (rc) |
... | @@ -243,7 +243,7 @@ _mu_conn_setup (LDAP **pld) | ... | @@ -243,7 +243,7 @@ _mu_conn_setup (LDAP **pld) |
243 | } | 243 | } |
244 | free (ldapuri); | 244 | free (ldapuri); |
245 | 245 | ||
246 | if (ldap_param.tls ) | 246 | if (ldap_param.tls) |
247 | { | 247 | { |
248 | rc = ldap_start_tls_s (ld, NULL, NULL); | 248 | rc = ldap_start_tls_s (ld, NULL, NULL); |
249 | if (rc != LDAP_SUCCESS) | 249 | if (rc != LDAP_SUCCESS) |
... | @@ -637,9 +637,6 @@ _mu_ldap_search (LDAP *ld, const char *filter_pat, const char *key, | ... | @@ -637,9 +637,6 @@ _mu_ldap_search (LDAP *ld, const char *filter_pat, const char *key, |
637 | } | 637 | } |
638 | 638 | ||
639 | 639 | ||
640 | #define MATCH(s,p,l) \ | ||
641 | ( | ||
642 | |||
643 | static int | 640 | static int |
644 | my_strncasecmp (const char *p, const char *q, size_t len) | 641 | my_strncasecmp (const char *p, const char *q, size_t len) |
645 | { | 642 | { |
... | @@ -870,7 +867,6 @@ mu_ldap_authenticate (struct mu_auth_data **return_data MU_ARG_UNUSED, | ... | @@ -870,7 +867,6 @@ mu_ldap_authenticate (struct mu_auth_data **return_data MU_ARG_UNUSED, |
870 | } | 867 | } |
871 | } | 868 | } |
872 | 869 | ||
873 | /* FIXME: Support for {algo}octet-string */ | ||
874 | return strcmp (db_pass, pass) == 0 ? 0 : MU_ERR_AUTH_FAILURE; | 870 | return strcmp (db_pass, pass) == 0 ? 0 : MU_ERR_AUTH_FAILURE; |
875 | } | 871 | } |
876 | 872 | ... | ... |
-
Please register or sign in to post a comment