diff options
| author | Jeremy Allison <jra@samba.org> | 2009-02-17 13:43:28 -0800 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-02-18 09:04:29 +0100 |
| commit | 1a8ab5928b130cd02f236325303169010b3b4654 (patch) | |
| tree | 1556f49afc57995348f8d39356d9063394645950 /source | |
| parent | 9031f50797c57a1217e47c73def4024b3ddae943 (diff) | |
| download | samba-1a8ab5928b130cd02f236325303169010b3b4654.tar.gz | |
Fix bug #6117 - Samba 3.3.0: pdbedit -a core dumps.
Jeremy.
(cherry picked from commit ca2c1eea4a766a3ee0d073520b19ce16f0586678)
Diffstat (limited to 'source')
| -rw-r--r-- | source/passdb/pdb_tdb.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source/passdb/pdb_tdb.c b/source/passdb/pdb_tdb.c index eab91100fdd..143a2e23908 100644 --- a/source/passdb/pdb_tdb.c +++ b/source/passdb/pdb_tdb.c @@ -357,7 +357,7 @@ static NTSTATUS tdbsam_getsampwrid (struct pdb_methods *my_methods, /* open the database */ if ( !tdbsam_open( tdbsam_filename ) ) { - DEBUG(0,("tdbsam_getsampwnam: failed to open %s!\n", tdbsam_filename)); + DEBUG(0,("tdbsam_getsampwrid: failed to open %s!\n", tdbsam_filename)); return NT_STATUS_ACCESS_DENIED; } @@ -400,6 +400,11 @@ static bool tdb_delete_samacct_only( struct samu *sam_pass ) slprintf(keystr, sizeof(keystr)-1, "%s%s", USERPREFIX, name); /* it's outaa here! 8^) */ + if ( !tdbsam_open( tdbsam_filename ) ) { + DEBUG(0,("tdb_delete_samacct_only: failed to open %s!\n", + tdbsam_filename)); + return false; + } status = dbwrap_delete_bystring(db_sam, keystr); if (!NT_STATUS_IS_OK(status)) { @@ -777,6 +782,12 @@ static bool tdbsam_new_rid(struct pdb_methods *methods, uint32 *prid) rid = BASE_RID; /* Default if not set */ + if (!tdbsam_open(tdbsam_filename)) { + DEBUG(0,("tdbsam_new_rid: failed to open %s!\n", + tdbsam_filename)); + return false; + } + if (dbwrap_change_uint32_atomic(db_sam, NEXT_RID_STRING, &rid, 1) != 0) { DEBUG(3, ("tdbsam_new_rid: Failed to increase %s\n", NEXT_RID_STRING)); |