From ea41860d32d38448e08cefd79d30ee1150317a9e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 6 Oct 2011 14:19:24 +1100 Subject: ldb: support raw OIDs in control string parsing this makes it possible to use a raw OID string on the command line or in python scripts Pair-Programmed-With: Andrew Bartlett --- lib/ldb/common/ldb_controls.c | 18 ++++++++++++++++++ lib/ldb/include/ldb_private.h | 1 + 2 files changed, 19 insertions(+) diff --git a/lib/ldb/common/ldb_controls.c b/lib/ldb/common/ldb_controls.c index d7a3143932..42fabfc185 100644 --- a/lib/ldb/common/ldb_controls.c +++ b/lib/ldb/common/ldb_controls.c @@ -1018,9 +1018,27 @@ struct ldb_control *ldb_parse_control_from_string(struct ldb_context *ldb, TALLO return ctrl; } + + /* support a raw OID */ + if (isdigit(control_strings[0])) { + const char *p = strchr(control_strings, ':'); + if (p == NULL) { + goto failed; + } + if (strspn(control_strings, "0123456789.") != (p-control_strings)) { + goto failed; + } + ctrl->oid = talloc_strndup(ctrl, control_strings, p-control_strings); + ctrl->critical = (p[1]=='1'?1:0); + ctrl->data = NULL; + return ctrl; + } + /* * When no matching control has been found. */ +failed: + talloc_free(ctrl); return NULL; } diff --git a/lib/ldb/include/ldb_private.h b/lib/ldb/include/ldb_private.h index cafc020e29..db2457d6df 100644 --- a/lib/ldb/include/ldb_private.h +++ b/lib/ldb/include/ldb_private.h @@ -40,6 +40,7 @@ #include "replace.h" #include "system/filesys.h" #include "system/time.h" +#include "system/locale.h" #include "ldb.h" #include "ldb_module.h" -- cgit