diff options
Diffstat (limited to 'source4/gtk')
| -rw-r--r-- | source4/gtk/common/gtk-smb.c | 2 | ||||
| -rw-r--r-- | source4/gtk/tools/gepdump.c | 2 | ||||
| -rw-r--r-- | source4/gtk/tools/gwcrontab.c | 5 | ||||
| -rw-r--r-- | source4/gtk/tools/gwsam.c | 7 |
4 files changed, 10 insertions, 6 deletions
diff --git a/source4/gtk/common/gtk-smb.c b/source4/gtk/common/gtk-smb.c index e03c4096f0..a84f9f639d 100644 --- a/source4/gtk/common/gtk-smb.c +++ b/source4/gtk/common/gtk-smb.c @@ -95,7 +95,7 @@ static void gtk_rpc_binding_dialog_init (GtkRpcBindingDialog *gtk_rpc_binding_di gtk_rpc_binding_dialog->mem_ctx = talloc_init("gtk_rcp_binding_dialog"); - gtk_rpc_binding_dialog->credentials = talloc(gtk_rpc_binding_dialog->mem_ctx, struct cli_credentials); + gtk_rpc_binding_dialog->credentials = cli_credentials_init(gtk_rpc_binding_dialog->mem_ctx); cli_credentials_guess(gtk_rpc_binding_dialog->credentials); diff --git a/source4/gtk/tools/gepdump.c b/source4/gtk/tools/gepdump.c index 28234c006e..1bf938feb2 100644 --- a/source4/gtk/tools/gepdump.c +++ b/source4/gtk/tools/gepdump.c @@ -188,7 +188,7 @@ static void on_connect_clicked(GtkButton *btn, gpointer user_data) mem_ctx = talloc_init("connect"); bs = gtk_rpc_binding_dialog_get_binding_string (d, mem_ctx); - status = dcerpc_pipe_connect(&epmapper_pipe, bs, + status = dcerpc_pipe_connect(talloc_autofree_context(), &epmapper_pipe, bs, DCERPC_EPMAPPER_UUID, DCERPC_EPMAPPER_VERSION, cmdline_credentials); diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c index 47a7d68dc9..a1b57225db 100644 --- a/source4/gtk/tools/gwcrontab.c +++ b/source4/gtk/tools/gwcrontab.c @@ -103,7 +103,7 @@ on_connect_activate (GtkMenuItem *menuitem, mem_ctx = talloc_init("gwcrontab_connect"); /* If connected, get list of jobs */ - status = dcerpc_pipe_connect_b(&at_pipe, + status = dcerpc_pipe_connect_b(mem_ctx, &at_pipe, gtk_rpc_binding_dialog_get_binding(d, mem_ctx), DCERPC_ATSVC_UUID, DCERPC_ATSVC_VERSION, @@ -118,6 +118,7 @@ on_connect_activate (GtkMenuItem *menuitem, } gtk_widget_destroy(GTK_WIDGET(d)); + at_pipe = talloc_reference(talloc_autofree_context(), at_pipe); talloc_free(mem_ctx); update_joblist(); } @@ -126,7 +127,7 @@ void on_quit_activate (GtkMenuItem *menuitem, gpointer user_data) { - if(at_pipe)dcerpc_pipe_close(at_pipe); + talloc_free(at_pipe); gtk_main_quit(); } diff --git a/source4/gtk/tools/gwsam.c b/source4/gtk/tools/gwsam.c index 75a4b532f2..71765424d7 100644 --- a/source4/gtk/tools/gwsam.c +++ b/source4/gtk/tools/gwsam.c @@ -128,7 +128,7 @@ static void connect_sam(void) mem_ctx = talloc_init("gwsam_connect"); /* If connected, get list of jobs */ - status = dcerpc_pipe_connect_b(&sam_pipe, + status = dcerpc_pipe_connect_b(mem_ctx, &sam_pipe, gtk_rpc_binding_dialog_get_binding(d, mem_ctx), DCERPC_SAMR_UUID, DCERPC_SAMR_VERSION, gtk_rpc_binding_dialog_get_credentials(d) @@ -159,6 +159,8 @@ 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)); + + sam_pipe = talloc_reference(talloc_autofree_context(), sam_pipe); talloc_free(mem_ctx); } @@ -176,7 +178,8 @@ static void on_disconnect_activate (GtkMenuItem *menuitem, gpointer user_data) static void on_quit_activate (GtkMenuItem *menuitem, gpointer user_data) { - if(sam_pipe)dcerpc_pipe_close(sam_pipe); + talloc_free(sam_pipe); + gtk_main_quit(); } |