Import of FreeBSD LDAP 3.3 Port

diff --git a/Make-common b/Make-common
index 32683c7652d35b60ecd15a31077b643752b8a6ed..405842cc4fa9a0aedce8443db9ed3654cbabafbb 100644 (file)
--- a/Make-common
+++ b/Make-common
@@ -28,8 +28,9 @@
 # man pages are put under MANDIR
 # programs end-users will run are put in BINDIR
 #
-INSTROOT=/usr/local
-ETCDIR= $(INSTROOT)/etc
+PREFIX?=/usr/local
+INSTROOT=${PREFIX}
+ETCDIR= $(INSTROOT)/etc/ldap
 INCLUDEDIR= $(INSTROOT)/include
 LIBDIR= $(INSTROOT)/lib
 MANDIR= $(INSTROOT)/man
@@ -45,6 +46,7 @@ RUNTIMEETCDIR= $(ETCDIR)
 #############################################################################
 # Passed to every compile (cc or gcc).  This is where you put -O or -g, etc.
 #EXTRACFLAGS=-g
+EXTRACFLAGS=-O
 # Passed to every link (ld).  Include -g here if you did in EXTRACFLAGS.
 #EXTRALDFLAGS=-g
 
@@ -122,8 +124,8 @@ SLAPD_BACKENDS= -DLDAP_LDBM -DLDAP_SHELL -DLDAP_PASSWD
 # four choices: Berkeley db b-tree, Berkeley db hash, GNU dbm, or ndbm.
 #
 # berkeley db btree package
-#LDBMBACKEND=-DLDBM_USE_DBBTREE
-#LDBMINCLUDE=-I/usr/local/db/include
+LDBMBACKEND=-DLDBM_USE_DBBTREE
+LDBMINCLUDE=-I/usr/include
 #LDBMLIB=-ldb
 # berkeley db hash package
 #LDBMBACKEND=-DLDBM_USE_DBHASH
@@ -134,7 +136,7 @@ SLAPD_BACKENDS= -DLDAP_LDBM -DLDAP_SHELL -DLDAP_PASSWD
 #LDBMINCLUDE=-I/usr/local/gdbm/include
 #LDBMLIB=-lgdbm
 # standard unix ndbm
-LDBMBACKEND=-DLDBM_USE_NDBM
+#LDBMBACKEND=-DLDBM_USE_NDBM
 #
 # if you want to use a non-default threads package change these lines
 #THREADS=-DNO_THREADS

diff --git a/doc/man/man1/Make-template b/doc/man/man1/Make-template
index dfc4a5136970ddf2ea65c7e4f67d0690f5c0adb8..5b7a9206ad27bd64759c6131f3beaebec5542eb0 100644 (file)
--- a/doc/man/man1/Make-template
+++ b/doc/man/man1/Make-template
@@ -31,10 +31,8 @@ install:     FORCE
            $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \
            if [ -f "$$page.links" ]; then \
                for link in `$(CAT) $$page.links`; do \
-                   echo ".so man$(SECT)/$$page" > $$TMPMAN; \
                    echo "installing $(INSTDIR)/$$link as link to $$page"; \
-                   $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN \
-                           $(INSTDIR)/$$link; \
+                   ln -sf $$page.gz $(INSTDIR)/$$link.gz; \
                done; \
            fi; \
        done; \

diff --git a/doc/man/man3/Make-template b/doc/man/man3/Make-template
index 6e153f694f30e71b4e604ebb4d3d90282dc70c76..a91cb2efbe0be77499bc9ae436a53a78a2e87a52 100644 (file)
--- a/doc/man/man3/Make-template
+++ b/doc/man/man3/Make-template
@@ -31,10 +31,8 @@ install:     FORCE
            $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \
            if [ -f "$$page.links" ]; then \
                for link in `$(CAT) $$page.links`; do \
-                   echo ".so man$(SECT)/$$page" > $$TMPMAN; \
                    echo "installing $(INSTDIR)/$$link as link to $$page"; \
