ldap/admin/src/scripts/DSCreate.pm.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

New commits: commit 0bd980dcc8068c5922ad7ec750622685ed612e48 Author: Nathan Kinder nkinder@redhat.com Date: Thu Oct 10 16:50:51 2013 -0700

Ticket 47513 - tmpfiles.d references /var/lock when they should reference /run/lock

The previous patch was using numeric comparison instead of string comparison to check if localrundir was empty. This was causing our tmpfiles.d configuration to use the settings from the inf file, which evaluates to /var/run when using --with-fhs.

This patch uses a proper string comparison which results in using /run in the tmpfiles.d config as desired. (cherry picked from commit 0394b2bb9cae3016eeb975ed194e8c7258ed868b)

diff --git a/ldap/admin/src/scripts/DSCreate.pm.in b/ldap/admin/src/scripts/DSCreate.pm.in index fd1941b..58408c1 100644 --- a/ldap/admin/src/scripts/DSCreate.pm.in +++ b/ldap/admin/src/scripts/DSCreate.pm.in @@ -1104,7 +1104,7 @@ sub updateTmpfilesDotD { # d /var/run/user 0755 root root 10d # we don't use age my $localrundir = set_localrundir("@localrundir@", $inf->{General}->{prefix}); - if( $localrundir != "" && -d "$localrundir"){ + if( $localrundir ne "" && -d "$localrundir"){ $rundir = "$localrundir/@PACKAGE_NAME@"; $lockdir = "$localrundir/lock/@PACKAGE_NAME@/slapd-$inf->{slapd}->{ServerIdentifier}"; $parentdir = "$localrundir/lock/@PACKAGE_NAME@";