diff options
| author | Karolin Seeger <kseeger@samba.org> | 2008-11-17 14:02:54 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-11-17 14:02:54 +0100 |
| commit | a04c5dec1aabc81b7af89742f47e5db3130e2e06 (patch) | |
| tree | d781f9315304e3b0b244a9ab24f295c20ee49043 | |
| parent | 54e0177e5edfba2376021df7a3439e1a479e99b4 (diff) | |
| download | samba-a04c5dec1aabc81b7af89742f47e5db3130e2e06.tar.gz samba-a04c5dec1aabc81b7af89742f47e5db3130e2e06.tar.xz samba-a04c5dec1aabc81b7af89742f47e5db3130e2e06.zip | |
Revert "fixed segv on startup with trusted domains"
This reverts commit 8b41be0c7080edaf9fb33e583c66f2ef50a91643.
| -rw-r--r-- | source/winbindd/idmap_tdb2.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/source/winbindd/idmap_tdb2.c b/source/winbindd/idmap_tdb2.c index ffb10b4d346..ab89e615f78 100644 --- a/source/winbindd/idmap_tdb2.c +++ b/source/winbindd/idmap_tdb2.c @@ -235,9 +235,7 @@ static NTSTATUS idmap_tdb2_allocate_id(struct unixid *xid) NTSTATUS status; status = idmap_tdb2_open_perm_db(); - if (!NT_STATUS_IS_OK(status)) { - return status; - } + NT_STATUS_NOT_OK_RETURN(status); /* Get current high water mark */ switch (xid->type) { @@ -299,12 +297,6 @@ static NTSTATUS idmap_tdb2_get_hwm(struct unixid *xid) const char *hwmtype; uint32_t hwm; uint32_t high_hwm; - NTSTATUS status; - - status = idmap_tdb2_open_perm_db(); - if (!NT_STATUS_IS_OK(status)) { - return status; - } /* Get current high water mark */ switch (xid->type) { @@ -560,12 +552,6 @@ static NTSTATUS idmap_tdb2_id_to_sid(struct idmap_tdb2_context *ctx, struct id_m NTSTATUS ret; TDB_DATA data; char *keystr; - NTSTATUS status; - - status = idmap_tdb2_open_perm_db(); - if (!NT_STATUS_IS_OK(status)) { - return status; - } if (!ctx || !map) { return NT_STATUS_INVALID_PARAMETER; @@ -661,12 +647,6 @@ static NTSTATUS idmap_tdb2_sid_to_id(struct idmap_tdb2_context *ctx, struct id_m TDB_DATA data; char *keystr; unsigned long rec_id = 0; - NTSTATUS status; - - status = idmap_tdb2_open_perm_db(); - if (!NT_STATUS_IS_OK(status)) { - return status; - } if ((keystr = sid_string_talloc(ctx, map->sid)) == NULL) { DEBUG(0, ("Out of memory!\n")); |