r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies for the

large commit. I thought this was worthwhile to get done for
consistency.
(This used to be commit ec32b22ed5ec224f6324f5e069d15e92e38e15c0)

6 files changed, 20 insertions, 20 deletions

diff --git a/source4/gtk/common/gtk-smb.c b/source4/gtk/common/gtk-smb.c
index 639aa68bac..f42516c854 100644
--- a/source4/gtk/common/gtk-smb.c
+++ b/source4/gtk/common/gtk-smb.c
@@ -319,7 +319,7 @@ const char *gtk_rpc_binding_dialog_get_host(GtkRpcBindingDialog *d)
 
 struct dcerpc_binding *gtk_rpc_binding_dialog_get_binding(GtkRpcBindingDialog *d, TALLOC_CTX *mem_ctx)
 {
-	struct dcerpc_binding *binding = talloc_p(mem_ctx, struct dcerpc_binding);
+	struct dcerpc_binding *binding = talloc(mem_ctx, struct dcerpc_binding);
 
 	ZERO_STRUCT(binding->object);
 
diff --git a/source4/gtk/common/select.c b/source4/gtk/common/select.c
index 1409a625d0..082f449a0c 100644
--- a/source4/gtk/common/select.c
+++ b/source4/gtk/common/select.c
@@ -142,7 +142,7 @@ GtkWidget *gtk_select_domain_dialog_new (struct dcerpc_pipe *sam_pipe)
 	status = dcerpc_samr_Connect(sam_pipe, mem_ctx, &cr);
 	if (!NT_STATUS_IS_OK(status)) {
 		gtk_show_ntstatus(NULL, status);
-		talloc_destroy(mem_ctx);
+		talloc_free(mem_ctx);
 		return GTK_WIDGET(d);
 	}
 
@@ -168,11 +168,11 @@ GtkWidget *gtk_select_domain_dialog_new (struct dcerpc_pipe *sam_pipe)
 	status = dcerpc_samr_Close(sam_pipe, mem_ctx, &dr);
 	if (!NT_STATUS_IS_OK(status)) {
 		gtk_show_ntstatus(NULL, status);
-		talloc_destroy(mem_ctx);
+		talloc_free(mem_ctx);
 		return GTK_WIDGET ( d );
 	}
 
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 
 	return GTK_WIDGET ( d );
 }
diff --git a/source4/gtk/tools/gepdump.c b/source4/gtk/tools/gepdump.c
index f6e39aacb2..4c8595f87c 100644
--- a/source4/gtk/tools/gepdump.c
+++ b/source4/gtk/tools/gepdump.c
@@ -118,7 +118,7 @@ static void refresh_eps(void)
 	struct policy_handle handle;
 	TALLOC_CTX *mem_ctx = talloc_init("dump");
 
-	talloc_destroy(eps_ctx);
+	talloc_free(eps_ctx);
 
 	ZERO_STRUCT(handle);
 
@@ -152,10 +152,10 @@ static void refresh_eps(void)
 
 	if (!NT_STATUS_IS_OK(status)) {
 		gtk_show_ntstatus(mainwin, status);
-		talloc_destroy(mem_ctx);
+		talloc_free(mem_ctx);
 		return;
 	}
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 }
 
 static void on_refresh_clicked (GtkButton *btn, gpointer user_data)
diff --git a/source4/gtk/tools/gregedit.c b/source4/gtk/tools/gregedit.c
index 6ca7fb653f..918ebd6945 100644
--- a/source4/gtk/tools/gregedit.c
+++ b/source4/gtk/tools/gregedit.c
@@ -990,7 +990,7 @@ static GtkWidget* create_savefilewin (void)
 
 	gtk_main ();
 
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	return 0;
 }
 
diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c
index b41c0ffdcb..063469e334 100644
--- a/source4/gtk/tools/gwcrontab.c
+++ b/source4/gtk/tools/gwcrontab.c
@@ -70,7 +70,7 @@ void update_joblist(void)
                         -1);
 
 	}
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	gtk_widget_set_sensitive(tasks, TRUE);
 }
 
@@ -115,12 +115,12 @@ on_connect_activate                    (GtkMenuItem     *menuitem,
 		gtk_show_ntstatus(mainwin, status);
 		at_pipe = NULL;
 		gtk_widget_destroy(GTK_WIDGET(d));
-		talloc_destroy(mem_ctx);
+		talloc_free(mem_ctx);
 		return;
 	}
 	gtk_widget_destroy(GTK_WIDGET(d));
 
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	update_joblist();
 }
 
@@ -164,12 +164,12 @@ on_new_activate                        (GtkMenuItem     *menuitem,
 
 	status = dcerpc_atsvc_JobAdd(at_pipe, mem_ctx, &r);
 	if(!NT_STATUS_IS_OK(status)) {
-		talloc_destroy(mem_ctx);
+		talloc_free(mem_ctx);
 		gtk_show_ntstatus(mainwin, status);
 		return;
 	}
 	
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 	gtk_widget_destroy(d);
 	
 	d = gtk_message_dialog_new (GTK_WINDOW(mainwin), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "Job Id: %d", r.out.job_id);
@@ -200,7 +200,7 @@ on_delete_activate                     (GtkMenuItem     *menuitem,
 
 		mem_ctx = talloc_init("del_job");
 		status = dcerpc_atsvc_JobDel(at_pipe, mem_ctx, &r);
-		talloc_destroy(mem_ctx);
+		talloc_free(mem_ctx);
 		if(!NT_STATUS_IS_OK(status)) {
 			gtk_show_ntstatus(mainwin, status);
 			return;
diff --git a/source4/gtk/tools/gwsam.c b/source4/gtk/tools/gwsam.c
index d4da7a2fdf..7d9abde3d3 100644
--- a/source4/gtk/tools/gwsam.c
+++ b/source4/gtk/tools/gwsam.c
@@ -58,12 +58,12 @@ void update_userlist(void)
 	status = dcerpc_samr_EnumDomainUsers(sam_pipe, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
 		gtk_show_ntstatus(mainwin, status);
-		talloc_destroy(mem_ctx);
+		talloc_free(mem_ctx);
 		return;
 	}
 
 	if (!r.out.sam || r.out.sam->count == 0) {
-		talloc_destroy(mem_ctx);
+		talloc_free(mem_ctx);
 		return;
 	}
 
@@ -75,7 +75,7 @@ void update_userlist(void)
 		//			ret = False;
 		//		}
 	}
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 }
 
 void
@@ -139,7 +139,7 @@ static void connect_sam(void)
 		gtk_show_ntstatus(mainwin, status);
 		sam_pipe = NULL;
 		gtk_widget_destroy(GTK_WIDGET(d));
-		talloc_destroy(mem_ctx);
+		talloc_free(mem_ctx);
 		return;
 	}
 
@@ -152,7 +152,7 @@ static void connect_sam(void)
 		gtk_show_ntstatus(mainwin, status);
 		sam_pipe = NULL;
 		gtk_widget_destroy(GTK_WIDGET(d));
-		talloc_destroy(mem_ctx);
+		talloc_free(mem_ctx);
 		return;
 	}
 
@@ -160,7 +160,7 @@ static void connect_sam(void)
 	gtk_widget_set_sensitive (mnu_disconnect, TRUE);
 	gtk_window_set_title (GTK_WINDOW (mainwin), talloc_asprintf(mem_ctx, "User Manager - Connected to %s", gtk_rpc_binding_dialog_get_host(d)));
 	gtk_widget_destroy(GTK_WIDGET(d));
-	talloc_destroy(mem_ctx);
+	talloc_free(mem_ctx);
 
 }