git.samba.org
/
amitay
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8da3d7c
)
s3:idmap_tdb2: open the db after loading the ranges in idmap_tdb2_db_init().
author
Michael Adam
<obnox@samba.org>
Wed, 16 Jun 2010 13:08:16 +0000
(15:08 +0200)
committer
Michael Adam
<obnox@samba.org>
Sat, 14 Aug 2010 00:10:42 +0000
(
02:10
+0200)
source3/winbindd/idmap_tdb2.c
patch
|
blob
|
history
diff --git
a/source3/winbindd/idmap_tdb2.c
b/source3/winbindd/idmap_tdb2.c
index 1db880a48b14bf0e104031f88c4a2130ef7ef3ef..f7935fb3b93771cb3da7c406901a2e8b1c269e01 100644
(file)
--- a/
source3/winbindd/idmap_tdb2.c
+++ b/
source3/winbindd/idmap_tdb2.c
@@
-329,9
+329,6
@@
static NTSTATUS idmap_tdb2_db_init(struct idmap_domain *dom,
struct idmap_tdb2_context *ctx;
NTSTATUS status;
struct idmap_tdb2_context *ctx;
NTSTATUS status;
- status = idmap_tdb2_open_db();
- NT_STATUS_NOT_OK_RETURN(status);
-
ctx = talloc(dom, struct idmap_tdb2_context);
if ( ! ctx) {
DEBUG(0, ("Out of memory!\n"));
ctx = talloc(dom, struct idmap_tdb2_context);
if ( ! ctx) {
DEBUG(0, ("Out of memory!\n"));
@@
-393,6
+390,11
@@
static NTSTATUS idmap_tdb2_db_init(struct idmap_domain *dom,
ctx->filter_high_id = 0;
}
ctx->filter_high_id = 0;
}
+ ret = idmap_tdb2_open_db();
+ if (!NT_STATUS_IS_OK(ret)) {
+ goto failed;
+ }
+
dom->private_data = ctx;
return NT_STATUS_OK;
dom->private_data = ctx;
return NT_STATUS_OK;