Bugzilla BZ 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@1766 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

6 files changed, 9 insertions, 31 deletions

diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/ajax-list.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/ajax-list.cgi
index b3c2a3084..5adfe14bf 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/ajax-list.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/ajax-list.cgi
@@ -49,7 +49,7 @@ sub main()
             "-h \"" . $ldapHost . "\" " .
             "-p \"" . $ldapPort ."\" " .
             "-S \"cn\" " .
-            "-1 -s sub \"(cn=" . $letters . "*)\" cn uid > " . $tmpfile;
+            "-s sub \"(cn=" . $letters . "*)\" cn uid > " . $tmpfile;
   system($cmd);
 
   my $result = "";
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/cfg.pl b/pki/base/tps/forms/esc/cgi-bin/sow/cfg.pl
index efdac3b50..6aac28b00 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/cfg.pl
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/cfg.pl
@@ -23,29 +23,8 @@
 #
 # 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:
@@ -135,7 +114,7 @@ sub is_agent()
             "-b \"" . "cn=TUS Officers,ou=Groups,".$x_basedn . "\" " .
             "-h \"" . $x_host . "\" " .
             "-p \"" . $x_port ."\" " .
-            "-1 \"(uid=" . $uid . "*)\" | wc -l";
+            "member | grep \"uid=" . $uid . ",\" | wc -l";
 
   my $matched = `$cmd`;
 
@@ -174,8 +153,7 @@ sub is_user()
             "-b \"" . "ou=people,".$x_basedn . "\" " .
             "-h \"" . $x_host . "\" " .
             "-p \"" . $x_port ."\" " .
-            "-1 \"(uid=" . $uid . "*)\" | wc -l";
-
+            "\"(uid=" . $uid . ")\" uid | grep \"uid:\" | wc -l";
 
   my $matched = `$cmd`;
 
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/enroll.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/enroll.cgi
index b8da0908a..dcd3f7b25 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/enroll.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/enroll.cgi
@@ -201,7 +201,7 @@ sub GenerateEnrollmentPage
             "-b \"" . $basedn . "\" " .
             "-h \"" . $ldapHost . "\" " .
             "-p \"" . $ldapPort ."\" " .
-            "-1 \"(uid=" . $uid . ")\" > " . $tmpfile;
+            "\"(uid=" . $uid . ")\" > " . $tmpfile;
   system($cmd);
 
   open(F, "<$tmpfile");
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi
index 74628fb67..ee50298d8 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/enroll_temp.cgi
@@ -200,7 +200,7 @@ sub GenerateEnrollmentPage
             "-b \"" . $basedn . "\" " .
             "-h \"" . $ldapHost . "\" " .
             "-p \"" . $ldapPort ."\" " .
-            "-1 \"(uid=" . $uid . ")\" > " . $tmpfile;
+            "\"(uid=" . $uid . ")\" > " . $tmpfile;
   system($cmd);
 
   open(F, "<$tmpfile");
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/read.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/read.cgi
index 3a0c3d7a9..d13a1163e 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/read.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/read.cgi
@@ -66,7 +66,7 @@ sub DoPage
             "-b \"" . $basedn . "\" " .
             "-h \"" . $ldapHost . "\" " .
             "-p \"" . $ldapPort ."\" " .
-            "-1 \"(cn=" . $name . ")\" > " . $tmpfile;
+            "\"(cn=" . $name . ")\" > " . $tmpfile;
   system($cmd);
 
   open(F, "<$tmpfile");
diff --git a/pki/base/tps/forms/esc/cgi-bin/sow/read_temp.cgi b/pki/base/tps/forms/esc/cgi-bin/sow/read_temp.cgi
index 7aaf7f1cc..fab34e842 100755
--- a/pki/base/tps/forms/esc/cgi-bin/sow/read_temp.cgi
+++ b/pki/base/tps/forms/esc/cgi-bin/sow/read_temp.cgi
@@ -66,7 +66,7 @@ sub DoPage
             "-b \"" . $basedn . "\" " .
             "-h \"" . $ldapHost . "\" " .
             "-p \"" . $ldapPort ."\" " .
-            "-1 \"(cn=" . $name . ")\" > " . $tmpfile;
+            "\"(cn=" . $name . ")\" > " . $tmpfile;
   system($cmd);
 
   open(F, "<$tmpfile");