svn commit: samba r13507 - in branches/SAMBA_4_0/source: dsdb/samdb/ldb_modules lib/ldb/modules

[metze at samba.org]

Author: metze
Date: 2006-02-15 15:13:05 +0000 (Wed, 15 Feb 2006)
New Revision: 13507

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13507

Log:
the 'data' element of LDAP controls is optional.
(prepare the next commit)

metze
Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/extended_dn.c
   branches/SAMBA_4_0/source/lib/ldb/modules/asq.c
   branches/SAMBA_4_0/source/lib/ldb/modules/paged_results.c
   branches/SAMBA_4_0/source/lib/ldb/modules/sort.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/extended_dn.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/extended_dn.c	2006-02-15 13:33:33 UTC (rev 13506)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/extended_dn.c	2006-02-15 15:13:05 UTC (rev 13507)
@@ -185,6 +185,9 @@
 	}
 
 	extended_ctrl = talloc_get_type(control->data, struct ldb_extended_dn_control);
+	if (!extended_ctrl) {
+		return LDB_ERR_PROTOCOL_ERROR;
+	}
 
 	/* save it locally and remove it from the list */
 	if (!save_controls(control, req, &saved_controls)) {

Modified: branches/SAMBA_4_0/source/lib/ldb/modules/asq.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/asq.c	2006-02-15 13:33:33 UTC (rev 13506)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/asq.c	2006-02-15 15:13:05 UTC (rev 13507)
@@ -105,6 +105,9 @@
 	}
 
 	asq_ctrl = talloc_get_type(control->data, struct ldb_asq_control);
+	if (!asq_ctrl) {
+		return LDB_ERR_PROTOCOL_ERROR;
+	}
 
 	/* get the object to retrieve the DNs to search */
 	base_req = talloc_zero(req, struct ldb_request);

Modified: branches/SAMBA_4_0/source/lib/ldb/modules/paged_results.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/paged_results.c	2006-02-15 13:33:33 UTC (rev 13506)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/paged_results.c	2006-02-15 15:13:05 UTC (rev 13507)
@@ -117,6 +117,9 @@
 	}
 
 	paged_ctrl = talloc_get_type(control->data, struct ldb_paged_control);
+	if (!paged_ctrl) {
+		return LDB_ERR_PROTOCOL_ERROR;
+	}
 
 	/* check if it is a continuation search the store */
 	if (paged_ctrl->cookie_len != 0) {

Modified: branches/SAMBA_4_0/source/lib/ldb/modules/sort.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/sort.c	2006-02-15 13:33:33 UTC (rev 13506)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/sort.c	2006-02-15 15:13:05 UTC (rev 13507)
@@ -126,6 +126,9 @@
 	}
 
 	sort_ctrls = talloc_get_type(control->data, struct ldb_server_sort_control *);
+	if (!sort_ctrls) {
+		return LDB_ERR_PROTOCOL_ERROR;
+	}
 
 	/* FIXME: we do not support more than one attribute for sorting right now */
 	/* FIXME: we need to check if the attribute type exist or return an error */