The branch, master has been updated
via c91afe9... security.idl - push generated code diff
via c3509d8... s4:resolve_oids LDB module - not really a change but a
nicer method to call "talloc_reference"
from 9447f86... Don't exit(0) on error
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c91afe9596ac03795aa0ef38038c191a3b439430
Author: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de>
Date: Tue Mar 16 15:00:33 2010 +0100
security.idl - push generated code diff
commit c3509d88a4920e7dcbc77d5af089c50f71642d0a
Author: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de>
Date: Tue Mar 16 14:07:51 2010 +0100
s4:resolve_oids LDB module - not really a change but a nicer method to call
"talloc_reference"
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/security.h | 13 +++++++++++++
librpc/idl/security.idl | 2 +-
source4/dsdb/samdb/ldb_modules/resolve_oids.c | 3 ++-
3 files changed, 16 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/security.h b/librpc/gen_ndr/security.h
index 23439be..58ab075 100644
--- a/librpc/gen_ndr/security.h
+++ b/librpc/gen_ndr/security.h
@@ -154,6 +154,19 @@
#define DOMAIN_RID_RAS_SERVERS ( 553 )
#define NT4_ACL_REVISION ( SECURITY_ACL_REVISION_NT4 )
#define SD_REVISION ( SECURITY_DESCRIPTOR_REVISION_1 )
+#define GUID_DRS_ALLOCATE_RIDS ( "1abd7cf8-0a99-11d1-adbb-00c04fd8d5cd" )
+#define GUID_DRS_CHANGE_DOMAIN_MASTER (
"014bf69c-7b3b-11d1-85f6-08002be74fab" )
+#define GUID_DRS_CHANGE_INFR_MASTER (
"cc17b1fb-33d9-11d2-97d4-00c04fd8d5cd" )
+#define GUID_DRS_CHANGE_PDC ( "bae50096-4752-11d1-9052-00c04fc2d4cf" )
+#define GUID_DRS_CHANGE_RID_MASTER (
"d58d5f36-0a98-11d1-adbb-00c04fd8d5cd" )
+#define GUID_DRS_CHANGE_SCHEMA_MASTER (
"e12b56b6-0a95-11d1-adbb-00c04fd8d5cd" )
+#define GUID_DRS_GET_CHANGES ( "1131f6aa-9c07-11d1-f79f-00c04fc2dcd2" )
+#define GUID_DRS_GET_ALL_CHANGES (
"1131f6ad-9c07-11d1-f79f-00c04fc2dcd2" )
+#define GUID_DRS_GET_FILTERED_ATTRIBUTES (
"89e95b76-444d-4c62-991a-0facbeda640c" )
+#define GUID_DRS_MANAGE_TOPOLOGY (
"1131f6ac-9c07-11d1-f79f-00c04fc2dcd2" )
+#define GUID_DRS_MONITOR_TOPOLOGY (
"f98340fb-7c5b-4cdb-a00b-2ebdfa115a96" )
+#define GUID_DRS_REPL_SYNCRONIZE (
"1131f6ab-9c07-11d1-f79f-00c04fc2dcd2" )
+#define GUID_DRS_RO_REPL_SECRET_SYNC (
"1131f6ae-9c07-11d1-f79f-00c04fc2dcd2" )
struct dom_sid {
uint8_t sid_rev_num;
int8_t num_auths;/* [range(0,15)] */
diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl
index e7ae854..d1c13f1 100644
--- a/librpc/idl/security.idl
+++ b/librpc/idl/security.idl
@@ -496,4 +496,4 @@ interface security
const string GUID_DRS_MONITOR_TOPOLOGY =
"f98340fb-7c5b-4cdb-a00b-2ebdfa115a96";
const string GUID_DRS_REPL_SYNCRONIZE =
"1131f6ab-9c07-11d1-f79f-00c04fc2dcd2";
const string GUID_DRS_RO_REPL_SECRET_SYNC =
"1131f6ae-9c07-11d1-f79f-00c04fc2dcd2";
-}
\ No newline at end of file
+}
diff --git a/source4/dsdb/samdb/ldb_modules/resolve_oids.c
b/source4/dsdb/samdb/ldb_modules/resolve_oids.c
index 9928945..16cabc1 100644
--- a/source4/dsdb/samdb/ldb_modules/resolve_oids.c
+++ b/source4/dsdb/samdb/ldb_modules/resolve_oids.c
@@ -521,7 +521,8 @@ static int resolve_oids_search(struct ldb_module *module,
struct ldb_request *re
return LDB_ERR_OPERATIONS_ERROR;
}
- if (talloc_reference(tree, schema) == NULL) {
+ schema = talloc_reference(tree, schema);
+ if (!schema) {
ldb_oom(ldb);
return LDB_ERR_OPERATIONS_ERROR;
}
--
Samba Shared Repository
