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

[vlendec at samba.org]

Author: vlendec
Date: 2006-04-19 15:38:43 +0000 (Wed, 19 Apr 2006)
New Revision: 15136

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

Log:
Fix join consistency check
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-19 14:16:38 UTC (rev 15135)
+++ branches/SAMBA_3_0/source/utils/net_ads.c	2006-04-19 15:38:43 UTC (rev 15136)
@@ -721,7 +721,7 @@
 	const char *short_domain_name = NULL;
 	TALLOC_CTX *ctx = NULL;
 
-	if ((lp_server_role() != ROLE_DOMAIN_MEMBER) || 
+	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");
 		return -1;

Modified: branches/SAMBA_3_0/source/utils/net_rpc.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_rpc.c	2006-04-19 14:16:38 UTC (rev 15135)
+++ branches/SAMBA_3_0/source/utils/net_rpc.c	2006-04-19 15:38:43 UTC (rev 15136)
@@ -389,7 +389,7 @@
 
 int net_rpc_join(int argc, const char **argv) 
 {
-	if ((lp_server_role() != ROLE_DOMAIN_MEMBER) || 
+	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");
 		return -1;

Modified: trunk/source/utils/net_ads.c
===================================================================
--- trunk/source/utils/net_ads.c	2006-04-19 14:16:38 UTC (rev 15135)
+++ trunk/source/utils/net_ads.c	2006-04-19 15:38:43 UTC (rev 15136)
@@ -721,7 +721,7 @@
 	const char *short_domain_name = NULL;
 	TALLOC_CTX *ctx = NULL;
 
-	if ((lp_server_role() != ROLE_DOMAIN_MEMBER) || 
+	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");
 		return -1;

Modified: trunk/source/utils/net_rpc.c
===================================================================
--- trunk/source/utils/net_rpc.c	2006-04-19 14:16:38 UTC (rev 15135)
+++ trunk/source/utils/net_rpc.c	2006-04-19 15:38:43 UTC (rev 15136)
@@ -389,7 +389,7 @@
 
 int net_rpc_join(int argc, const char **argv) 
 {
-	if ((lp_server_role() != ROLE_DOMAIN_MEMBER) || 
+	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");
 		return -1;