Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test

(This used to be commit ea36c3add588061cf338deabb2d8952f2213a8bd)

1 files changed, 10 insertions, 9 deletions

diff --git a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
index d12e66bb26..4a3588e9ab 100644
--- a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
+++ b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
@@ -249,6 +249,8 @@ static void callback_do_reboot(GtkWidget *widget,
 		SAFE_FREE(buffer);
 		state->name_type_new = type;
 #endif
+		NetApiBufferFree((void *)buffer);
+
 		gtk_label_set_text(GTK_LABEL(state->label_current_name_buffer),
 				   state->name_buffer_new);
 		if (state->name_type_new == NetSetupDomainName) {
@@ -449,14 +451,8 @@ static void callback_do_join(GtkWidget *widget,
 							initial_workgroup_type,
 							state->name_buffer_initial,
 							err_str);
-
-			g_signal_connect_swapped(dialog, "response",
-						 G_CALLBACK(gtk_widget_destroy),
-						 dialog);
-
-			gtk_widget_show(dialog);
-
-			return;
+			gtk_dialog_run(GTK_DIALOG(dialog));
+			gtk_widget_destroy(dialog);
 		}
 
 	}
@@ -1298,8 +1294,12 @@ static int initialize_join_state(struct join_state *state,
 		if (status) {
 			return status;
 		}
-		state->name_buffer_initial = (char *)buffer;
+		state->name_buffer_initial = strdup(buffer);
+		if (!state->name_buffer_initial) {
+			return -1;
+		}
 		state->name_type_initial = type;
+		NetApiBufferFree((void *)buffer);
 	}
 
 	{
@@ -1317,6 +1317,7 @@ static int initialize_join_state(struct join_state *state,
 		if (!state->comment) {
 			return -1;
 		}
+		NetApiBufferFree(buffer);
 	}
 #if 0
 	{