From 65362db30f55a41de1df97c8bd92047cac52ce83 Mon Sep 17 00:00:00 2001
From: Noriko Hosoi <nhosoi@redhat.com>
Date: Nov 16 2015 22:27:32 +0000
Subject: 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@redhat.com and wibrown@redhat.com (Thank you, Rich and William!!)

---

diff --git a/ldap/admin/src/scripts/DSCreate.pm.in b/ldap/admin/src/scripts/DSCreate.pm.in
index 7f272f6..ac64875 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";
         }
     }