summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-10-07 09:58:29 +0200
committerStefan Metzmacher <metze@samba.org>2011-10-07 12:20:49 +0200
commit94899cd83ce2270d7760e0f9bb472b80de89f80b (patch)
treeea2c769bd5ff9e236a7bc368eca193f6dabfa9f3
parentc180feb16cd6933fc81e949b440707c4982a8295 (diff)
downloadsamba-94899cd83ce2270d7760e0f9bb472b80de89f80b.tar.gz
samba-94899cd83ce2270d7760e0f9bb472b80de89f80b.tar.bz2
samba-94899cd83ce2270d7760e0f9bb472b80de89f80b.zip
Revert "ldb: support raw OIDs in control string parsing"
This reverts commit ea41860d32d38448e08cefd79d30ee1150317a9e. This is not needed, because we already have the 'local_oid' magic. metze
-rw-r--r--lib/ldb/common/ldb_controls.c18
-rw-r--r--lib/ldb/include/ldb_private.h1
2 files changed, 0 insertions, 19 deletions
diff --git a/lib/ldb/common/ldb_controls.c b/lib/ldb/common/ldb_controls.c
index d4fc21f58e..5b5f3578d6 100644
--- a/lib/ldb/common/ldb_controls.c
+++ b/lib/ldb/common/ldb_controls.c
@@ -1018,27 +1018,9 @@ 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 db2457d6df..cafc020e29 100644
--- a/lib/ldb/include/ldb_private.h
+++ b/lib/ldb/include/ldb_private.h
@@ -40,7 +40,6 @@
#include "replace.h"
#include "system/filesys.h"
#include "system/time.h"
-#include "system/locale.h"
#include "ldb.h"
#include "ldb_module.h"