Added ability to remove id mappings in wbinfo and libwbclient.

[metze/samba/wip.git] / source3 / winbindd / idmap_tdb.c

diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c
index f9d3a9fbffdd68dc196126168ea757bee6148742..7c4de5f6fba9543681739d7d799f79f2e36dd7a4 100644 (file)
--- a/source3/winbindd/idmap_tdb.c
+++ b/source3/winbindd/idmap_tdb.c
@@ -875,8 +875,13 @@ static NTSTATUS idmap_tdb_set_mapping(struct idmap_domain *dom, const struct id_
        ksid = string_term_tdb_data(ksidstr);
 
        /* *DELETE* previous mappings if any.
-        * This is done both SID and [U|G]ID passed in */
-       
+        * This is done for both the SID and [U|G]ID passed in */
+
+       /* NOTE: We should lock both the ksid and kid records here, before
+        * making modifications.  However, because tdb_chainlock() is a
+        * blocking call we could create an unrecoverable deadlock, so for now
+        * we only lock the ksid record. */
+
        /* Lock the record for this SID. */
        if (tdb_chainlock(ctx->tdb, ksid) != 0) {
                DEBUG(10,("Failed to lock record %s. Error %s\n",
@@ -981,6 +986,11 @@ static NTSTATUS idmap_tdb_remove_mapping(struct idmap_domain *dom, const struct
        ksid = string_term_tdb_data(ksidstr);
        kid = string_term_tdb_data(kidstr);
 
+       /* NOTE: We should lock both the ksid and kid records here, before
+        * making modifications.  However, because tdb_chainlock() is a
+        * blocking call we could create an unrecoverable deadlock, so for now
+        * we only lock the ksid record. */
+
        /* Lock the record for this SID. */
        if (tdb_chainlock(ctx->tdb, ksid) != 0) {
                DEBUG(10,("Failed to lock record %s. Error %s\n",