From: Günther Deschner <gd@samba.org>
Date: Fri, 15 May 2009 17:43:19 +0000 (+0200)
Subject: s3-netdomjoin-gui: allow to switch between workgroups/domains with the same name.
X-Git-Tag: tdb-1.1.5~529
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d800ee50335ecbd2dbd3b451a18a00780ac28f04;p=thirdparty%2Fsamba.git

s3-netdomjoin-gui: allow to switch between workgroups/domains with the same name.

Guenther
---

diff --git a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
index 0a06a7789cb..c4821133327 100644
--- a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
+++ b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
@@ -950,7 +950,8 @@ static void callback_enter_workgroup_and_unlock(GtkWidget *widget,
 		gtk_widget_set_sensitive(GTK_WIDGET(state->button_ok), FALSE);
 		return;
 	}
-	if (strcasecmp(state->name_buffer_initial, entry_text) == 0) {
+	if ((strcasecmp(state->name_buffer_initial, entry_text) == 0) &&
+	    (state->name_type_initial == NetSetupWorkgroupName)) {
 		gtk_widget_set_sensitive(GTK_WIDGET(state->button_ok), FALSE);
 		return;
 	}
@@ -972,7 +973,8 @@ static void callback_enter_domain_and_unlock(GtkWidget *widget,
 		gtk_widget_set_sensitive(GTK_WIDGET(state->button_ok), FALSE);
 		return;
 	}
-	if (strcasecmp(state->name_buffer_initial, entry_text) == 0) {
+	if ((strcasecmp(state->name_buffer_initial, entry_text) == 0) &&
+	    (state->name_type_initial == NetSetupDomainName)) {
 		gtk_widget_set_sensitive(GTK_WIDGET(state->button_ok), FALSE);
 		return;
 	}