diff options
| author | Michael Adam <obnox@samba.org> | 2009-01-26 13:28:15 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2009-02-06 10:20:08 +0100 |
| commit | 2c1d980abebef1748627bd953b0661f6d711b5cb (patch) | |
| tree | 8ae72695eb2f5bdb66e29ba0ee9c6bbca18710d2 | |
| parent | e0f91c89300a737f774d806d6c5ec3de3486d7f7 (diff) | |
| download | samba-2c1d980abebef1748627bd953b0661f6d711b5cb.tar.gz samba-2c1d980abebef1748627bd953b0661f6d711b5cb.tar.bz2 samba-2c1d980abebef1748627bd953b0661f6d711b5cb.zip | |
s3:idmap_tdb2: untangle assignment and check in idmap_tdb2_alloc_load()
Michael
| -rw-r--r-- | source3/winbindd/idmap_tdb2.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c index 8c96dcafa1..fb90dd097e 100644 --- a/source3/winbindd/idmap_tdb2.c +++ b/source3/winbindd/idmap_tdb2.c @@ -152,9 +152,8 @@ static NTSTATUS idmap_tdb2_alloc_load(void) /* Create high water marks for group and user id */ - if (((low_id = dbwrap_fetch_int32(idmap_tdb2, - HWM_USER)) == -1) || - (low_id < idmap_tdb2_state.low_uid)) { + low_id = dbwrap_fetch_int32(idmap_tdb2, HWM_USER); + if ((low_id == -1) || (low_id < idmap_tdb2_state.low_uid)) { if (!NT_STATUS_IS_OK(dbwrap_trans_store_int32( idmap_tdb2, HWM_USER, idmap_tdb2_state.low_uid))) { @@ -164,9 +163,8 @@ static NTSTATUS idmap_tdb2_alloc_load(void) } } - if (((low_id = dbwrap_fetch_int32(idmap_tdb2, - HWM_GROUP)) == -1) || - (low_id < idmap_tdb2_state.low_gid)) { + low_id = dbwrap_fetch_int32(idmap_tdb2, HWM_GROUP); + if ((low_id == -1) || (low_id < idmap_tdb2_state.low_gid)) { if (!NT_STATUS_IS_OK(dbwrap_trans_store_int32( idmap_tdb2, HWM_GROUP, idmap_tdb2_state.low_gid))) { |