Bug 229280
| Summary: | Add LDAPI (LDAP over unix domain sockets) | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | [Retired] 389 | Reporter: | Bob Lord <blord> | ||||||||
| Component: | Directory Server | Assignee: | Jim Whitehurst <jim> | ||||||||
| Status: | CLOSED CURRENTRELEASE | QA Contact: | Viktor Ashirov <vashirov> | ||||||||
| Severity: | medium | Docs Contact: | |||||||||
| Priority: | medium | ||||||||||
| Version: | 1.0.4 | CC: | nhosoi, rmeggins | ||||||||
| Target Milestone: | --- | ||||||||||
| Target Release: | --- | ||||||||||
| Hardware: | All | ||||||||||
| OS: | All | ||||||||||
| Whiteboard: | |||||||||||
| Fixed In Version: | Doc Type: | Bug Fix | |||||||||
| Doc Text: | Story Points: | --- | |||||||||
| Clone Of: | Environment: | ||||||||||
| Last Closed: | 2015-12-07 16:51:34 UTC | Type: | --- | ||||||||
| Regression: | --- | Mount Type: | --- | ||||||||
| Documentation: | --- | CRM: | |||||||||
| Verified Versions: | Category: | --- | |||||||||
| oVirt Team: | --- | RHEL 7.3 requirements from Atomic Host: | |||||||||
| Cloudforms Team: | --- | Target Upstream Version: | |||||||||
| Embargoed: | |||||||||||
| Bug Depends On: | |||||||||||
| Bug Blocks: | 434914 | ||||||||||
| Attachments: |
|
||||||||||
|
Description
Pete Rowley
2007-02-19 21:54:21 UTC
Created attachment 148370 [details]
Diff to add ldapi
Created attachment 148371 [details]
getsocketpeer.c
Created attachment 148372 [details]
getsocketpeer.h
Cross platform code for OS level authentication is currently defined out (other than linux), I intend to enable that as testing for these platforms progresses. Description of problem:
SSL test started hanging since setting LDAPI to off by default.
The cause of the problem is in the static function setup_pr_read_pds, after
setting SLAPD_POLL_FLAGS, if LDAPI is not on, the code cleaned up the SSL fd...
I guess it's a simple typo. ;)
991 static void
992 setup_pr_read_pds(Connection_Table *ct, PRFileDesc *n_tcps, PRFileDesc *
s_tcps, PRFileDesc *i_unix, PRIntn *num_to_read)
993 {
[...]
1045 /* The fds entry for s_tcps is always FDS_S_TCPS */
1046 if (s_tcps != NULL && accept_new_connections)
1047 {
1048 ct->fd[FDS_S_TCPS].fd = s_tcps;
1049 ct->fd[FDS_S_TCPS].in_flags = SLAPD_POLL_FLAGS;
1050 ct->fd[FDS_S_TCPS].out_flags = 0;
1051 LDAPDebug( LDAP_DEBUG_HOUSE,
1052 "listening for SSL connections on %d\n", socketdesc, 0, 0 );
1053 } else {
1054 ct->fd[FDS_S_TCPS].fd = NULL;
1055 }
1056
1057 #if !defined(_WIN32)
1058 /* The fds entry for i_unix is always FDS_I_UNIX */
1059 if (i_unix != NULL && accept_new_connections)
1060 {
1061 ct->fd[FDS_I_UNIX].fd = i_unix;
1062 ct->fd[FDS_I_UNIX].in_flags = SLAPD_POLL_FLAGS;
1063 ct->fd[FDS_I_UNIX].out_flags = 0;
1064 LDAPDebug( LDAP_DEBUG_HOUSE,
1065 "listening for LDAPI connections on %d\n", socketdesc, 0, 0
);
1066 } else {
1067 ct->fd[FDS_S_TCPS].fd = NULL; <=== override SSL fd
1068 }
This change fixes the problem.
Index: daemon.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/daemon.c,v
retrieving revision 1.12
diff -t -w -U4 -r1.12 daemon.c
--- daemon.c 27 Feb 2007 02:57:30 -0000 1.12
+++ daemon.c 7 Mar 2007 01:02:45 -0000
@@ -1063,9 +1063,9 @@
ct->fd[FDS_I_UNIX].out_flags = 0;
LDAPDebug( LDAP_DEBUG_HOUSE,
"listening for LDAPI connections on %d\n", socketdesc,
0, 0 );
} else {
- ct->fd[FDS_S_TCPS].fd = NULL;
+ ct->fd[FDS_I_UNIX].fd = NULL;
}
Yep, looks like a cut and paste error. The change looks fine to me. Thank you, Nathan, for the review! Checked in into HEAD. Resolves: 229280 Summary: Add LDAPI (LDAP over unix domain sockets) (Comment #5) Change: Fixed a copy & paste error... CVS: ---------------------------------------------------------------------- CVS: Modified Files: CVS: daemon.c CVS: ---------------------------------------------------------------------- Checking in daemon.c; /cvs/dirsec/ldapserver/ldap/servers/slapd/daemon.c,v <-- daemon.c new revision: 1.13; previous revision: 1.12 done *** Bug 219573 has been marked as a duplicate of this bug. *** |