-                   $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN \
-                           $(INSTDIR)/$$link; \
+                   ln -sf $$page.gz $(INSTDIR)/$$link.gz; \
                done; \
            fi; \
        done; \

diff --git a/doc/man/man3/ldap_modrdn.3.links b/doc/man/man3/ldap_modrdn.3.links
index 67607878ad695c015addf96fabf08effd810b5f8..86063e271dbdc34432e20bffd4950e0c2ebbadf7 100644 (file)
--- a/doc/man/man3/ldap_modrdn.3.links
+++ b/doc/man/man3/ldap_modrdn.3.links
@@ -1,3 +1,3 @@
-ldap_modrdn_s
-ldap_modrdn2
-ldap_modrdn2_s
+ldap_modrdn_s.3
+ldap_modrdn2.3
+ldap_modrdn2_s.3

diff --git a/doc/man/man5/Make-template b/doc/man/man5/Make-template
index 3d2d5544bf2259fa1c76505741526f89a84ae044..828df9b871dfb381f030c2db7dc45a291f112661 100644 (file)
--- a/doc/man/man5/Make-template
+++ b/doc/man/man5/Make-template
@@ -31,10 +31,8 @@ install:     FORCE
            $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \
            if [ -f "$$page.links" ]; then \
                for link in `$(CAT) $$page.links`; do \
-                   echo ".so man$(SECT)/$$page" > $$TMPMAN; \
                    echo "installing $(INSTDIR)/$$link as link to $$page"; \
-                   $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN \
-                           $(INSTDIR)/$$link; \
+                   ln -sf $$page.gz $(INSTDIR)/$$link.gz; \
                done; \
            fi; \
        done; \

diff --git a/doc/man/man8/Make-template b/doc/man/man8/Make-template
index 55899f5274d1e0c909a8ab56dec127e157a6716b..d256bf57921d94440f0407f793a706964023c82e 100644 (file)
--- a/doc/man/man8/Make-template
+++ b/doc/man/man8/Make-template
@@ -31,10 +31,8 @@ install:     FORCE
            $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \
            if [ -f "$$page.links" ]; then \
                for link in `$(CAT) $$page.links`; do \
-                   echo ".so man$(SECT)/$$page" > $$TMPMAN; \
                    echo "installing $(INSTDIR)/$$link as link to $$page"; \
-                   $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN \
-                           $(INSTDIR)/$$link; \
+                   ln -sf $$page.gz $(INSTDIR)/$$link.gz; \
                done; \
            fi; \
        done; \

diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c
index a722c9eb7a319a12ad027c85310c1d9c6264ccb4..83242a02a875e23301d60ba6b423044c2acba92a 100644 (file)
--- a/libraries/liblber/decode.c
+++ b/libraries/liblber/decode.c
@@ -20,7 +20,9 @@
 #if defined(NeXT) || defined(VMS)
 #include <stdlib.h>
 #else /* next || vms */
+#ifndef __FreeBSD__
 #include <malloc.h>
+#endif
 #endif /* next || vms */
 #if defined(BC31) || defined(_WIN32)
 #include <stdarg.h>

diff --git a/libraries/liblber/encode.c b/libraries/liblber/encode.c
index cd95f8932b2633341fd0049c72f9f1a223b36378..d6b1304d2590ba5461157ef7546ad188a2034e6c 100644 (file)
--- a/libraries/liblber/encode.c
+++ b/libraries/liblber/encode.c
@@ -20,7 +20,9 @@
 #if defined(NeXT) || defined(VMS)
 #include <stdlib.h>
 #else /* next || vms */
+#ifndef __FreeBSD__
 #include <malloc.h>
+#endif
 #endif /* next || vms */
 #if defined( BC31 ) || defined( _WIN32 )
 #include <stdarg.h>

diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index 081f386794a6a08b2ed5ca4225bf200556ca7a4f..99cc2f3999e1f777b2f6753605d7228f45e70f8f 100644 (file)
--- a/libraries/liblber/io.c
+++ b/libraries/liblber/io.c
@@ -25,7 +25,9 @@
 #if defined(NeXT) || defined(VMS)
 #include <stdlib.h>
 #else /* next || vms */
