From e77f0cc20085d48f417817d32cdd288ff3e7f1c7 Mon Sep 17 00:00:00 2001 From: cajus Date: Thu, 31 Jan 2008 08:31:54 +0000 Subject: [PATCH] Updated to the new use of messages git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8688 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-si/gosa-si-server | 5 ++++- gosa-si/modules/SIPackages.pm | 6 ++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index 2a0fafabf..1db1836ec 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -562,7 +562,10 @@ sub create_ciphering { sub encrypt_msg { my ($msg, $key) = @_; my $my_cipher = &create_ciphering($key); - $msg = "\0"x(16-length($msg)%16).$msg; + { + use bytes; + $msg = "\0"x(16-length($msg)%16).$msg; + } $msg = $my_cipher->encrypt($msg); chomp($msg = &encode_base64($msg)); # there are no newlines allowed inside msg diff --git a/gosa-si/modules/SIPackages.pm b/gosa-si/modules/SIPackages.pm index 8fd714406..c273341cf 100644 --- a/gosa-si/modules/SIPackages.pm +++ b/gosa-si/modules/SIPackages.pm @@ -625,7 +625,7 @@ sub new_ldap_config { my $base; # Do we need to look at an object class? - if ($#servers < 1){ + if (length(@servers) < 1){ $mesg = $ldap->search( base => $ldap_base, scope => 'sub', attrs => ['dn', 'gotoLdapServer'], @@ -666,9 +666,7 @@ sub new_ldap_config { } # Send information - send_msg("new_ldap_config", $server_address, $address, \%data, $hostkey); - - return; + return send_msg("new_ldap_config", $server_address, $address, \%data, $hostkey); } -- 2.30.2