summaryrefslogtreecommitdiff
path: root/source3/passdb/pdb_interface.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-03-20 10:18:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:15:37 -0500
commit5aa66fd0393318586edb5ee17e5cad2236aa5c8b (patch)
tree8b27d1ef599353fb459a98d874be0da7d84b5e29 /source3/passdb/pdb_interface.c
parent492af5e91857fa27f68758354a3e35afcc84c238 (diff)
downloadsamba-5aa66fd0393318586edb5ee17e5cad2236aa5c8b.tar.gz
samba-5aa66fd0393318586edb5ee17e5cad2236aa5c8b.tar.bz2
samba-5aa66fd0393318586edb5ee17e5cad2236aa5c8b.zip
r14577: BUG Fixes:
* Add back in the import/export support to pdbedit * Fix segv in pam_smbpass * Cleanup some error paths in pdb_tdb and pdb_interface (This used to be commit df53d64910fbb96eb810102e986b3c337d54c463)
Diffstat (limited to 'source3/passdb/pdb_interface.c')
-rw-r--r--source3/passdb/pdb_interface.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 82890fee2d..7ff0214c72 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -273,15 +273,15 @@ BOOL pdb_getsampwnam(struct samu *sam_acct, const char *username)
return False;
}
- if (csamuser != NULL) {
+ if ( csamuser ) {
TALLOC_FREE(csamuser);
- csamuser = NULL;
}
pdb_force_pw_initialization( sam_acct );
- if ( (csamuser = samu_new( NULL )) != NULL )
+ if ( (csamuser = samu_new( NULL )) != NULL ) {
pdb_copy_sam_account(csamuser, sam_acct);
+ }
return True;
}