ldap/admin/src/scripts/50fixNsState.pl | 2 +-
ldap/admin/src/scripts/DSCreate.pm.in | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit c0d35f7e107d80a3fb173dfbce001243fe78c254
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Nov 16 11:32:27 2015 -0800
Ticket #48316 - Perl-5.20.3-328: Use of literal control characters in variable names
is deprecated
Description: "$^O" issues a warning "Use of literal control characters
in
variable names is deprecated at /usr/lib64/dirsrv/perl/DSCreate.pm line 839."
This patch replaces "$^O" with "$Config{'osname'}".
https://fedorahosted.org/389/ticket/48316
Reviewed by rmeggins(a)redhat.com and wibrown(a)redhat.com (Thank you, Rich and
William!!)
(cherry picked from commit 65362db30f55a41de1df97c8bd92047cac52ce83)
diff --git a/ldap/admin/src/scripts/DSCreate.pm.in
b/ldap/admin/src/scripts/DSCreate.pm.in
index 3ce5a73..50498fe 100644
--- a/ldap/admin/src/scripts/DSCreate.pm.in
+++ b/ldap/admin/src/scripts/DSCreate.pm.in
@@ -18,6 +18,7 @@ package DSCreate;
use DSUtil;
use Inf;
use FileConn;
+use Config;
use Sys::Hostname;
# tempfiles
@@ -836,7 +837,7 @@ sub setDefaults {
}
if (!defined($inf->{slapd}->{sasl_path})) {
- if ($ ne "linux") {
+ if ($Config{'osname'} ne "linux") {
$inf->{slapd}->{sasl_path} =
"$inf->{General}->{prefix}@libdir@/sasl2";
}
}
commit 9cf628467ad33a46c6c4cb14c6535881e66bd122
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Nov 16 11:24:03 2015 -0800
Ticket #48348 - Running /usr/sbin/setup-ds.pl fails with Can't locate bigint.pm,
plus two warnings
Description: bigint.pm is deprecated and no longer packaged in perl-5.22.0
on FC23. This patch replaces bigint with more basic Math::BigInt.
https://fedorahosted.org/389/ticket/48348
Reviewed by rmeggins(a)redhat.com and wibrown(a)redhat.com (Thank you, Rich and
William!!)
(cherry picked from commit dfc9ad00a6bf0f8b86c4c24a01e06e3434a7ca41)
diff --git a/ldap/admin/src/scripts/50fixNsState.pl
b/ldap/admin/src/scripts/50fixNsState.pl
index b331e9c..bd20708 100644
--- a/ldap/admin/src/scripts/50fixNsState.pl
+++ b/ldap/admin/src/scripts/50fixNsState.pl
@@ -4,7 +4,7 @@ use Mozilla::LDAP::Utils qw(normalizeDN);
use Mozilla::LDAP::API qw(:constant ldap_url_parse ldap_explode_dn);
use DSUtil qw(debug);
use Config;
-use bigint;
+use Math::BigInt;
# # Determine the endianness of your system
my $packfmt32 = "VVA6vCx3"; # must be 20 bytes