Author: vlendec Date: 2007-05-29 18:14:54 +0000 (Tue, 29 May 2007) New Revision: 23221
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23221 Log: Fix a bad merge, avoid a memory leak and tdb lock problem Modified: branches/SAMBA_3_0/source/smbd/connection.c branches/SAMBA_3_0_26/source/smbd/connection.c Changeset: Modified: branches/SAMBA_3_0/source/smbd/connection.c =================================================================== --- branches/SAMBA_3_0/source/smbd/connection.c 2007-05-29 18:04:38 UTC (rev 23220) +++ branches/SAMBA_3_0/source/smbd/connection.c 2007-05-29 18:14:54 UTC (rev 23221) @@ -43,6 +43,7 @@ nt_errstr(status))); } + TALLOC_FREE(rec); return NT_STATUS_IS_OK(status); } Modified: branches/SAMBA_3_0_26/source/smbd/connection.c =================================================================== --- branches/SAMBA_3_0_26/source/smbd/connection.c 2007-05-29 18:04:38 UTC (rev 23220) +++ branches/SAMBA_3_0_26/source/smbd/connection.c 2007-05-29 18:14:54 UTC (rev 23221) @@ -43,6 +43,7 @@ nt_errstr(status))); } + TALLOC_FREE(rec); return NT_STATUS_IS_OK(status); }