git.samba.org
/
kamenim
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
654e010
)
s4-schema_load: Strip a pointless check
author
Kamen Mazdrashki
<kamenim@samba.org>
Sat, 4 Dec 2010 21:03:21 +0000
(23:03 +0200)
committer
Kamen Mazdrashki
<kamenim@samba.org>
Sun, 5 Dec 2010 22:18:47 +0000
(
00:18
+0200)
If *schema is NULL, then dsdb_schema_from_ldb_results()
call should have failed
source4/dsdb/samdb/ldb_modules/schema_load.c
patch
|
blob
|
history
diff --git
a/source4/dsdb/samdb/ldb_modules/schema_load.c
b/source4/dsdb/samdb/ldb_modules/schema_load.c
index ddc3b3f0c95c4895b05e2baaf38bf988c6b3b3c5..4b6fc4690b12d2cf1495b3cc5c21d4d9e4d078fe 100644
(file)
--- a/
source4/dsdb/samdb/ldb_modules/schema_load.c
+++ b/
source4/dsdb/samdb/ldb_modules/schema_load.c
@@
-239,9
+239,7
@@
static int dsdb_schema_from_db(struct ldb_module *module, struct ldb_dn *schema_
/* "dsdb_set_schema()" steals schema into the ldb_context */
ret = dsdb_set_schema(ldb, (*schema));
- if (*schema != NULL) {
- (*schema)->refresh_in_progress = false;
- }
+ (*schema)->refresh_in_progress = false;
if (ret != LDB_SUCCESS) {
ldb_debug_set(ldb, LDB_DEBUG_FATAL,