sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3

Browse Source 
Conflicts:

	source/build/smb_build/makefile.pm
(This used to be commit 391fea450b2e6664fcd4e4419858997c6094cf3e)
This commit is contained in:
Jelmer Vernooij 2008-03-04 14:16:57 +01:00
commit 5a5b50f3dd
6 changed files with 22 additions and 553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/Makefile
View File

@ -40,7 +40,7 @@ pch:: clean_pch include/includes.h.gch
.DEFAULT_GOAL := all
ifneq ($(automatic_deps),yes)
ifneq ($(automatic_dependencies),yes)
ALL_PREDEP = proto
.NOTPARALLEL:
endif
@ -52,7 +52,7 @@ include data.mk
DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
include/includes.d
ifeq ($(automatic_deps),yes)
ifeq ($(automatic_dependencies),yes)
ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),distclean)
ifneq ($(MAKECMDGOALS),realdistclean)

4
source4/dsdb/samdb/ldb_modules/normalise.c
View File

@ -106,8 +106,8 @@ static int normalise_search_callback(struct ldb_context *ldb, void *context, str
continue;
}
/* Look to see if this attributeSyntax is a DN */
if ((strcmp(attribute->attributeSyntax_oid, "2.5.5.1") != 0) &&
(strcmp(attribute->attributeSyntax_oid, "2.5.5.7") != 0)) {
if (!((strcmp(attribute->attributeSyntax_oid, "2.5.5.1") == 0) ||
(strcmp(attribute->attributeSyntax_oid, "2.5.5.7") == 0))) {
continue;
}
for (j = 0; j < ares->message->elements[i].num_values; j++) {

8
source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
View File

@ -153,9 +153,17 @@ static struct ldb_val sid_always_binary(struct ldb_module *module, TALLOC_CTX *c
/* Ensure we always convert objectCategory into a DN */
static struct ldb_val objectCategory_always_dn(struct ldb_module *module, TALLOC_CTX *ctx, const struct ldb_val *val)
{
struct ldb_dn *dn;
struct ldb_val out = data_blob(NULL, 0);
const struct ldb_schema_attribute *a = ldb_schema_attribute_by_name(module->ldb, "objectCategory");
dn = ldb_dn_new(ctx, module->ldb, val->data);
if (dn && ldb_dn_is_valid(dn)) {
talloc_free(dn);
return val_copy(module, ctx, val);
}
talloc_free(dn);
if (a->syntax->canonicalise_fn(module->ldb, ctx, val, &out) != LDB_SUCCESS) {
return data_blob(NULL, 0);
}

11
source4/lib/ldb/ldb.i
View File

@ -42,6 +42,7 @@ typedef struct ldb_dn ldb_dn;
typedef struct ldb_ldif ldb_ldif;
typedef struct ldb_message_element ldb_msg_element;
typedef int ldb_error;
typedef int ldb_int_error;
%}
@ -520,6 +521,14 @@ PyObject *PyExc_LdbError;
%typemap(out,noblock=1) ldb_error {
if ($1 != LDB_SUCCESS) {
PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)"(i,s)", $1, ldb_errstring(arg1)));
SWIG_fail;
}
$result = Py_None;
};
%typemap(out,noblock=1) ldb_int_error {
if ($1 != LDB_SUCCESS) {
PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)"(i,s)", $1, ldb_strerror($1)));
SWIG_fail;
@ -761,4 +770,4 @@ time_t ldb_string_to_time(const char *s);
}
%rename(register_module) ldb_register_module;
ldb_error ldb_register_module(const struct ldb_module_ops *);
ldb_int_error ldb_register_module(const struct ldb_module_ops *);

545
source4/setup/schema.ldif
View File

File diff suppressed because it is too large Load Diff

3
testprogs/ejs/minschema.js
View File

@ -92,7 +92,6 @@ class_attrs = new Array("objectClass",
"defaultSecurityDescriptor",
"systemFlags",
"defaultHidingValue",
"objectCategory",
"defaultObjectCategory",
/* this attributes are not used by w2k3 */
@ -124,7 +123,6 @@ attrib_attrs = new Array("objectClass",
"systemOnly",
"systemFlags",
"isMemberOfPartialAttributeSet",
"objectCategory",
/* this attributes are not used by w2k3 */
"schemaFlagsEx",
@ -706,7 +704,6 @@ function write_aggregate() {
printf("dn: CN=Aggregate,${SCHEMADN}\n");
print("objectClass: top
objectClass: subSchema
objectCategory: CN=SubSchema,${SCHEMADN}
");
if (dump_subschema_auto == undefined) {
return;