+#ifndef __FreeBSD__
 #include <malloc.h>
+#endif
 #endif /* next || vms */
 #include <errno.h>
 #include <sys/types.h>

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 998bfa8c6acc215d0e6a1240cb494210580d55a1..8131b90b77f570f52a3c578038aca9bd35de2fa7 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -150,6 +150,14 @@ select_backend( char * dn )
        for ( i = 0; i < nbackends; i++ ) {
                for ( j = 0; backends[i].be_suffix != NULL &&
                    backends[i].be_suffix[j] != NULL; j++ ) {
+                       /* Add greg@greg.rim.or.jp
+                        * It's quick hack for cheep client
+                        * Some browser offer a NULL base at ldap_search
+                        */
+                       if(dnlen == 0) {
+                               Debug( LDAP_DEBUG_TRACE, "select_backend: use default backend\n", 0, 0, 0 );
+                               return (&backends[i]);
+                       }
                        len = strlen( backends[i].be_suffix[j] );
 
                        if ( len > dnlen ) {

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 161fb79cf0e2bf6ce67b05be0ff4d7efba0a67ab..863ca497d322f7102c71c021939e724df3424aeb 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -68,7 +68,12 @@ daemon(
 #else /* USE_SYSCONF */
         dtblsize = getdtablesize();
 #endif /* USE_SYSCONF */
-
+       /*
+        * Add greg@greg.rim.or.jp
+        */
+       if(dtblsize > FD_SETSIZE) {
+               dtblsize = FD_SETSIZE;
+       }
        c = (Connection *) ch_calloc( 1, dtblsize * sizeof(Connection) );
 
        for ( i = 0; i < dtblsize; i++ ) {
@@ -130,6 +135,7 @@ daemon(
        (void) SIGNAL( SIGUSR1, (void *) do_nothing );
        (void) SIGNAL( SIGUSR2, (void *) set_shutdown );
        (void) SIGNAL( SIGTERM, (void *) set_shutdown );
+       (void) SIGNAL( SIGINT, (void *) set_shutdown );
        (void) SIGNAL( SIGHUP, (void *) set_shutdown );
 
        Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
@@ -352,6 +358,7 @@ set_shutdown()
        pthread_kill( listener_tid, SIGUSR1 );
        (void) SIGNAL( SIGUSR2, (void *) set_shutdown );
        (void) SIGNAL( SIGTERM, (void *) set_shutdown );
+       (void) SIGNAL( SIGINT, (void *) set_shutdown );
        (void) SIGNAL( SIGHUP, (void *) set_shutdown );
 }
 

diff --git a/servers/slurpd/re.c b/servers/slurpd/re.c
index 4a6dc382377247c1da34ff330d9170a69c274e01..28d1d09b58832841a0ee00723392bdc6842ebf49 100644 (file)
--- a/servers/slurpd/re.c
+++ b/servers/slurpd/re.c
@@ -31,7 +31,9 @@
 extern char *str_getline( char **next );
 extern void ch_free( char *p );
 
+#if !(defined(BSD) && (BSD >= 199306))
 extern char *sys_errlist[];
+#endif
 
 /* Forward references */
 static Rh      *get_repl_hosts( char *, int *, char ** );

diff --git a/servers/slurpd/rq.c b/servers/slurpd/rq.c
index 54adb4da1af77e4fd26db6da62d375ea781e94c6..2745d4fe782ecd7e34d5feb93fa81494709a9e5e 100644 (file)
--- a/servers/slurpd/rq.c
+++ b/servers/slurpd/rq.c
@@ -44,9 +44,9 @@ extern void Re_dump( Re *re );
 extern void Re_dump();
 #endif /* NEEDPROTOS */
 
-
+#if !(defined(BSD) && (BSD >= 199306))
 extern char *sys_errlist[];
-
+#endif
 
 /*
  * Lock the replication queue.