diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2006-11-26 22:36:28 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2006-11-26 22:36:28 +0000 |
| commit | 7f989d4eb1b40593348d95510d12dd0015d66356 (patch) | |
| tree | a602b45f928261e6e995d986f0bc301c9d8e9493 /server/ldap-nss.c | |
| parent | 16be7ee5d30c8bce08f32563c4fa846a6928aed4 (diff) | |
clean up header files
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/libnss_ldapd@125 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'server/ldap-nss.c')
| -rw-r--r-- | server/ldap-nss.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/server/ldap-nss.c b/server/ldap-nss.c index ee0538d..0267aea 100644 --- a/server/ldap-nss.c +++ b/server/ldap-nss.c @@ -117,6 +117,11 @@ extern int ldap_ld_free (LDAP * ld, int close); NSS_LDAP_DEFINE_LOCK (__lock); /* + * LS_INIT only used for enumeration contexts + */ +#define LS_INIT(state) do { state.ls_type = LS_TYPE_INDEX; state.ls_retry = 0; state.ls_info.ls_index = -1; } while (0) + +/* * the configuration is read by the first call to do_open(). * Pointers to elements of the list are passed around but should not * be freed. @@ -712,8 +717,8 @@ do_set_sockopts (void) #endif /* LDAP_OPT_DESC */ { int off = 0; - NSS_LDAP_SOCKLEN_T socknamelen = sizeof (struct sockaddr_storage); - NSS_LDAP_SOCKLEN_T peernamelen = sizeof (struct sockaddr_storage); + socklen_t socknamelen = sizeof (struct sockaddr_storage); + socklen_t peernamelen = sizeof (struct sockaddr_storage); (void) setsockopt (sd, SOL_SOCKET, SO_KEEPALIVE, (void *) &off, sizeof (off)); @@ -778,9 +783,9 @@ do_close (void) static int do_sockaddr_isequal (struct sockaddr_storage *_s1, - NSS_LDAP_SOCKLEN_T _slen1, + socklen_t _slen1, struct sockaddr_storage *_s2, - NSS_LDAP_SOCKLEN_T _slen2) + socklen_t _slen2) { int ret; @@ -856,8 +861,8 @@ do_get_our_socket(int *sd) { struct sockaddr_storage sockname; struct sockaddr_storage peername; - NSS_LDAP_SOCKLEN_T socknamelen = sizeof (sockname); - NSS_LDAP_SOCKLEN_T peernamelen = sizeof (peername); + socklen_t socknamelen = sizeof (sockname); + socklen_t peernamelen = sizeof (peername); if (getsockname (*sd, (struct sockaddr *) &sockname, &socknamelen) != 0 || getpeername (*sd, (struct sockaddr *) &peername, &peernamelen) != 0) |