Author: rmeggins
Update of /cvs/dirsec/mod_admserv In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15820
Modified Files: mod_admserv.c Log Message: Resolves: bug 474936 Bug Description: configuring config ds to use ldaps forces user/group ds to use ldaps - console hangs Reviewed by: nkinder (Thanks!) Fix Description: The admin server was not putting the port number in the LDAP URL, so the console was attempting to use the secure port from the config ds with ldap://ughost. The console is already able to parse the :port part of the url. Platforms tested: RHEL5 Flag Day: no Doc impact: no
Index: mod_admserv.c =================================================================== RCS file: /cvs/dirsec/mod_admserv/mod_admserv.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- mod_admserv.c 4 Dec 2008 20:01:45 -0000 1.35 +++ mod_admserv.c 9 Dec 2008 15:23:46 -0000 1.36 @@ -2583,9 +2583,10 @@ ap_set_content_type(r, "text/html");
ap_rprintf(r, "UserDN: %s\n", apr_table_get(r->notes, RQ_NOTES_USERDN)); - ap_rprintf(r, "UserDirectory: ldap%s://%s/%s\n", + ap_rprintf(r, "UserDirectory: ldap%s://%s:%d/%s\n", userGroupServer.secure ? "s" : "", - userGroupServer.host, userGroupServer.baseDN); + userGroupServer.host, userGroupServer.port, + userGroupServer.baseDN); ap_rprintf(r, "ldapHost: %s\n", registryServer.host); ap_rprintf(r, "ldapPort: %d\n", registryServer.port); ap_rprintf(r, "ldapSecurity: %s\n", (registryServer.secure == 1) ? "on" : "off");
389-commits@lists.fedoraproject.org