Author: idra
Date: 2006-12-01 16:13:06 +0000 (Fri, 01 Dec 2006)
New Revision: 19984

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

Log:

Must have been drunk yesterday.
Freeing memctx is all we need, fix double free stupidity


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


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/sesssetup.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/sesssetup.c  2006-12-01 15:16:37 UTC (rev 
19983)
+++ branches/SAMBA_3_0/source/smbd/sesssetup.c  2006-12-01 16:13:06 UTC (rev 
19984)
@@ -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));
                }
        }
@@ -335,6 +334,8 @@
        /* setup the string used by %U */
        
        sub_set_smb_name( real_username );
+C_FR
+C_FREE
        reload_services(True);
 
        if ( map_domainuser_to_guest ) {
@@ -352,7 +353,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 +366,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 +389,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 +433,6 @@
        data_blob_free(&ap_rep_wrapped);
        data_blob_free(&response);
        TALLOC_FREE(mem_ctx);
-       TALLOC_FREE(pw);
 
        return -1; /* already replied */
 }

Reply via email to