diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-02-04 23:13:11 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-02-04 23:13:11 +0000 |
| commit | 21aa7c44dfa68059ba3f4dc38da91f51fedb7f8b (patch) | |
| tree | fb94e3d603bd336b7bb5b3b88ec6db6654e8c4c8 /pki/dogtag | |
| parent | 20518bff007db34dec6903f7a12df69c01589ac1 (diff) | |
| download | pki-21aa7c44dfa68059ba3f4dc38da91f51fedb7f8b.tar.gz pki-21aa7c44dfa68059ba3f4dc38da91f51fedb7f8b.tar.xz pki-21aa7c44dfa68059ba3f4dc38da91f51fedb7f8b.zip | |
Bugzilla Bug #606944 - Convert TPS to use ldap utilities and API from
OpenLDAP instead of the Mozldap
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1822 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/dogtag')
| -rw-r--r-- | pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec | 6 | ||||
| -rwxr-xr-x | pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl | 30 |
2 files changed, 10 insertions, 26 deletions
diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec index cbdb805bd..414967e4d 100644 --- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec +++ b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec @@ -1,6 +1,6 @@ Name: dogtag-pki-tps-ui Version: 9.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dogtag Certificate System - Token Processing System User Interface URL: http://pki.fedoraproject.org/ License: GPLv2 and LGPLv2 @@ -57,5 +57,9 @@ rm -rf %{buildroot} %{_datadir}/pki/ %changelog +* Fri Feb 4 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-2 +- Bugzilla Bug 606944- Use openldap instead of 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/tps-ui/shared/cgi-bin/sow/cfg.pl b/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl index a71908f0e..0a7e728ca 100755 --- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl +++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl @@ -22,29 +22,7 @@ # # Establish platform-dependent variables: # -my $default_hardware_platform=""; -my $ldapsearch=""; -if( $^O eq "linux" ) { - $default_hardware_platform=`uname -i`; - chomp($default_hardware_platform); - if( $default_hardware_platform eq "i386" ) { - $ldapsearch = "/usr/lib/mozldap/ldapsearch"; - } elsif( $default_hardware_platform eq "x86_64" ) { - $ldapsearch = "/usr/lib64/mozldap/ldapsearch"; - } -} elsif( $^O eq "solaris" ) { - $default_hardware_platform=`uname -p`; - chomp($default_hardware_platform); - if( ( $default_hardware_platform eq "sparc" ) && - ( -d "/usr/lib/sparcv9/" ) ) { - $default_hardware_platform="sparcv9"; - } - if( $default_hardware_platform eq "sparc" ) { - $ldapsearch = "/usr/lib/mozldap6/ldapsearch"; - } elsif( $default_hardware_platform eq "sparcv9" ) { - $ldapsearch = "/usr/lib/sparcv9/mozldap6/ldapsearch"; - } -} +my $ldapsearch="/usr/bin/ldapsearch"; # # Feel free to modify the following parameters: @@ -129,12 +107,13 @@ sub is_agent() chomp($x_bindpwd); my $cmd = $ldapsearch . " " . + "-x" . "-D \"" . $x_binddn . "\" " . "-w \"" . $x_bindpwd . "\" " . "-b \"" . "cn=TUS Officers,ou=Groups,".$x_basedn . "\" " . "-h \"" . $x_host . "\" " . "-p \"" . $x_port ."\" " . - "-1 \"(uid=" . $uid . "*)\" | wc -l"; + "\"(uid=" . $uid . "*)\" | wc -l"; my $matched = `$cmd`; @@ -168,12 +147,13 @@ sub is_user() chomp($x_bindpwd); my $cmd = $ldapsearch . " " . + "-x" . "-D \"" . $x_binddn . "\" " . "-w \"" . $x_bindpwd . "\" " . "-b \"" . "ou=people,".$x_basedn . "\" " . "-h \"" . $x_host . "\" " . "-p \"" . $x_port ."\" " . - "-1 \"(uid=" . $uid . "*)\" | wc -l"; + "\"(uid=" . $uid . "*)\" | wc -l"; my $matched = `$cmd`; |