From b5504a1c367fdff51540deead2b13a19665d0b78 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 4 Dec 2001 19:57:09 +0000 Subject: [PATCH] Clean up some misplaced 'extern' declarations (should be headers) --- servers/slapd/connection.c | 3 --- servers/slapd/daemon.c | 1 + servers/slapd/dn.c | 4 ---- servers/slapd/main.c | 6 ++---- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c index ed8659fd8e..88a701c8be 100644 --- a/servers/slapd/connection.c +++ b/servers/slapd/connection.c @@ -20,9 +20,6 @@ #include "lutil.h" #include "slap.h" -/* I guess this should be declared in ldap_pvt.h */ -extern void * ldap_pvt_tls_sb_ctx( Sockbuf *sb ); - /* protected by connections_mutex */ static ldap_pvt_thread_mutex_t connections_mutex; static Connection *connections = NULL; diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c index e9f0a09509..9a71105692 100644 --- a/servers/slapd/daemon.c +++ b/servers/slapd/daemon.c @@ -66,6 +66,7 @@ do { if (w) tcp_write( wake_sds[1], "0", 1 ); } while(0) #ifdef HAVE_NT_SERVICE_MANAGER /* in nt_main.c */ +/* externs are frowned upon, but so is NT :-) */ extern ldap_pvt_thread_cond_t started_event; extern int is_NT_Service; #endif diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c index 780cbb0a50..665600c5c1 100644 --- a/servers/slapd/dn.c +++ b/servers/slapd/dn.c @@ -28,10 +28,6 @@ #define INQUOTEDVALUE 7 #define B4SEPARATOR 8 -/* schema_init.c */ -extern int -dnNormalize( Syntax *syntax, struct berval *val, struct berval **normalized ); - /* * dn_validate - validate and compress dn. the dn is * compressed in place are returned if valid. diff --git a/servers/slapd/main.c b/servers/slapd/main.c index b1beef495d..0411a8d35f 100644 --- a/servers/slapd/main.c +++ b/servers/slapd/main.c @@ -21,9 +21,6 @@ #include "lutil.h" #include "ldif.h" -/* I guess this should be declared in ldap_pvt.h */ -extern int ldap_pvt_tls_init_def_ctx( void ); - #ifdef LDAP_SIGCHLD static RETSIGTYPE wait4child( int sig ); #endif @@ -35,7 +32,8 @@ struct sockaddr_in bind_addr; /* in nt_main.c */ LDAP_LUTIL_V(SERVICE_STATUS) SLAPDServiceStatus; LDAP_LUTIL_V(SERVICE_STATUS_HANDLE) hSLAPDServiceStatus; -extern ldap_pvt_thread_cond_t started_event, stopped_event; +/* externs are frowned upon, but so is NT :-) */ +extern ldap_pvt_thread_cond_t started_event, stopped_event; extern int is_NT_Service; void CommenceStartupProcessing( LPCTSTR serverName, -- 2.39.5