Updated Export

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17842 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/include/class_SnapshotHandler.inc b/gosa-core/include/class_SnapshotHandler.inc
index 6327555e8a7c4b9cb9598d5147e9b4ac737d7c7e..ae04963fbbe1ecf2f58dc7dfd23d172880309a81 100644 (file)
--- a/gosa-core/include/class_SnapshotHandler.inc
+++ b/gosa-core/include/class_SnapshotHandler.inc
@@ -296,7 +296,7 @@ class SnapshotHandler {
       $new_base       = preg_replace("/".preg_quote($base, '/')."$/","",$base_of_object).$snap_base;
 
       /* Create object */
-      $data             = $ldap->generateLdif($dn,
+      $data             = $ldap->generateLdif(LDAP::fix($dn),
               "(&(!(objectClass=gosaDepartment))(!(objectClass=FAIclass)))",array(),'base');
  
       $newName          = str_replace(".", "", $sec."-".$usec);

diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc
index 1a991f1b6e122ba7466593abe2bd1ec1336cda9a..5d815810e9134838bb49e6f4e8d0f5f98b6e8b89 100644 (file)
--- a/gosa-core/include/class_ldap.inc
+++ b/gosa-core/include/class_ldap.inc
@@ -863,7 +863,8 @@ class LDAP{
     $attrs  = (count($attributes))?implode($attributes,' '):'';
     $scope = (!empty($scope))?' -s '.$scope: '';
     $limit = (!$limit)?'':' -z '.$limit;
-    $cmd = "ldapsearch -x -LLLL '{$filter}' {$limit} {$scope} -H '{$host}' -b '{$dn}' $attrs";
+    $dn = escapeshellarg($dn);
+    $cmd = "ldapsearch -x -LLLL '{$filter}' {$limit} {$scope} -H '{$host}' -b {$dn} $attrs";
     exec($cmd, $ret,$code);
     $res = implode($ret,"\n");
     return($res);