Bugzilla Bug #606943 - Convert RA to use ldap utilities from

OpenLDAP instead of the Mozldap


git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1823 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

10 files changed, 22 insertions, 228 deletions

diff --git a/pki/base/ra/lib/perl/PKI/RA/AdminPanel.pm b/pki/base/ra/lib/perl/PKI/RA/AdminPanel.pm
index ebf2a0cd9..a5538ef54 100755
--- a/pki/base/ra/lib/perl/PKI/RA/AdminPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/AdminPanel.pm
@@ -157,38 +157,6 @@ sub update
     my $admincert = $response->{Requests}->{Request}->{b64};
     &PKI::RA::Wizard::debug_log("AdminPanel: admincert " . $admincert);
 
-    my $ldap_host = $::config->get("preop.database.host");
-    my $ldap_port = $::config->get("preop.database.port");
-    my $basedn = $::config->get("preop.database.basedn");
-    my $binddn = $::config->get("preop.database.binddn");
-#    my $bindpwd = $::config->get("tokendb.bindPass");
-    my $bindpwd = `grep \"tokendbBindPass:\" \"$instanceDir/conf/password.conf\" | cut -c17-`;
-    $bindpwd =~ s/\n$//g;
-
-    my $tmp = "/tmp/addAgents-$$.ldif";
-
-    my $flavor = "pki";
-    $flavor =~ s/\n//g;
-
-    my $mozldap_path = "/usr/lib/mozldap";
-    my $arch = "";
-    if ($^O eq "linux") {
-        $arch = `uname -i`;
-        $arch =~ s/\n//g;
-        if ($arch eq "x86_64") {
-          $mozldap_path = "/usr/lib64/mozldap";
-        }
-    } elsif ($^O eq "solaris") {
-        $arch=`uname -p`;
-        $arch =~ s/\n//g;
-        if( ( $arch eq "sparc" ) &&
-            ( -d "/usr/lib/sparcv9/" ) ) {
-            $mozldap_path = "/usr/lib/sparcv9/mozldap6";
-        }
-    }
-
-#    $admincert =~ s/\//\\\//g;
-
     # create local database
     my $dbh = DBI->connect(
                 "dbi:SQLite:dbname=$instanceDir/conf/dbfile","","");
@@ -224,15 +192,6 @@ sub update
     $dbh->do($insert);
     $dbh->disconnect();
 
-
-#    system("sed -e 's/\$TOKENDB_ROOT/$basedn/' " .
-#              "-e 's/\$TOKENDB_AGENT_CERT/$admincert/' " .
-#              "/usr/share/$flavor/ra/scripts/addAgents.ldif > $tmp");
-#    system("$mozldap_path/ldapmodify -h '$ldap_host' -p '$ldap_port' -D '$binddn' " .
-#              "-w '$bindpwd' -a " .
-#              "-f '$tmp'");
-    system("rm $tmp");
-
     my $reqid = $response->{Requests}->{Request}->{Id};
     $::config->put("preop.admincert.requestId.0", $reqid);
     my $sn = $response->{Requests}->{Request}->{serialno};
diff --git a/pki/base/ra/lib/perl/PKI/RA/AuthDBPanel.pm b/pki/base/ra/lib/perl/PKI/RA/AuthDBPanel.pm
deleted file mode 100755
index 0be17a388..000000000
--- a/pki/base/ra/lib/perl/PKI/RA/AuthDBPanel.pm
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/usr/bin/perl
-#
-# --- BEGIN COPYRIGHT BLOCK ---
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-#
-#
-#
-#
-
-use strict;
-use warnings;
-use PKI::RA::GlobalVar;
-use PKI::RA::Common;
-
-package PKI::RA::AuthDBPanel;
-$PKI::RA::AuthDBPanel::VERSION = '1.00';
-
-use PKI::RA::BasePanel;
-our @ISA = qw(PKI::RA::BasePanel);
-
-sub new { 
-    my $class = shift;
-    my $self = {}; 
-
-    $self->{"isSubPanel"} = \&is_sub_panel;
-    $self->{"hasSubPanel"} = \&has_sub_panel;
-    $self->{"isPanelDone"} = \&PKI::RA::Common::no;
-    $self->{"getPanelNo"} = &PKI::RA::Common::r(7);
-    $self->{"getName"} = &PKI::RA::Common::r("Authentication Directory");
-    $self->{"vmfile"} = "authdbpanel.vm";
-    $self->{"update"} = \&update;
-    $self->{"panelvars"} = \&display;
-    bless $self,$class; 
-    return $self; 
-}
-
-sub is_sub_panel
-{
-    my ($q) = @_;
-    return 0;
-}
-
-sub has_sub_panel
-{
-    my ($q) = @_;
-    return 0;
-}
-
-sub validate
-{
-    my ($q) = @_;
-    &PKI::RA::Wizard::debug_log("AuthDBPanel: validate");
-    return 1;
-}
-
-sub update
-{
-    my ($q) = @_;
-    &PKI::RA::Wizard::debug_log("AuthDBPanel: update");
-
-    my $host = $q->param('host');
-    my $port = $q->param('port');
-    my $basedn = $q->param('basedn');
-
-    &PKI::RA::Wizard::debug_log("AuthDBPanel: host=" . $host);
-    &PKI::RA::Wizard::debug_log("AuthDBPanel: port=" . $port);
-    &PKI::RA::Wizard::debug_log("AuthDBPanel: basedn=" . $basedn);
-
-    if (!($port =~ /^[0-9]+$/)) {
-      &PKI::RA::Wizard::debug_log("AuthDBPanel: bad port " . $port);
-      $::symbol{errorString} = "Bad Port";
-      return 0;
-    }
-
-    # try to do a ldapsearch
-    my $tmp = "/tmp/file$$";
-    my $mozldap_path = "/usr/lib/mozldap";
-    my $arch = "";
-    if ($^O eq "linux") {
-        $arch = `uname -i`;
-        $arch =~ s/\n//g;
-        if ($arch eq "x86_64") {
-          $mozldap_path = "/usr/lib64/mozldap";
-        }
-    } elsif ($^O eq "solaris") {
-        $arch=`uname -p`;
-        $arch =~ s/\n//g;
-        if( ( $arch eq "sparc" ) &&
-            ( -d "/usr/lib/sparcv9/" ) ) {
-            $mozldap_path = "/usr/lib/sparcv9/mozldap6";
-        }
-    }
-    &PKI::RA::Wizard::debug_log("AuthDBPanel: invoking $mozldap_path/ldapsearch");
-    my $status = system("$mozldap_path/ldapsearch -h '$host' " .
-                     "-p '$port' -b '$basedn' -s base 'objectclass=*' > $tmp 2>&1");
-    if ($status eq "0") {
-     &PKI::RA::Wizard::debug_log("AuthDBPanel: auth database looks ok");
-    } else {
-      my $reason = `cat $tmp`;
-      &PKI::RA::Wizard::debug_log("AuthDBPanel: failed to connect " . $reason);
-      $::symbol{errorString} = "Failed to Connect";
-      return 0;
-    }
-    system("rm $tmp");
-
-    # save values to CS.cfg
-    $::config->put("auth.instance.0.baseDN", $basedn);
-    $::config->put("auth.instance.0.hostport", $host . ":" . $port);
-    $::config->commit();
-
-    return 1;
-}
-
-sub display
-{
-    my ($q) = @_;
-    &PKI::RA::Wizard::debug_log("AuthDBPanel: display");
-
-    my $machineName = $::config->get("service.machineName");
-    my $instanceId = $::config->get("service.instanceID");
-
-    my $basedn = $::config->get("auth.instance.0.baseDN");
-    if ($basedn =~ /\[/) {
-      $basedn = $machineName;    
-      $basedn =~ s/^[^.]+\.//;
-      if ($basedn eq "") {
-        $basedn = "dc=" . $machineName;    
-      } else {
-        $basedn =~ s/\./,dc=/g;
-        $basedn = "dc=" . $basedn;
-      }
-    }
-    my $host = "";
-    my $port = "";
-    my $hostport = $::config->get("auth.instance.0.hostport");
-    if ($hostport =~ /\[/) {
-      $host = "localhost";
-      $port = "389";
-    } else {
-      my ($hostx, $portx) = split(/:/, $hostport);
-      $host = $hostx;
-      $port = $portx;
-    }
-
-    $::symbol{hostname} = $host;
-    $::symbol{portStr} = $port;
-    $::symbol{basedn} = $basedn;
-
-    return 1;
-}
-
-1;
diff --git a/pki/base/ra/lib/perl/PKI/RA/Login.pm b/pki/base/ra/lib/perl/PKI/RA/Login.pm
index 875df1a31..d248e5481 100755
--- a/pki/base/ra/lib/perl/PKI/RA/Login.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/Login.pm
@@ -73,7 +73,6 @@ use PKI::RA::DRMInfoPanel;
 use PKI::RA::DisplayCertChain2Panel;
 use PKI::RA::AdminAuthPanel;
 use PKI::RA::AgentAuthPanel;
-use PKI::RA::AuthDBPanel;
 use PKI::RA::DatabasePanel;
 use PKI::RA::ModulePanel;
 use PKI::RA::SizePanel;
diff --git a/pki/base/ra/lib/perl/PKI/RA/wizard.pm b/pki/base/ra/lib/perl/PKI/RA/wizard.pm
index f7b43e80d..5fe1e7536 100755
--- a/pki/base/ra/lib/perl/PKI/RA/wizard.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/wizard.pm
@@ -71,7 +71,6 @@ use PKI::RA::CAInfoPanel;
 use PKI::RA::DisplayCertChain2Panel;
 use PKI::RA::AdminAuthPanel;
 use PKI::RA::AgentAuthPanel;
-use PKI::RA::AuthDBPanel;
 use PKI::RA::DatabasePanel;
 use PKI::RA::ModulePanel;
 use PKI::RA::SizePanel;
diff --git a/pki/base/ra/setup/registry_instance b/pki/base/ra/setup/registry_instance
index 09ec620cb..64a73197f 100644
--- a/pki/base/ra/setup/registry_instance
+++ b/pki/base/ra/setup/registry_instance
@@ -99,19 +99,18 @@ export httpd
 pki_logs_directory=${PKI_SERVER_ROOT}/logs
 export pki_logs_directory
 
-# see if httpd is linked with the openldap libraries - we need to override them
+# see if httpd is linked with the openldap libraries - we need to override
+# their use of OpenSSL
 if [ ${OS} = "Linux" ]; then
     hasopenldap=0
 
     /usr/bin/ldd ${httpd} 2>&1 | grep libldap- > /dev/null 2>&1 && hasopenldap=1
 
     if [ ${hasopenldap} -eq 1 ] ; then
-        LD_PRELOAD="${PKI_SYSTEM_USER_LIBRARIES}/libldap60.so"
         LD_PRELOAD="${PKI_SYSTEM_USER_LIBRARIES}/libssl3.so:${LD_PRELOAD}"
         export LD_PRELOAD
     fi
 elif [ ${OS} = "SunOS" ]; then
-    LD_PRELOAD_64="${PKI_SYSTEM_USER_LIBRARIES}/libldap60.so"
     LD_PRELOAD_64="${PKI_SYSTEM_USER_LIBRARIES}/dirsec/libssl3.so:${LD_PRELOAD_64}"
     export LD_PRELOAD_64
 fi
diff --git a/pki/dogtag/ra/pki-ra.spec b/pki/dogtag/ra/pki-ra.spec
index e48d21124..c2c8f89af 100644
--- a/pki/dogtag/ra/pki-ra.spec
+++ b/pki/dogtag/ra/pki-ra.spec
@@ -1,6 +1,6 @@
 Name:           pki-ra
 Version:        9.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dogtag Certificate System - Registration Authority
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -15,7 +15,6 @@ BuildRequires:  ant
 Requires:       mod_nss >= 1.0.7
 Requires:       mod_perl >= 1.99_16
 Requires:       mod_revocator >= 1.0.3
-Requires:       mozldap >= 6.0.2
 Requires:       pki-native-tools
 Requires:       pki-ra-ui
 Requires:       pki-selinux
@@ -112,5 +111,10 @@ fi
 %{_localstatedir}/run/*
 
 %changelog
+* Fri Feb 4 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-2
+- Bugzilla Bug #606943 - Convert RA to use ldap utilities from
+  OpenLDAP instead of the Mozldap
+
 * Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
 - Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
+
diff --git a/pki/dogtag/scripts/prepare_ca b/pki/dogtag/scripts/prepare_ca
index b4c61cef7..8d9018aa2 100755
--- a/pki/dogtag/scripts/prepare_ca
+++ b/pki/dogtag/scripts/prepare_ca
@@ -95,9 +95,9 @@ SVRCORE=svrcore
 SVRCORE_DEVEL=svrcore-devel
 CYRUS_SASL=cyrus-sasl
 CYRUS_SASL_DEVEL=cyrus-sasl-devel
-MOZLDAP=mozldap
-MOZLDAP_DEVEL=mozldap-devel
-MOZLDAP_TOOLS=mozldap-tools
+OPENLDAP=openldap
+OPENLDAP_DEVEL=openldap-devel
+OPENLDAP_CLIENTS=openldap-clients
 PERL=perl
 PERL_LIBWWW_PERL=perl-libwww-perl
 PERL_XML_SIMPLE=perl-XML-Simple
@@ -156,5 +156,5 @@ SELINUX_POLICY_DEVEL=selinux-policy-devel
 SELINUX_POLICY_TARGETED=selinux-policy-targeted
 
 # Build and install PKI support packages
-${PKI_SUDO} ${PKI_UPDATE} ${PKI_UPDATE_OPTIONS} ${NSPR} ${NSPR_DEVEL} ${NSS} ${NSS_DEVEL} ${NSS_TOOLS} ${JSS} ${JSS_JAVADOC} ${SVRCORE} ${SVRCORE_DEVEL} ${CYRUS_SASL} ${CYRUS_SASL_DEVEL} ${MOZLDAP} ${MOZLDAP_DEVEL} ${MOZLDAP_TOOLS} ${PERL} ${PERL_LIBWWW_PERL} ${PERL_XML_SIMPLE} ${JPACKAGE_UTILS} ${JAKARTA_COMMONS_LOGGING} ${TOMCAT5_SERVLET_2_4_API} ${JAKARTA_COMMONS_COLLECTIONS} ${JAKARTA_COMMONS_BEANUTILS} ${JAKARTA_COMMONS_DIGESTER} ${ORO} ${CLASSPATHX_JAF} ${LDAPJDK} ${JAKARTA_COMMONS_POOL} ${JAKARTA_COMMONS_FILEUPLOAD} ${XML_COMMONS} ${XML_COMMONS_APIS} ${REGEXP} ${BCEL} ${JAKARTA_COMMONS_DBCP} ${TOMCAT5_JASPER} ${JAKARTA_COMMONS_DISCOVERY} ${JAKARTA_COMMONS_HTTPCLIENT3} ${JMS} ${JAKARTA_COMMONS_LAUNCHER} ${JAKARTA_COMMONS_EL} ${JAKARTA_COMMONS_DAEMON} ${GNU_CRYPTO_SASL_JDK1_4} ${CLASSPATHX_MAIL} ${XERCES_J2} ${XALAN_J2} ${LOG4J} ${XML_COMMONS_RESOLVER} ${AVALON_LOGKIT} ${AVALON_FRAMEWORK} ${JDOM} ${WERKEN_XPATH} ${VELOCITY} ${ANT} ${WSDL4J} ${AXIS} ${MX4J} ${GERONIMO_SPECS} ${JAKARTA_COMMONS_MODELER} ${IDM_CONSOLE_FRAMEWORK} ${TOMCAT5} ${TOMCATJSS} ${MAKE} ${M4} ${POLICYCOREUTILS} ${SELINUX_POLICY_DEVEL} ${SELINUX_POLICY_TARGETED}
+${PKI_SUDO} ${PKI_UPDATE} ${PKI_UPDATE_OPTIONS} ${NSPR} ${NSPR_DEVEL} ${NSS} ${NSS_DEVEL} ${NSS_TOOLS} ${JSS} ${JSS_JAVADOC} ${SVRCORE} ${SVRCORE_DEVEL} ${CYRUS_SASL} ${CYRUS_SASL_DEVEL} ${OPENLDAP} ${OPENLDAP_DEVEL} ${OPENLDAP_CLIENTS} ${PERL} ${PERL_LIBWWW_PERL} ${PERL_XML_SIMPLE} ${JPACKAGE_UTILS} ${JAKARTA_COMMONS_LOGGING} ${TOMCAT5_SERVLET_2_4_API} ${JAKARTA_COMMONS_COLLECTIONS} ${JAKARTA_COMMONS_BEANUTILS} ${JAKARTA_COMMONS_DIGESTER} ${ORO} ${CLASSPATHX_JAF} ${LDAPJDK} ${JAKARTA_COMMONS_POOL} ${JAKARTA_COMMONS_FILEUPLOAD} ${XML_COMMONS} ${XML_COMMONS_APIS} ${REGEXP} ${BCEL} ${JAKARTA_COMMONS_DBCP} ${TOMCAT5_JASPER} ${JAKARTA_COMMONS_DISCOVERY} ${JAKARTA_COMMONS_HTTPCLIENT3} ${JMS} ${JAKARTA_COMMONS_LAUNCHER} ${JAKARTA_COMMONS_EL} ${JAKARTA_COMMONS_DAEMON} ${GNU_CRYPTO_SASL_JDK1_4} ${CLASSPATHX_MAIL} ${XERCES_J2} ${XALAN_J2} ${LOG4J} ${XML_COMMONS_RESOLVER} ${AVALON_LOGKIT} ${AVALON_FRAMEWORK} ${JDOM} ${WERKEN_XPATH} ${VELOCITY} ${ANT} ${WSDL4J} ${AXIS} ${MX4J} ${GERONIMO_SPECS} ${JAKARTA_COMMONS_MODELER} ${IDM_CONSOLE_FRAMEWORK} ${TOMCAT5} ${TOMCATJSS} ${MAKE} ${M4} ${POLICYCOREUTILS} ${SELINUX_POLICY_DEVEL} ${SELINUX_POLICY_TARGETED}
 
diff --git a/pki/dogtag/scripts/prepare_pki b/pki/dogtag/scripts/prepare_pki
index 83c6f4b81..6027e44dd 100755
--- a/pki/dogtag/scripts/prepare_pki
+++ b/pki/dogtag/scripts/prepare_pki
@@ -95,9 +95,9 @@ SVRCORE=svrcore
 SVRCORE_DEVEL=svrcore-devel
 CYRUS_SASL=cyrus-sasl
 CYRUS_SASL_DEVEL=cyrus-sasl-devel
-MOZLDAP=mozldap
-MOZLDAP_DEVEL=mozldap-devel
-MOZLDAP_TOOLS=mozldap-tools
+OPENLDAP=openldap
+OPENLDAP_DEVEL=openldap-devel
+OPENLDAP_CLIENTS=openldap-tools
 PERL=perl
 APR=apr
 PCRE=pcre
@@ -185,5 +185,5 @@ APR_UTIL_DEVEL=apr-util-devel
 HTTPD_DEVEL=httpd-devel
 
 # Build and install PKI support packages
-${PKI_SUDO} ${PKI_UPDATE} ${PKI_UPDATE_OPTIONS} ${NSPR} ${NSPR_DEVEL} ${NSS} ${NSS_DEVEL} ${NSS_TOOLS} ${JSS} ${JSS_JAVADOC} ${SVRCORE} ${SVRCORE_DEVEL} ${CYRUS_SASL} ${CYRUS_SASL_DEVEL} ${MOZLDAP} ${MOZLDAP_DEVEL} ${MOZLDAP_TOOLS} ${PERL} ${APR} ${PCRE} ${EXPAT} ${APR_UTIL} ${HTTPD} ${MOD_NSS} ${MOD_PERL} ${PERL_PARSE_RECDESCENT} ${PERL_HTML_TAGSET} ${PERL_HTML_PARSER} ${PERL_URI} ${PERL_LIBWWW_PERL} ${PERL_XML_PARSER} ${PERL_XML_SIMPLE} ${PERL_XML_NAMESPACESUPPORT} ${PERL_XML_SAX} ${JPACKAGE_UTILS} ${JAKARTA_COMMONS_LOGGING} ${TOMCAT5_SERVLET_2_4_API} ${JAKARTA_COMMONS_COLLECTIONS} ${JAKARTA_COMMONS_BEANUTILS} ${JAKARTA_COMMONS_DIGESTER} ${ORO} ${CLASSPATHX_JAF} ${LDAPJDK} ${JAKARTA_COMMONS_POOL} ${JAKARTA_COMMONS_FILEUPLOAD} ${XML_COMMONS} ${XML_COMMONS_APIS} ${REGEXP} ${BCEL} ${JAKARTA_COMMONS_DBCP} ${TOMCAT5_JASPER} ${JAKARTA_COMMONS_DISCOVERY} ${JAKARTA_COMMONS_HTTPCLIENT3} ${JMS} ${JAKARTA_COMMONS_LAUNCHER} ${JAKARTA_COMMONS_EL} ${JAKARTA_COMMONS_DAEMON} ${GNU_CRYPTO_SASL_JDK1_4} ${CLASSPATHX_MAIL} ${XERCES_J2} ${XALAN_J2} ${LOG4J} ${XML_COMMONS_RESOLVER} ${AVALON_LOGKIT} ${AVALON_FRAMEWORK} ${JDOM} ${WERKEN_XPATH} ${VELOCITY} ${ANT} ${WSDL4J} ${AXIS} ${MX4J} ${GERONIMO_SPECS} ${JAKARTA_COMMONS_MODELER} ${IDM_CONSOLE_FRAMEWORK} ${TOMCAT5} ${TOMCATJSS} ${MAKE} ${M4} ${POLICYCOREUTILS} ${SELINUX_POLICY_DEVEL} ${SELINUX_POLICY_TARGETED} ${READLINE} ${READLINE_DEVEL} ${NCURSES} ${NCURSES_DEVEL} ${TCL} ${TCL_DEVEL} ${SQLITE} ${SQLITE_DEVEL} ${PERL_DBI} ${PERL_DBD_SQLITE} ${PCRE_DEVEL} ${EXPAT_DEVEL} ${APR_DEVEL} ${APR_UTIL_DEVEL} ${HTTPD_DEVEL}
+${PKI_SUDO} ${PKI_UPDATE} ${PKI_UPDATE_OPTIONS} ${NSPR} ${NSPR_DEVEL} ${NSS} ${NSS_DEVEL} ${NSS_TOOLS} ${JSS} ${JSS_JAVADOC} ${SVRCORE} ${SVRCORE_DEVEL} ${CYRUS_SASL} ${CYRUS_SASL_DEVEL} ${OPENLDAP} ${OPENLDAP_DEVEL} ${OPENLDAP_CLIENTS} ${PERL} ${APR} ${PCRE} ${EXPAT} ${APR_UTIL} ${HTTPD} ${MOD_NSS} ${MOD_PERL} ${PERL_PARSE_RECDESCENT} ${PERL_HTML_TAGSET} ${PERL_HTML_PARSER} ${PERL_URI} ${PERL_LIBWWW_PERL} ${PERL_XML_PARSER} ${PERL_XML_SIMPLE} ${PERL_XML_NAMESPACESUPPORT} ${PERL_XML_SAX} ${JPACKAGE_UTILS} ${JAKARTA_COMMONS_LOGGING} ${TOMCAT5_SERVLET_2_4_API} ${JAKARTA_COMMONS_COLLECTIONS} ${JAKARTA_COMMONS_BEANUTILS} ${JAKARTA_COMMONS_DIGESTER} ${ORO} ${CLASSPATHX_JAF} ${LDAPJDK} ${JAKARTA_COMMONS_POOL} ${JAKARTA_COMMONS_FILEUPLOAD} ${XML_COMMONS} ${XML_COMMONS_APIS} ${REGEXP} ${BCEL} ${JAKARTA_COMMONS_DBCP} ${TOMCAT5_JASPER} ${JAKARTA_COMMONS_DISCOVERY} ${JAKARTA_COMMONS_HTTPCLIENT3} ${JMS} ${JAKARTA_COMMONS_LAUNCHER} ${JAKARTA_COMMONS_EL} ${JAKARTA_COMMONS_DAEMON} ${GNU_CRYPTO_SASL_JDK1_4} ${CLASSPATHX_MAIL} ${XERCES_J2} ${XALAN_J2} ${LOG4J} ${XML_COMMONS_RESOLVER} ${AVALON_LOGKIT} ${AVALON_FRAMEWORK} ${JDOM} ${WERKEN_XPATH} ${VELOCITY} ${ANT} ${WSDL4J} ${AXIS} ${MX4J} ${GERONIMO_SPECS} ${JAKARTA_COMMONS_MODELER} ${IDM_CONSOLE_FRAMEWORK} ${TOMCAT5} ${TOMCATJSS} ${MAKE} ${M4} ${POLICYCOREUTILS} ${SELINUX_POLICY_DEVEL} ${SELINUX_POLICY_TARGETED} ${READLINE} ${READLINE_DEVEL} ${NCURSES} ${NCURSES_DEVEL} ${TCL} ${TCL_DEVEL} ${SQLITE} ${SQLITE_DEVEL} ${PERL_DBI} ${PERL_DBD_SQLITE} ${PCRE_DEVEL} ${EXPAT_DEVEL} ${APR_DEVEL} ${APR_UTIL_DEVEL} ${HTTPD_DEVEL}
 
diff --git a/pki/ipa/scripts/prepare_ca b/pki/ipa/scripts/prepare_ca
index b4c61cef7..8d9018aa2 100755
--- a/pki/ipa/scripts/prepare_ca
+++ b/pki/ipa/scripts/prepare_ca
@@ -95,9 +95,9 @@ SVRCORE=svrcore
 SVRCORE_DEVEL=svrcore-devel
 CYRUS_SASL=cyrus-sasl
 CYRUS_SASL_DEVEL=cyrus-sasl-devel
-MOZLDAP=mozldap
-MOZLDAP_DEVEL=mozldap-devel
-MOZLDAP_TOOLS=mozldap-tools
+OPENLDAP=openldap
+OPENLDAP_DEVEL=openldap-devel
+OPENLDAP_CLIENTS=openldap-clients
 PERL=perl
 PERL_LIBWWW_PERL=perl-libwww-perl
 PERL_XML_SIMPLE=perl-XML-Simple
@@ -156,5 +156,5 @@ SELINUX_POLICY_DEVEL=selinux-policy-devel
 SELINUX_POLICY_TARGETED=selinux-policy-targeted
 
 # Build and install PKI support packages
-${PKI_SUDO} ${PKI_UPDATE} ${PKI_UPDATE_OPTIONS} ${NSPR} ${NSPR_DEVEL} ${NSS} ${NSS_DEVEL} ${NSS_TOOLS} ${JSS} ${JSS_JAVADOC} ${SVRCORE} ${SVRCORE_DEVEL} ${CYRUS_SASL} ${CYRUS_SASL_DEVEL} ${MOZLDAP} ${MOZLDAP_DEVEL} ${MOZLDAP_TOOLS} ${PERL} ${PERL_LIBWWW_PERL} ${PERL_XML_SIMPLE} ${JPACKAGE_UTILS} ${JAKARTA_COMMONS_LOGGING} ${TOMCAT5_SERVLET_2_4_API} ${JAKARTA_COMMONS_COLLECTIONS} ${JAKARTA_COMMONS_BEANUTILS} ${JAKARTA_COMMONS_DIGESTER} ${ORO} ${CLASSPATHX_JAF} ${LDAPJDK} ${JAKARTA_COMMONS_POOL} ${JAKARTA_COMMONS_FILEUPLOAD} ${XML_COMMONS} ${XML_COMMONS_APIS} ${REGEXP} ${BCEL} ${JAKARTA_COMMONS_DBCP} ${TOMCAT5_JASPER} ${JAKARTA_COMMONS_DISCOVERY} ${JAKARTA_COMMONS_HTTPCLIENT3} ${JMS} ${JAKARTA_COMMONS_LAUNCHER} ${JAKARTA_COMMONS_EL} ${JAKARTA_COMMONS_DAEMON} ${GNU_CRYPTO_SASL_JDK1_4} ${CLASSPATHX_MAIL} ${XERCES_J2} ${XALAN_J2} ${LOG4J} ${XML_COMMONS_RESOLVER} ${AVALON_LOGKIT} ${AVALON_FRAMEWORK} ${JDOM} ${WERKEN_XPATH} ${VELOCITY} ${ANT} ${WSDL4J} ${AXIS} ${MX4J} ${GERONIMO_SPECS} ${JAKARTA_COMMONS_MODELER} ${IDM_CONSOLE_FRAMEWORK} ${TOMCAT5} ${TOMCATJSS} ${MAKE} ${M4} ${POLICYCOREUTILS} ${SELINUX_POLICY_DEVEL} ${SELINUX_POLICY_TARGETED}
+${PKI_SUDO} ${PKI_UPDATE} ${PKI_UPDATE_OPTIONS} ${NSPR} ${NSPR_DEVEL} ${NSS} ${NSS_DEVEL} ${NSS_TOOLS} ${JSS} ${JSS_JAVADOC} ${SVRCORE} ${SVRCORE_DEVEL} ${CYRUS_SASL} ${CYRUS_SASL_DEVEL} ${OPENLDAP} ${OPENLDAP_DEVEL} ${OPENLDAP_CLIENTS} ${PERL} ${PERL_LIBWWW_PERL} ${PERL_XML_SIMPLE} ${JPACKAGE_UTILS} ${JAKARTA_COMMONS_LOGGING} ${TOMCAT5_SERVLET_2_4_API} ${JAKARTA_COMMONS_COLLECTIONS} ${JAKARTA_COMMONS_BEANUTILS} ${JAKARTA_COMMONS_DIGESTER} ${ORO} ${CLASSPATHX_JAF} ${LDAPJDK} ${JAKARTA_COMMONS_POOL} ${JAKARTA_COMMONS_FILEUPLOAD} ${XML_COMMONS} ${XML_COMMONS_APIS} ${REGEXP} ${BCEL} ${JAKARTA_COMMONS_DBCP} ${TOMCAT5_JASPER} ${JAKARTA_COMMONS_DISCOVERY} ${JAKARTA_COMMONS_HTTPCLIENT3} ${JMS} ${JAKARTA_COMMONS_LAUNCHER} ${JAKARTA_COMMONS_EL} ${JAKARTA_COMMONS_DAEMON} ${GNU_CRYPTO_SASL_JDK1_4} ${CLASSPATHX_MAIL} ${XERCES_J2} ${XALAN_J2} ${LOG4J} ${XML_COMMONS_RESOLVER} ${AVALON_LOGKIT} ${AVALON_FRAMEWORK} ${JDOM} ${WERKEN_XPATH} ${VELOCITY} ${ANT} ${WSDL4J} ${AXIS} ${MX4J} ${GERONIMO_SPECS} ${JAKARTA_COMMONS_MODELER} ${IDM_CONSOLE_FRAMEWORK} ${TOMCAT5} ${TOMCATJSS} ${MAKE} ${M4} ${POLICYCOREUTILS} ${SELINUX_POLICY_DEVEL} ${SELINUX_POLICY_TARGETED}
 
diff --git a/pki/specs/pki-ra.spec b/pki/specs/pki-ra.spec
index 6ffce892f..2b5bae1c2 100644
--- a/pki/specs/pki-ra.spec
+++ b/pki/specs/pki-ra.spec
@@ -17,7 +17,6 @@ BuildRequires:    nss-devel
 Requires:         mod_nss >= 1.0.8
 Requires:         mod_perl >= 1.99_16
 Requires:         mod_revocator >= 1.0.3
-Requires:         mozldap >= 6.0.2
 Requires:         pki-native-tools
 Requires:         pki-ra-theme
 Requires:         pki-selinux
@@ -184,6 +183,8 @@ fi
 - Bugzilla Bug #499494 - change CA defaults to SHA2
 - Bugzilla Bug #656664 - Please Update Spec File to use 'ghost' on files
   in /var/run and /var/lock
+- Bugzilla Bug #606943 - Convert RA to use ldap utilities from
+  OpenLDAP instead of the Mozldap
 
 * Thu Apr 08 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-1
 - Bugzilla Bug #564131 - Config wizard : all subsystems - done panel text