Cleanup

[openldap] / servers / slapd / config.c

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index dc9a2748709d5e6fb8890f42dff28f6924c1922f..c491d17c168ab6fcf43cddd1c6fec838ab52ee63 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -33,6 +33,7 @@
 #include <ac/signal.h>
 #include <ac/socket.h>
 #include <ac/errno.h>
+#include <ac/unistd.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -41,10 +42,6 @@
 #define        S_ISREG(m)      (((m) & _S_IFMT) == _S_IFREG)
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include "slap.h"
 #ifdef LDAP_SLAPI
 #include "slapi/slapi.h"
@@ -481,7 +478,7 @@ config_get_vals(ConfigTable *cf, ConfigArgs *c)
                case ARG_INT: bv.bv_len = snprintf(bv.bv_val, sizeof( c->log ), "%d", c->value_int); break;
                case ARG_UINT: bv.bv_len = snprintf(bv.bv_val, sizeof( c->log ), "%u", c->value_uint); break;
                case ARG_LONG: bv.bv_len = snprintf(bv.bv_val, sizeof( c->log ), "%ld", c->value_long); break;
-               case ARG_ULONG: bv.bv_len = snprintf(bv.bv_val, sizeof( c->log ), "%lud", c->value_ulong); break;
+               case ARG_ULONG: bv.bv_len = snprintf(bv.bv_val, sizeof( c->log ), "%lu", c->value_ulong); break;
                case ARG_BER_LEN_T: bv.bv_len = snprintf(bv.bv_val, sizeof( c->log ), "%ld", c->value_ber_t); break;
                case ARG_ON_OFF: bv.bv_len = snprintf(bv.bv_val, sizeof( c->log ), "%s",
                        c->value_int ? "TRUE" : "FALSE"); break;
@@ -2126,3 +2123,66 @@ int config_generic_wrapper( Backend *be, const char *fname, int lineno,
        }
        return rc;
 }
+
+/* See if the given URL (in plain and parsed form) matches
+ * any of the server's listener addresses. Return matching
+ * Listener or NULL for no match.
+ */
+Listener *config_check_my_url( const char *url, LDAPURLDesc *lud )
+{
+       Listener **l = slapd_get_listeners();
+       int i, isMe;
+
+       /* Try a straight compare with Listener strings */
+       for ( i=0; l && l[i]; i++ ) {
+               if ( !strcasecmp( url, l[i]->sl_url.bv_val )) {
+                       return l[i];
+               }
+       }
+
+       isMe = 0;
+       /* If hostname is empty, or is localhost, or matches
+        * our hostname, this url refers to this host.
+        * Compare it against listeners and ports.
+        */
+       if ( !lud->lud_host || !lud->lud_host[0] ||
+               !strncasecmp("localhost", lud->lud_host,
+                       STRLENOF("localhost")) ||
+               !strcasecmp( global_host, lud->lud_host )) {
+
+               for ( i=0; l && l[i]; i++ ) {
+                       LDAPURLDesc *lu2;
+                       ldap_url_parse( l[i]->sl_url.bv_val, &lu2 );
+                       do {
+                               if ( strcasecmp( lud->lud_scheme,
+                                       lu2->lud_scheme ))
+                                       break;
+                               if ( lud->lud_port != lu2->lud_port )
+                                       break;
+                               /* Listener on ANY address */
+                               if ( !lu2->lud_host || !lu2->lud_host[0] ) {
+                                       isMe = 1;
+                                       break;
+                               }
+                               /* URL on ANY address */
+                               if ( !lud->lud_host || !lud->lud_host[0] ) {
+                                       isMe = 1;
+                                       break;
+                               }
+                               /* Listener has specific host, must
+                                * match it
+                                */
+                               if ( !strcasecmp( lud->lud_host,
+                                       lu2->lud_host )) {
+                                       isMe = 1;
+                                       break;
+                               }
+                       } while(0);
+                       ldap_free_urldesc( lu2 );
+                       if ( isMe ) {
+                               return l[i];
+                       }
+               }
+       }
+       return NULL;
+}