Commit 63bef223 authored by Howard Chu's avatar Howard Chu
Browse files

Cleanup conditional arg in prev commit

parent 726146da
...@@ -367,10 +367,7 @@ Connection * connection_init( ...@@ -367,10 +367,7 @@ Connection * connection_init(
int flags, int flags,
slap_ssf_t ssf, slap_ssf_t ssf,
struct berval *authid struct berval *authid
#ifdef LDAP_PF_LOCAL_SENDMSG LDAP_PF_LOCAL_SENDMSG_ARG(struct berval *peerbv))
, struct berval *peerbv
#endif
)
{ {
unsigned long id; unsigned long id;
Connection *c; Connection *c;
...@@ -1208,10 +1205,7 @@ int connection_client_setup( ...@@ -1208,10 +1205,7 @@ int connection_client_setup(
c = connection_init( s, (Listener *)&dummy_list, "", "", c = connection_init( s, (Listener *)&dummy_list, "", "",
CONN_IS_CLIENT, 0, NULL CONN_IS_CLIENT, 0, NULL
#ifdef LDAP_PF_LOCAL_SENDMSG LDAP_PF_LOCAL_SENDMSG_ARG(NULL));
, NULL
#endif
);
if ( !c ) return -1; if ( !c ) return -1;
c->c_clientfunc = func; c->c_clientfunc = func;
......
...@@ -1829,10 +1829,7 @@ slap_listener( ...@@ -1829,10 +1829,7 @@ slap_listener(
dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN, dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN,
peername, cflag, ssf, peername, cflag, ssf,
authid.bv_val ? &authid : NULL authid.bv_val ? &authid : NULL
#ifdef LDAP_PF_LOCAL_SENDMSG LDAP_PF_LOCAL_SENDMSG_ARG(&peerbv));
, &peerbv
#endif
);
if( authid.bv_val ) ch_free(authid.bv_val); if( authid.bv_val ) ch_free(authid.bv_val);
...@@ -2538,10 +2535,7 @@ connectionless_init( void ) ...@@ -2538,10 +2535,7 @@ connectionless_init( void )
c = connection_init( lr->sl_sd, lr, "", "", c = connection_init( lr->sl_sd, lr, "", "",
CONN_IS_UDP, (slap_ssf_t) 0, NULL CONN_IS_UDP, (slap_ssf_t) 0, NULL
#ifdef LDAP_PF_LOCAL_SENDMSG LDAP_PF_LOCAL_SENDMSG_ARG(NULL));
, NULL
#endif
);
if ( !c ) { if ( !c ) {
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
......
...@@ -685,6 +685,11 @@ LDAP_SLAPD_F (int) connection_client_setup LDAP_P(( ...@@ -685,6 +685,11 @@ LDAP_SLAPD_F (int) connection_client_setup LDAP_P((
LDAP_SLAPD_F (void) connection_client_enable LDAP_P(( ber_socket_t s )); LDAP_SLAPD_F (void) connection_client_enable LDAP_P(( ber_socket_t s ));
LDAP_SLAPD_F (void) connection_client_stop LDAP_P(( ber_socket_t s )); LDAP_SLAPD_F (void) connection_client_stop LDAP_P(( ber_socket_t s ));
#ifdef LDAP_PF_LOCAL_SENDMSG
#define LDAP_PF_LOCAL_SENDMSG_ARG(arg) , arg
#else
#define LDAP_PF_LOCAL_SENDMSG_ARG(arg)
#endif
LDAP_SLAPD_F (Connection *) connection_init LDAP_P(( LDAP_SLAPD_F (Connection *) connection_init LDAP_P((
ber_socket_t s, ber_socket_t s,
...@@ -694,10 +699,7 @@ LDAP_SLAPD_F (Connection *) connection_init LDAP_P(( ...@@ -694,10 +699,7 @@ LDAP_SLAPD_F (Connection *) connection_init LDAP_P((
int use_tls, int use_tls,
slap_ssf_t ssf, slap_ssf_t ssf,
struct berval *id struct berval *id
#ifdef LDAP_PF_LOCAL_SENDMSG LDAP_PF_LOCAL_SENDMSG_ARG(struct berval *peerbv)));
, struct berval *peerbv
#endif
));
LDAP_SLAPD_F (void) connection_closing LDAP_P(( LDAP_SLAPD_F (void) connection_closing LDAP_P((
Connection *c, const char *why )); Connection *c, const char *why ));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment