From 0b870f61b9b4fd439d9d88a64fc5e05bea0d19a3 Mon Sep 17 00:00:00 2001
From: Noriko Hosoi <nhosoi@redhat.com>
Date: Thu, 16 Apr 2015 16:17:05 -0700
Subject: [PATCH] Ticket #48143 - Fixing the dirsrv perl libpath - Password is
 not correctly passed to perl command line tools if it contains shell special
 characters.

Description: commit e7c8da691309f2bcaa0c78cd5fb3c7793f2e2c75 accidentally
put /usr/lib64/dirsrv/perl, which should be a macro @perlpath@ to be replaced
based upon the architecture.
---
 ldap/admin/src/scripts/template-bak2db.pl.in                | 2 +-
 ldap/admin/src/scripts/template-cleanallruv.pl.in           | 2 +-
 ldap/admin/src/scripts/template-db2bak.pl.in                | 2 +-
 ldap/admin/src/scripts/template-db2index.pl.in              | 2 +-
 ldap/admin/src/scripts/template-db2ldif.pl.in               | 2 +-
 ldap/admin/src/scripts/template-fixup-linkedattrs.pl.in     | 2 +-
 ldap/admin/src/scripts/template-fixup-memberof.pl.in        | 2 +-
 ldap/admin/src/scripts/template-fixup-memberuid.pl.in       | 2 +-
 ldap/admin/src/scripts/template-ldif2db.pl.in               | 2 +-
 ldap/admin/src/scripts/template-ns-accountstatus.pl.in      | 2 +-
 ldap/admin/src/scripts/template-ns-activate.pl.in           | 2 +-
 ldap/admin/src/scripts/template-ns-inactivate.pl.in         | 2 +-
 ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in        | 2 +-
 ldap/admin/src/scripts/template-schema-reload.pl.in         | 2 +-
 ldap/admin/src/scripts/template-syntax-validate.pl.in       | 2 +-
 ldap/admin/src/scripts/template-usn-tombstone-cleanup.pl.in | 2 +-
 ldap/admin/src/scripts/template-verify-db.pl.in             | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ldap/admin/src/scripts/template-bak2db.pl.in b/ldap/admin/src/scripts/template-bak2db.pl.in
index 6e2e863..c220e36 100644
--- a/ldap/admin/src/scripts/template-bak2db.pl.in
+++ b/ldap/admin/src/scripts/template-bak2db.pl.in
@@ -39,7 +39,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 
 # We lose args that are quoted when passing ARGV to a wrapper
diff --git a/ldap/admin/src/scripts/template-cleanallruv.pl.in b/ldap/admin/src/scripts/template-cleanallruv.pl.in
index 132bf1e..8483456 100644
--- a/ldap/admin/src/scripts/template-cleanallruv.pl.in
+++ b/ldap/admin/src/scripts/template-cleanallruv.pl.in
@@ -39,7 +39,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 
 # We lose args that are quoted when passing ARGV to a wrapper
diff --git a/ldap/admin/src/scripts/template-db2bak.pl.in b/ldap/admin/src/scripts/template-db2bak.pl.in
index 66d136f..1c396d1 100644
--- a/ldap/admin/src/scripts/template-db2bak.pl.in
+++ b/ldap/admin/src/scripts/template-db2bak.pl.in
@@ -39,7 +39,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 
 # We lose args that are quoted when passing ARGV to a wrapper
diff --git a/ldap/admin/src/scripts/template-db2index.pl.in b/ldap/admin/src/scripts/template-db2index.pl.in
index b724225..695fd6d 100644
--- a/ldap/admin/src/scripts/template-db2index.pl.in
+++ b/ldap/admin/src/scripts/template-db2index.pl.in
@@ -39,7 +39,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 
 # We lose args that are quoted when passing ARGV to a wrapper
diff --git a/ldap/admin/src/scripts/template-db2ldif.pl.in b/ldap/admin/src/scripts/template-db2ldif.pl.in
index 3294e95..f4f1817 100644
--- a/ldap/admin/src/scripts/template-db2ldif.pl.in
+++ b/ldap/admin/src/scripts/template-db2ldif.pl.in
@@ -39,7 +39,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 use Cwd;
 
diff --git a/ldap/admin/src/scripts/template-fixup-linkedattrs.pl.in b/ldap/admin/src/scripts/template-fixup-linkedattrs.pl.in
index a2663fa..0bec685 100644
--- a/ldap/admin/src/scripts/template-fixup-linkedattrs.pl.in
+++ b/ldap/admin/src/scripts/template-fixup-linkedattrs.pl.in
@@ -39,7 +39,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 
 # We lose args that are quoted when passing ARGV to a wrapper
diff --git a/ldap/admin/src/scripts/template-fixup-memberof.pl.in b/ldap/admin/src/scripts/template-fixup-memberof.pl.in
index 9bea8a7..c5d2ae7 100644
--- a/ldap/admin/src/scripts/template-fixup-memberof.pl.in
+++ b/ldap/admin/src/scripts/template-fixup-memberof.pl.in
@@ -39,7 +39,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 
 # We lose args that are quoted when passing ARGV to a wrapper
diff --git a/ldap/admin/src/scripts/template-fixup-memberuid.pl.in b/ldap/admin/src/scripts/template-fixup-memberuid.pl.in
index 0eca3e1..506f6fa 100644
--- a/ldap/admin/src/scripts/template-fixup-memberuid.pl.in
+++ b/ldap/admin/src/scripts/template-fixup-memberuid.pl.in
@@ -39,7 +39,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 
 sub usage {
diff --git a/ldap/admin/src/scripts/template-ldif2db.pl.in b/ldap/admin/src/scripts/template-ldif2db.pl.in
index d7e4bc2..0c94617 100644
--- a/ldap/admin/src/scripts/template-ldif2db.pl.in
+++ b/ldap/admin/src/scripts/template-ldif2db.pl.in
@@ -39,7 +39,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 
 # We lose args that are quoted when passing ARGV to a wrapper
diff --git a/ldap/admin/src/scripts/template-ns-accountstatus.pl.in b/ldap/admin/src/scripts/template-ns-accountstatus.pl.in
index 148b550..1e5dcb5 100644
--- a/ldap/admin/src/scripts/template-ns-accountstatus.pl.in
+++ b/ldap/admin/src/scripts/template-ns-accountstatus.pl.in
@@ -39,7 +39,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 
 # We lose args that are quoted when passing ARGV to a wrapper
diff --git a/ldap/admin/src/scripts/template-ns-activate.pl.in b/ldap/admin/src/scripts/template-ns-activate.pl.in
index 49f214b..52d49ec 100644
--- a/ldap/admin/src/scripts/template-ns-activate.pl.in
+++ b/ldap/admin/src/scripts/template-ns-activate.pl.in
@@ -39,7 +39,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 
 # We lose args that are quoted when passing ARGV to a wrapper
diff --git a/ldap/admin/src/scripts/template-ns-inactivate.pl.in b/ldap/admin/src/scripts/template-ns-inactivate.pl.in
index 0e89902..badfb49 100644
--- a/ldap/admin/src/scripts/template-ns-inactivate.pl.in
+++ b/ldap/admin/src/scripts/template-ns-inactivate.pl.in
@@ -39,7 +39,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 
 # We lose args that are quoted when passing ARGV to a wrapper
diff --git a/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in b/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in
index 096a843..6587781 100755
--- a/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in
+++ b/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in
@@ -39,7 +39,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 
 # We lose args that are quoted when passing ARGV to a wrapper
diff --git a/ldap/admin/src/scripts/template-schema-reload.pl.in b/ldap/admin/src/scripts/template-schema-reload.pl.in
index ea5bb1e..e7ac4b0 100644
--- a/ldap/admin/src/scripts/template-schema-reload.pl.in
+++ b/ldap/admin/src/scripts/template-schema-reload.pl.in
@@ -39,7 +39,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 
 # We lose args that are quoted when passing ARGV to a wrapper
diff --git a/ldap/admin/src/scripts/template-syntax-validate.pl.in b/ldap/admin/src/scripts/template-syntax-validate.pl.in
index a901dcf..540309c 100644
--- a/ldap/admin/src/scripts/template-syntax-validate.pl.in
+++ b/ldap/admin/src/scripts/template-syntax-validate.pl.in
@@ -39,7 +39,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 
 # We lose args that are quoted when passing ARGV to a wrapper
diff --git a/ldap/admin/src/scripts/template-usn-tombstone-cleanup.pl.in b/ldap/admin/src/scripts/template-usn-tombstone-cleanup.pl.in
index 86c6f99..0d62a3b 100644
--- a/ldap/admin/src/scripts/template-usn-tombstone-cleanup.pl.in
+++ b/ldap/admin/src/scripts/template-usn-tombstone-cleanup.pl.in
@@ -38,7 +38,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 
 # We lose args that are quoted when passing ARGV to a wrapper
diff --git a/ldap/admin/src/scripts/template-verify-db.pl.in b/ldap/admin/src/scripts/template-verify-db.pl.in
index 1276a49..f789d02 100644
--- a/ldap/admin/src/scripts/template-verify-db.pl.in
+++ b/ldap/admin/src/scripts/template-verify-db.pl.in
@@ -38,7 +38,7 @@
 # END COPYRIGHT BLOCK
 #
 
-use lib qw(/usr/lib64/dirsrv/perl);
+use lib qw(@perlpath@);
 use DSUtil qw(shellEscape);
 
 # We lose args that are quoted when passing ARGV to a wrapper
-- 
1.9.3