s3:winbind: in idmap_tdb2_id_to_sid(), use transaction wrapped stores.

When a mapping is not found, then the idmap script is called (if defined).
When this gives a reply for the desired id, this reply is stored in the db.

This patch wraps theses two store operations into a transaction by re-using
the idmap_tdb2_set_mapping_action() function previously defined
for idmap_tdb2_set_mapping().

Michael

diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c
index 540c3f85fceb9355c1dfb04610867f0b4b7b3607..6ae13d9777b1071ec84235d00ce9eb62580a7500 100644 (file)
--- a/source3/winbindd/idmap_tdb2.c
+++ b/source3/winbindd/idmap_tdb2.c
@@ -632,7 +632,8 @@ static NTSTATUS idmap_tdb2_id_to_sid(struct idmap_tdb2_context *ctx, struct id_m
        data = dbwrap_fetch_bystring(idmap_tdb2, keystr, keystr);
 
        if (!data.dptr) {
-               fstring sidstr;
+               char *sidstr;
+               struct idmap_tdb2_set_mapping_context store_state;
 
                DEBUG(10,("Record %s not found\n", keystr));
                if (idmap_tdb2_state.idmap_script == NULL) {
@@ -647,15 +648,17 @@ static NTSTATUS idmap_tdb2_id_to_sid(struct idmap_tdb2_context *ctx, struct id_m
                        goto done;
                }
 
-               if (sid_to_fstring(sidstr, map->sid)) {
-                       /* both forward and reverse mappings */
-                       dbwrap_store_bystring(idmap_tdb2, keystr,
-                                           string_term_tdb_data(sidstr), 
-                                           TDB_REPLACE);
-                       dbwrap_store_bystring(idmap_tdb2, sidstr,
-                                           string_term_tdb_data(keystr), 
-                                           TDB_REPLACE);
+               sidstr = sid_string_talloc(keystr, map->sid);
+               if (!sidstr) {
+                       ret = NT_STATUS_NO_MEMORY;
+                       goto done;
                }
+
+               store_state.ksidstr = sidstr;
+               store_state.kidstr = keystr;
+
+               ret = dbwrap_trans_do(idmap_tdb2, idmap_tdb2_set_mapping_action,
+                                     &store_state);
                goto done;
        }