svn commit: samba r19985 - in branches/SAMBA_3_0_24/source/smbd: .

idra at samba.org idra at samba.org
Fri Dec 1 16:14:28 GMT 2006


Author: idra
Date: 2006-12-01 16:14:28 +0000 (Fri, 01 Dec 2006)
New Revision: 19985

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19985

Log:

sync up woith 3_0


Modified:
   branches/SAMBA_3_0_24/source/smbd/sesssetup.c


Changeset:
Modified: branches/SAMBA_3_0_24/source/smbd/sesssetup.c
===================================================================
--- branches/SAMBA_3_0_24/source/smbd/sesssetup.c	2006-12-01 16:13:06 UTC (rev 19984)
+++ branches/SAMBA_3_0_24/source/smbd/sesssetup.c	2006-12-01 16:14:28 UTC (rev 19985)
@@ -302,8 +302,7 @@
 			DEBUG(1, ("PAM account restriction prevents user login\n"));
 			data_blob_free(&ap_rep);
 			data_blob_free(&session_key);
-			talloc_destroy(mem_ctx);
-			TALLOC_FREE(pw);
+			TALLOC_FREE(mem_ctx);
 			return ERROR_NT(nt_status_squash(ret));
 		}
 	}
@@ -327,7 +326,7 @@
 			SAFE_FREE(client);
 			data_blob_free(&ap_rep);
 			data_blob_free(&session_key);
-			talloc_destroy(mem_ctx);
+			TALLOC_FREE(mem_ctx);
 			return ERROR_NT(nt_status_squash(NT_STATUS_LOGON_FAILURE));
 		}
 	}
@@ -352,7 +351,6 @@
 			data_blob_free(&ap_rep);
 			data_blob_free(&session_key);
 			TALLOC_FREE(mem_ctx);
-			TALLOC_FREE(pw);
 			return ERROR_NT(nt_status_squash(ret));
 		}
 
@@ -366,7 +364,6 @@
 			data_blob_free(&ap_rep);
 			data_blob_free(&session_key);
 			TALLOC_FREE(mem_ctx);
-			TALLOC_FREE(pw);
 			return ERROR_NT(nt_status_squash(ret));
 		}
 
@@ -390,7 +387,6 @@
 			SAFE_FREE(client);
 			data_blob_free(&ap_rep);
 			data_blob_free(&session_key);
-			TALLOC_FREE(pw);
 			TALLOC_FREE( mem_ctx );
 			TALLOC_FREE( server_info );
 			return ERROR_NT(nt_status_squash(ret));
@@ -435,7 +431,6 @@
 	data_blob_free(&ap_rep_wrapped);
 	data_blob_free(&response);
 	TALLOC_FREE(mem_ctx);
-	TALLOC_FREE(pw);
 
 	return -1; /* already replied */
 }



More information about the samba-cvs mailing list