upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 16:19:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

apply FreeBSD changes to main branch

Browse source
This commit is contained in:
Kurt Zeilenga 1998-08-09 01:35:58 +00:00
commit df38bf83e8
9 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/man/man3/ldap_modrdn.3.links
View file

@ -1,3 +1,3 @@
ldap_modrdn_s ldap_modrdn_s.3
ldap_modrdn2 ldap_modrdn2.3
ldap_modrdn2_s ldap_modrdn2_s.3

2
libraries/liblber/decode.c
View file

@ -20,7 +20,9 @@
#if defined(NeXT) || defined(VMS) #if defined(NeXT) || defined(VMS)
#include <stdlib.h> #include <stdlib.h>
#else /* next || vms */ #else /* next || vms */
#ifndef __FreeBSD__
#include <malloc.h> #include <malloc.h>
#endif
#endif /* next || vms */ #endif /* next || vms */
#if defined(BC31) || defined(_WIN32) #if defined(BC31) || defined(_WIN32)
#include <stdarg.h> #include <stdarg.h>

2
libraries/liblber/encode.c
View file

@ -20,7 +20,9 @@
#if defined(NeXT) || defined(VMS) #if defined(NeXT) || defined(VMS)
#include <stdlib.h> #include <stdlib.h>
#else /* next || vms */ #else /* next || vms */
#ifndef __FreeBSD__
#include <malloc.h> #include <malloc.h>
#endif
#endif /* next || vms */ #endif /* next || vms */
#if defined( BC31 ) || defined( _WIN32 ) #if defined( BC31 ) || defined( _WIN32 )
#include <stdarg.h> #include <stdarg.h>

2
libraries/liblber/io.c
View file

@ -25,7 +25,9 @@
#if defined(NeXT) || defined(VMS) #if defined(NeXT) || defined(VMS)
#include <stdlib.h> #include <stdlib.h>
#else /* next || vms */ #else /* next || vms */
#ifndef __FreeBSD__
#include <malloc.h> #include <malloc.h>
#endif
#endif /* next || vms */ #endif /* next || vms */
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>

8
servers/slapd/backend.c
View file

@ -150,6 +150,14 @@ select_backend( char * dn )
for ( i = 0; i < nbackends; i++ ) { for ( i = 0; i < nbackends; i++ ) {
for ( j = 0; backends[i].be_suffix != NULL && for ( j = 0; backends[i].be_suffix != NULL &&
backends[i].be_suffix[j] != NULL; j++ ) { 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] ); len = strlen( backends[i].be_suffix[j] );
if ( len > dnlen ) { if ( len > dnlen ) {

9
servers/slapd/daemon.c
View file

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

3
servers/slapd/regex.c
View file

@ -20,9 +20,8 @@
* see Henry Spencer's regexp routines, or GNU Emacs pattern * see Henry Spencer's regexp routines, or GNU Emacs pattern
* matching module. * matching module.
* *
* Modification history: * Vendor Modification history:
* *
* $Log: regex.c,v $
* Revision 1.2 1996/04/25 16:24:11 mcs * Revision 1.2 1996/04/25 16:24:11 mcs
* make re_exec() match "" with ".*" and similar patterns * make re_exec() match "" with ".*" and similar patterns
* hopefully this change doesn't break anything else! * hopefully this change doesn't break anything else!

2
servers/slurpd/re.c
View file

@ -31,7 +31,9 @@
extern char *str_getline( char **next ); extern char *str_getline( char **next );
extern void ch_free( char *p ); extern void ch_free( char *p );
#if !(defined(BSD) && (BSD >= 199306))
extern char *sys_errlist[]; extern char *sys_errlist[];
#endif
/* Forward references */ /* Forward references */
static Rh *get_repl_hosts( char *, int *, char ** ); static Rh *get_repl_hosts( char *, int *, char ** );

4
servers/slurpd/rq.c
View file

@ -44,9 +44,9 @@ extern void Re_dump( Re *re );
extern void Re_dump(); extern void Re_dump();
#endif /* NEEDPROTOS */ #endif /* NEEDPROTOS */
#if !(defined(BSD) && (BSD >= 199306))
extern char *sys_errlist[]; extern char *sys_errlist[];
#endif
/* /*
* Lock the replication queue. * Lock the replication queue.