diff options
| author | Michael Adam <obnox@samba.org> | 2011-08-24 13:08:13 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-10-11 14:17:56 +0200 |
| commit | 0e28448a780cf231ae38fe03a85cf6e1ea9dded0 (patch) | |
| tree | 91878c39866520bc06d968cd44cd8a86995cc8ad /source3/winbindd/idmap_tdb2.c | |
| parent | 25a9978c2c4d00eb64b212170f64f5cc136e032a (diff) | |
| download | samba-0e28448a780cf231ae38fe03a85cf6e1ea9dded0.tar.gz samba-0e28448a780cf231ae38fe03a85cf6e1ea9dded0.tar.bz2 samba-0e28448a780cf231ae38fe03a85cf6e1ea9dded0.zip | |
s3:dbwrap: convert dbwrap_fetch(), dbwrap_fetch_bystring() and dbwrap_fetch_bystring_upper() to NTSTATUS
Diffstat (limited to 'source3/winbindd/idmap_tdb2.c')
| -rw-r--r-- | source3/winbindd/idmap_tdb2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c index 07b91e5b00..456bb8f509 100644 --- a/source3/winbindd/idmap_tdb2.c +++ b/source3/winbindd/idmap_tdb2.c @@ -355,8 +355,8 @@ static NTSTATUS idmap_tdb2_set_mapping_action(struct db_context *db, DEBUG(10, ("Storing %s <-> %s map\n", state->ksidstr, state->kidstr)); /* check wheter sid mapping is already present in db */ - data = dbwrap_fetch_bystring(db, tmp_ctx, state->ksidstr); - if (data.dptr) { + ret = dbwrap_fetch_bystring(db, tmp_ctx, state->ksidstr, &data); + if (!NT_STATUS_IS_OK(ret)) { ret = NT_STATUS_OBJECT_NAME_COLLISION; goto done; } @@ -585,9 +585,9 @@ static NTSTATUS idmap_tdb2_id_to_sid(struct idmap_domain *dom, struct id_map *ma DEBUG(10,("Fetching record %s\n", keystr)); /* Check if the mapping exists */ - data = dbwrap_fetch_bystring(ctx->db, keystr, keystr); + status = dbwrap_fetch_bystring(ctx->db, keystr, keystr, &data); - if (!data.dptr) { + if (!NT_STATUS_IS_OK(status)) { char *sidstr; struct idmap_tdb2_set_mapping_context store_state; @@ -659,8 +659,8 @@ static NTSTATUS idmap_tdb2_sid_to_id(struct idmap_domain *dom, struct id_map *ma DEBUG(10,("Fetching record %s\n", keystr)); /* Check if sid is present in database */ - data = dbwrap_fetch_bystring(ctx->db, tmp_ctx, keystr); - if (!data.dptr) { + ret = dbwrap_fetch_bystring(ctx->db, tmp_ctx, keystr, &data); + if (!NT_STATUS_IS_OK(ret)) { char *idstr; struct idmap_tdb2_set_mapping_context store_state; |