[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2327-g47146ef

Günther Deschner gd at samba.org
Wed May 7 23:10:09 GMT 2008


The branch, v3-3-test has been updated
       via  47146effc1c2bca516d4fbccf221b5b0e02737bf (commit)
      from  b121a5acb2ef0bb3067d953b028696175432f10d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 47146effc1c2bca516d4fbccf221b5b0e02737bf
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 8 01:07:10 2008 +0200

    netdomjoin-gui: before prompting for creds, ask dsgetdcname for a dc.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 .../examples/netdomjoin-gui/netdomjoin-gui.c       |   35 ++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
index 5ce4ca2..a11b0eb 100644
--- a/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
+++ b/source/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
@@ -670,6 +670,41 @@ static void callback_do_join(GtkWidget *widget,
 
 	}
 
+	/* before prompting for creds, make sure we can find a dc */
+
+	if (domain_join) {
+
+		struct DOMAIN_CONTROLLER_INFO *dc_info = NULL;
+
+		status = DsGetDcName(NULL,
+				     state->name_buffer_new,
+				     NULL,
+				     NULL,
+				     0,
+				     &dc_info);
+		if (status != 0) {
+			err_str = libnetapi_get_error_string(state->ctx, status);
+			g_print("callback_do_join: failed find dc (%s)\n", err_str);
+
+			dialog = gtk_message_dialog_new(GTK_WINDOW(state->window_parent),
+							GTK_DIALOG_DESTROY_WITH_PARENT,
+							GTK_MESSAGE_ERROR,
+							GTK_BUTTONS_CLOSE,
+							"Failed to find a domain controller for domain: \"%s\": %s",
+							state->name_buffer_new,
+							err_str);
+
+			gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
+			g_signal_connect_swapped(dialog, "response",
+						 G_CALLBACK(gtk_widget_destroy),
+						 dialog);
+
+			gtk_widget_show(dialog);
+
+			return;
+		}
+	}
+
 	if (join_creds_required) {
 		if (!state->account || !state->password) {
 			debug("callback_do_join: no creds yet\n");


-- 
Samba Shared Repository


More information about the samba-cvs mailing list