gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder sf.php.in, 1.10, 1.11

cvs at kolab.org cvs at kolab.org
Mon Jan 11 10:30:13 CET 2010


Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
In directory doto:/tmp/cvs-serv970/kolab-webadmin/www/admin/sharedfolder

Modified Files:
	sf.php.in 
Log Message:
MFB: kolab/issue3499 (Kolab web admin does not use LDAP escaping)

Index: sf.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sf.php.in	12 Jul 2007 16:28:23 -0000	1.10
+++ sf.php.in	11 Jan 2010 09:30:11 -0000	1.11
@@ -215,7 +215,7 @@
 
 		if ($action == "save") {
 		  if (!$errors) {
-			if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",".$sf_root;
+			if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$sf_root;
 			else $newdn = $dn;
 			if (strcmp($dn,$newdn) != 0) {
 			  if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) &&
@@ -223,7 +223,7 @@
 				  ($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
 
 				// Try to rename the object
-				if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap_object['cn'], $sf_root, true)) {
+				if (!ldap_rename($ldap->connection, $dn, "cn=" . $ldap->dn_escape($ldap_object['cn']), $sf_root, true)) {
 				  array_push($errors, sprintf(_("LDAP Error: could not rename %s to %s: %s"), $dn,
 											  $newdn, ldap_error($ldap->connection)));
 				}
@@ -255,7 +255,7 @@
 		  } 
 		} else {
 		  if (!$errors) {
-			$dn = "cn=".$ldap_object['cn'].",".$sf_root;
+			$dn = "cn=".$ldap->dn_escape($ldap_object['cn']).",".$sf_root;
 			$ldap_object['kolabHomeServer'] = trim($_POST['kolabhomeserver']);
 			if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object)) 
 			  array_push($errors, sprintf(_("LDAP Error: could not add object %s: %s"), $dn, 





More information about the commits mailing list