mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename local variable 'sun' to 'sa' to avoid clash on Sun computers...

Browse Source
This commit is contained in:
Kurt Zeilenga 2000-07-04 17:57:21 +00:00
parent 8be1d467b8
commit 9d1e2ef7e2
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/libldap/os-local.c
View File

@ -111,10 +111,10 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
#else #else
{ {
/* error slippery */ /* error slippery */
struct sockaddr_un sun; struct sockaddr_un sa;
char ch; char ch;
int dummy = sizeof(sun); int dummy = sizeof(sa);
if ( getpeername( s, (struct sockaddr *) &sun, &dummy ) == -1 ) { if ( getpeername( s, (struct sockaddr *) &sa, &dummy ) == -1 ) {
/* XXX: needs to be replace with ber_stream_read() */ /* XXX: needs to be replace with ber_stream_read() */
read(s, &ch, 1); read(s, &ch, 1);
TRACE; TRACE;
@ -128,7 +128,7 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
#undef TRACE #undef TRACE
static int static int
ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sockaddr_un *sun, int async) ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sockaddr_un *sa, int async)
{ {
struct timeval tv, *opt_tv=NULL; struct timeval tv, *opt_tv=NULL;
fd_set wfds, *z=NULL; fd_set wfds, *z=NULL;
@ -144,7 +144,7 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sockaddr_un *sun, int async)
if ( ldap_pvt_ndelay_on(ld, s) == -1 ) if ( ldap_pvt_ndelay_on(ld, s) == -1 )
return ( -1 ); return ( -1 );
if ( connect(s, (struct sockaddr *) sun, sizeof(struct sockaddr_un)) == 0 ) if ( connect(s, (struct sockaddr *) sa, sizeof(struct sockaddr_un)) == 0 )
{ {
if ( ldap_pvt_ndelay_off(ld, s) == -1 ) if ( ldap_pvt_ndelay_off(ld, s) == -1 )
return ( -1 ); return ( -1 );

1
tests/data/slapd-master.conf
View File

@ -7,6 +7,7 @@
include ./schema/core.schema include ./schema/core.schema
include ./schema/cosine.schema include ./schema/cosine.schema
include ./schema/inetorgperson.schema include ./schema/inetorgperson.schema
#include ./schema/nis.schema
schemacheck on schemacheck on
pidfile ./test-db/slapd.pid pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args argsfile ./test-db/slapd.args