diff options
| -rw-r--r-- | pki/CMakeLists.txt | 1 | ||||
| -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 | ||||
| -rwxr-xr-x | pki/scripts/compose_dogtag_pki_theme_packages | 2 | ||||
| -rw-r--r-- | pki/specs/dogtag-pki-theme.spec | 8 |
5 files changed, 18 insertions, 29 deletions
diff --git a/pki/CMakeLists.txt b/pki/CMakeLists.txt index feb779f35..e45457437 100644 --- a/pki/CMakeLists.txt +++ b/pki/CMakeLists.txt @@ -16,6 +16,7 @@ if (BUILD_IPA_PKI_THEME) set(APPLICATION_VERSION_PATCH "3") elseif (BUILD_DOGTAG_PKI_THEME) set(APPLICATION_FLAVOR_DOGTAG_PKI_THEME TRUE) + set(APPLICATION_VERSION_PATCH "1") elseif (BUILD_REDHAT_PKI_THEME) set(APPLICATION_FLAVOR_REDHAT_PKI_THEME TRUE) elseif (BUILD_PKI_CORE) 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`; diff --git a/pki/scripts/compose_dogtag_pki_theme_packages b/pki/scripts/compose_dogtag_pki_theme_packages index f4ae0c756..3e722c3c1 100755 --- a/pki/scripts/compose_dogtag_pki_theme_packages +++ b/pki/scripts/compose_dogtag_pki_theme_packages @@ -31,7 +31,7 @@ PKI_PWD=`pwd` ## DOGTAG_PKI_THEME="dogtag-pki-theme" -DOGTAG_PKI_THEME_VERSION="9.0.0" +DOGTAG_PKI_THEME_VERSION="9.0.1" ## diff --git a/pki/specs/dogtag-pki-theme.spec b/pki/specs/dogtag-pki-theme.spec index a7e8999b7..eb273ed77 100644 --- a/pki/specs/dogtag-pki-theme.spec +++ b/pki/specs/dogtag-pki-theme.spec @@ -1,6 +1,6 @@ Name: dogtag-pki-theme -Version: 9.0.0 -Release: 3%{?dist} +Version: 9.0.1 +Release: 1%{?dist} Summary: Certificate System - Dogtag PKI Theme Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -346,6 +346,10 @@ chmod 755 %{buildroot}%{_datadir}/pki/tps-ui/cgi-bin/sow/cfg.pl %changelog +* Fri Feb 4 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.1-1 +- Bugzilla Bug #606944 - Convert TPS to use ldap utilities and API from + OpenLDAP instead of the Mozldap + * Fri Jan 21 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-3 - Bugzilla Bug #671030 - Review Request: dogtag-pki-theme - Certificate System, Dogtag PKI Theme Components |