diff options
| author | Volker Lendecke <vl@samba.org> | 2012-01-06 17:19:54 +0100 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2012-01-18 14:48:04 +0100 |
| commit | 45e61fcf61ed9863fbe2b116fe0763fc139bbe0d (patch) | |
| tree | 06ea9ead2285b4a671d102edb8824422f7325703 /source3/utils/net_idmap.c | |
| parent | e75c436fe6a9ee44f6adc744b6269e99f4920431 (diff) | |
| download | samba-45e61fcf61ed9863fbe2b116fe0763fc139bbe0d.tar.gz samba-45e61fcf61ed9863fbe2b116fe0763fc139bbe0d.tar.bz2 samba-45e61fcf61ed9863fbe2b116fe0763fc139bbe0d.zip | |
s3: Add a "lock_order" argument to db_open
This will be used to enforce a lock hierarchy between the databases. We have
seen deadlocks between locking.tdb, brlock.tdb, serverid.tdb and notify*.tdb.
These should be fixed by refusing a dbwrap_fetch_locked that does not follow a
defined lock hierarchy.
Diffstat (limited to 'source3/utils/net_idmap.c')
| -rw-r--r-- | source3/utils/net_idmap.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c index 3a3ae21f07..22734eecd8 100644 --- a/source3/utils/net_idmap.c +++ b/source3/utils/net_idmap.c @@ -131,7 +131,8 @@ static int net_idmap_dump(struct net_context *c, int argc, const char **argv) } d_fprintf(stderr, _("dumping id mapping from %s\n"), dbfile); - db = db_open(mem_ctx, dbfile, 0, TDB_DEFAULT, O_RDONLY, 0); + db = db_open(mem_ctx, dbfile, 0, TDB_DEFAULT, O_RDONLY, 0, + DBWRAP_LOCK_ORDER_1); if (db == NULL) { d_fprintf(stderr, _("Could not open idmap db (%s): %s\n"), dbfile, strerror(errno)); @@ -240,7 +241,8 @@ static int net_idmap_restore(struct net_context *c, int argc, const char **argv) input = stdin; } - db = db_open(mem_ctx, dbfile, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0644); + db = db_open(mem_ctx, dbfile, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0644, + DBWRAP_LOCK_ORDER_1); if (db == NULL) { d_fprintf(stderr, _("Could not open idmap db (%s): %s\n"), dbfile, strerror(errno)); @@ -444,7 +446,8 @@ static int net_idmap_delete(struct net_context *c, int argc, const char **argv) } d_fprintf(stderr, _("deleting id mapping from %s\n"), dbfile); - db = db_open(mem_ctx, dbfile, 0, TDB_DEFAULT, O_RDWR, 0); + db = db_open(mem_ctx, dbfile, 0, TDB_DEFAULT, O_RDWR, 0, + DBWRAP_LOCK_ORDER_1); if (db == NULL) { d_fprintf(stderr, _("Could not open idmap db (%s): %s\n"), dbfile, strerror(errno)); @@ -616,7 +619,8 @@ static int net_idmap_aclmapset(struct net_context *c, int argc, const char **arg } if (!(db = db_open(mem_ctx, argv[0], 0, TDB_DEFAULT, - O_RDWR|O_CREAT, 0600))) { + O_RDWR|O_CREAT, 0600, + DBWRAP_LOCK_ORDER_1))) { d_fprintf(stderr, _("db_open failed: %s\n"), strerror(errno)); goto fail; } |