svn commit: samba r15194 - branches/SAMBA_3_0/source/utils trunk/source/utils

[gd at samba.org]

Author: gd
Date: 2006-04-24 10:09:45 +0000 (Mon, 24 Apr 2006)
New Revision: 15194

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15194

Log:
We need to be able to join as PDC as well. Thanks to Andrew Bartlett.

Guenther

Modified:
   branches/SAMBA_3_0/source/utils/net_ads.c
   branches/SAMBA_3_0/source/utils/net_rpc.c
   trunk/source/utils/net_ads.c
   trunk/source/utils/net_rpc.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_ads.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_ads.c	2006-04-24 09:36:40 UTC (rev 15193)
+++ branches/SAMBA_3_0/source/utils/net_ads.c	2006-04-24 10:09:45 UTC (rev 15194)
@@ -721,9 +721,8 @@
 	const char *short_domain_name = NULL;
 	TALLOC_CTX *ctx = NULL;
 
-	if ((lp_server_role() != ROLE_DOMAIN_MEMBER) &&
-	    (lp_server_role() != ROLE_DOMAIN_BDC)) {
-		d_printf("can only join as domain member or as BDC\n");
+	if (lp_server_role() == ROLE_STANDALONE) {
+		d_printf("cannot join as standalone machine\n");
 		return -1;
 	}
 

Modified: branches/SAMBA_3_0/source/utils/net_rpc.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_rpc.c	2006-04-24 09:36:40 UTC (rev 15193)
+++ branches/SAMBA_3_0/source/utils/net_rpc.c	2006-04-24 10:09:45 UTC (rev 15194)
@@ -389,9 +389,8 @@
 
 int net_rpc_join(int argc, const char **argv) 
 {
-	if ((lp_server_role() != ROLE_DOMAIN_MEMBER) &&
-	    (lp_server_role() != ROLE_DOMAIN_BDC)) {
-		d_printf("can only join as domain member or as BDC\n");
+	if (lp_server_role() == ROLE_STANDALONE) {
+		d_printf("cannot join as standalone machine\n");
 		return -1;
 	}
 

Modified: trunk/source/utils/net_ads.c
===================================================================
--- trunk/source/utils/net_ads.c	2006-04-24 09:36:40 UTC (rev 15193)
+++ trunk/source/utils/net_ads.c	2006-04-24 10:09:45 UTC (rev 15194)
@@ -721,9 +721,8 @@
 	const char *short_domain_name = NULL;
 	TALLOC_CTX *ctx = NULL;
 
-	if ((lp_server_role() != ROLE_DOMAIN_MEMBER) &&
-	    (lp_server_role() != ROLE_DOMAIN_BDC)) {
-		d_printf("can only join as domain member or as BDC\n");
+	if (lp_server_role() == ROLE_STANDALONE) {
+		d_printf("cannot join as standalone machine\n");
 		return -1;
 	}
 

Modified: trunk/source/utils/net_rpc.c
===================================================================
--- trunk/source/utils/net_rpc.c	2006-04-24 09:36:40 UTC (rev 15193)
+++ trunk/source/utils/net_rpc.c	2006-04-24 10:09:45 UTC (rev 15194)
@@ -389,9 +389,8 @@
 
 int net_rpc_join(int argc, const char **argv) 
 {
-	if ((lp_server_role() != ROLE_DOMAIN_MEMBER) &&
-	    (lp_server_role() != ROLE_DOMAIN_BDC)) {
-		d_printf("can only join as domain member or as BDC\n");
+	if (lp_server_role() == ROLE_STANDALONE) {
+		d_printf("cannot join as standalone machine\n");
 		return -1;
 	}