mirror of
https://github.com/samba-team/samba.git
synced 2025-02-25 17:57:42 +03:00
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
This commit is contained in:
parent
c180feb16c
commit
94899cd83c
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user