summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-09-13 08:04:04 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:39 -0500
commit92c1eba403a1f9d1f2b8dce094fbcc86aa7e8c07 (patch)
treededc196bb8b458c8ac93f61215e07740edf07bc8
parent4b9cba501e3af35f2bd30e9c6cd03b7f82ea2f75 (diff)
downloadsamba-92c1eba403a1f9d1f2b8dce094fbcc86aa7e8c07.tar.gz
samba-92c1eba403a1f9d1f2b8dce094fbcc86aa7e8c07.tar.bz2
samba-92c1eba403a1f9d1f2b8dce094fbcc86aa7e8c07.zip
r2312: Fix for bugid #1667, smbpasswd file could be left locked on
some error exits. Jeremy. (This used to be commit e2b0b9fb72559a9629b116a7e063de08a12e9eb1)
-rw-r--r--source3/passdb/pdb_smbpasswd.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index 6ebac1c01a..6bb9085268 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -898,6 +898,8 @@ static BOOL mod_smbfilepwd_entry(struct smbpasswd_privates *smbpasswd_state, con
} else {
DEBUG(0,("mod_smbfilepwd_entry: Using old smbpasswd format. This is no longer supported.!\n"));
DEBUG(0,("mod_smbfilepwd_entry: No changes made, failing.!\n"));
+ pw_file_unlock(lockfd, &(smbpasswd_state->pw_file_lock_depth));
+ fclose(fp);
return False;
}