summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-08-05 11:38:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:15:24 -0500
commit8ac0237eba1831c8ba6d01c2b9d8402636a21bb2 (patch)
treea1985decd8420a9f8bb2e5b8d3f0c297c7e0311f
parent817610f38540fb99595f6e3b77b9f6696f9e3b3f (diff)
downloadsamba-8ac0237eba1831c8ba6d01c2b9d8402636a21bb2.tar.gz
samba-8ac0237eba1831c8ba6d01c2b9d8402636a21bb2.tar.bz2
samba-8ac0237eba1831c8ba6d01c2b9d8402636a21bb2.zip
r17420: add client support for the LDAP_SERVER_DOMAIN_SCOPE control
metze (This used to be commit 84e74a759cfa49ebc8b4ba1b8e729d6d920fc55a)
-rw-r--r--source4/lib/ldb/include/ldb.h7
-rw-r--r--source4/lib/ldb/tools/cmdline.c25
-rw-r--r--source4/libcli/ldap/ldap_controls.c20
3 files changed, 50 insertions, 2 deletions
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 4a04c3df44..13ad473b0b 100644
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -430,6 +430,13 @@ typedef int (*ldb_qsort_cmp_fn_t) (void *v1, void *v2, void *opaque);
#define LDB_CONTROL_SD_FLAGS_OID "1.2.840.113556.1.4.801"
/**
+ OID for specifying an advanced scope for the search (one partition)
+
+ \sa <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/ldap/ldap/ldap_server_domain_scope_oid.asp">Microsoft documentation of this OID</a>
+*/
+#define LDB_CONTROL_DOMAIN_SCOPE_OID "1.2.840.113556.1.4.1339"
+
+/**
OID for specifying an advanced scope for a search
\sa <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/ldap/ldap/ldap_server_search_options_oid.asp">Microsoft documentation of this OID</a>
diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index 0901c7bbf2..c470c64703 100644
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -414,8 +414,8 @@ struct ldb_control **parse_controls(void *mem_ctx, char **control_strings)
p = &(control_strings[i][15]);
ret = sscanf(p, "%d:%u", &crit, &search_options);
- if ((ret != 2) || (crit < 0) || (crit > 1) || (search_options < 0) || (search_options > 0x0FFFFFFFF)) {
- fprintf(stderr, "invalid sd_flags control syntax\n");
+ if ((ret != 2) || (crit < 0) || (crit > 1) || (search_options < 0) || (search_options > 0xF)) {
+ fprintf(stderr, "invalid search_options control syntax\n");
fprintf(stderr, " syntax: crit(b):search_options(n)\n");
fprintf(stderr, " note: b = boolean, n = number\n");
return NULL;
@@ -431,6 +431,27 @@ struct ldb_control **parse_controls(void *mem_ctx, char **control_strings)
continue;
}
+ if (strncmp(control_strings[i], "domain_scope:", 13) == 0) {
+ const char *p;
+ int crit, ret;
+
+ p = &(control_strings[i][13]);
+ ret = sscanf(p, "%d", &crit);
+ if ((ret != 1) || (crit < 0) || (crit > 1)) {
+ fprintf(stderr, "invalid domain_scope control syntax\n");
+ fprintf(stderr, " syntax: crit(b)\n");
+ fprintf(stderr, " note: b = boolean\n");
+ return NULL;
+ }
+
+ ctrl[i] = talloc(ctrl, struct ldb_control);
+ ctrl[i]->oid = LDB_CONTROL_DOMAIN_SCOPE_OID;
+ ctrl[i]->critical = crit;
+ ctrl[i]->data = NULL;
+
+ continue;
+ }
+
if (strncmp(control_strings[i], "paged_results:", 14) == 0) {
struct ldb_paged_control *control;
const char *p;
diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c
index 4c5d214a8f..395c4eb836 100644
--- a/source4/libcli/ldap/ldap_controls.c
+++ b/source4/libcli/ldap/ldap_controls.c
@@ -401,6 +401,15 @@ static BOOL decode_asq_control(void *mem_ctx, DATA_BLOB in, void **out)
return True;
}
+static BOOL decode_domain_scope_request(void *mem_ctx, DATA_BLOB in, void **out)
+{
+ if (in.length != 0) {
+ return False;
+ }
+
+ return True;
+}
+
static BOOL decode_notification_request(void *mem_ctx, DATA_BLOB in, void **out)
{
if (in.length != 0) {
@@ -850,6 +859,16 @@ static BOOL encode_dirsync_request(void *mem_ctx, void *in, DATA_BLOB *out)
return True;
}
+static BOOL encode_domain_scope_request(void *mem_ctx, void *in, DATA_BLOB *out)
+{
+ if (in) {
+ return False;
+ }
+
+ *out = data_blob(NULL, 0);
+ return True;
+}
+
static BOOL encode_notification_request(void *mem_ctx, void *in, DATA_BLOB *out)
{
if (in) {
@@ -995,6 +1014,7 @@ struct control_handler ldap_known_controls[] = {
{ "1.2.840.113556.1.4.841", decode_dirsync_request, encode_dirsync_request },
{ "1.2.840.113556.1.4.528", decode_notification_request, encode_notification_request },
{ "1.2.840.113556.1.4.801", decode_sd_flags_request, encode_sd_flags_request },
+ { "1.2.840.113556.1.4.1339", decode_domain_scope_request, encode_domain_scope_request },
{ "1.2.840.113556.1.4.1340", decode_search_options_request, encode_search_options_request },
{ "2.16.840.1.113730.3.4.2", decode_manageDSAIT_request, encode_manageDSAIT_request },
{ "2.16.840.1.113730.3.4.9", decode_vlv_request, encode_vlv_request },