Mailinglist Archive: yast-commit (1224 mails)

[rhafer@xxxxxxxxxxxxxxxx]

Author: rhafer
Date: Tue Nov 24 17:53:56 2009
New Revision: 59746

URL: http://svn.opensuse.org/viewcvs/yast?rev=59746&view=rev
Log:
Check if TLS config is empty before accessing it

Modified:
    branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm

Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm?rev=59746&r1=59745&r2=59746&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm (original)
+++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm Tue Nov 24 
17:53:56 2009
@@ -1429,9 +1429,16 @@
         }
     }
     my $oldtls = $self->ReadTlsConfig();
-    if ( $oldtls->{'certKeyFile'} ne $tls->{'certKeyFile'} ||
-         $oldtls->{'certFile'} ne $tls->{'certFile'} ||
-         $oldtls->{'caCertFile'} ne $tls->{'caCertFile'})
+    if ( ref($oldtls) eq "HASH" )
+    {
+        if( $oldtls->{'certKeyFile'} ne $tls->{'certKeyFile'} ||
+            $oldtls->{'certFile'} ne $tls->{'certFile'} ||
+            $oldtls->{'caCertFile'} ne $tls->{'caCertFile'} )
+        {
+            $restartRequired = 1;
+        }
+    }
+    elsif ( $tls->{'tls_active'} )
     {
         $restartRequired = 1;
     }

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx