From 2479b8305b71bc153f808827cd63618af8fe93d8 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 27 Feb 2006 21:28:19 +0000 Subject: r13729: Fix smbpasswd -x (This used to be commit 2afcbbfb6f2efcc2e10106b10a87365556013787) --- source3/passdb/pdb_tdb.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'source3/passdb/pdb_tdb.c') diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c index b0f8a11788..fdf22d9c42 100644 --- a/source3/passdb/pdb_tdb.c +++ b/source3/passdb/pdb_tdb.c @@ -1157,12 +1157,12 @@ static NTSTATUS tdbsam_delete_sam_account(struct pdb_methods *my_methods, struct uint32 rid; fstring name; - /* make sure we have an open handle to the tdb. Should have happened - at module initialization time */ - - if ( !tdbsam ) { - DEBUG(0,("tdbsam_delete_sam_account: tdbsam not open!\n")); - return NT_STATUS_NO_SUCH_USER; + /* open the database */ + + if ( !tdbsam_open( tdbsam_filename ) ) { + DEBUG(0,("tdbsam_delete_sam_account: failed to open %s!\n", + tdbsam_filename)); + return NT_STATUS_ACCESS_DENIED; } fstrcpy(name, pdb_get_username(sam_pass)); @@ -1176,13 +1176,6 @@ static NTSTATUS tdbsam_delete_sam_account(struct pdb_methods *my_methods, struct rid = pdb_get_user_rid(sam_pass); - /* open the database */ - - if ( !tdbsam_open( tdbsam_filename ) ) { - DEBUG(0,("tdbsam_delete_sam_account: failed to open %s!\n", tdbsam_filename)); - return NT_STATUS_ACCESS_DENIED; - } - /* it's outaa here! 8^) */ if ( tdb_delete(tdbsam, key) != TDB_SUCCESS ) { -- cgit