r15136: Fix join consistency check

(This used to be commit a6e88785e7116c1a88e1bfdfa2afadecd501bfb0)

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 6cd332fd3dfc48522debd7a806309af4779c8bfc..93d564bea0ee9f694a1ad5e9cc275bce168a1ecb 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -721,7 +721,7 @@ int net_ads_join(int argc, const char **argv)
        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;

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index efc9bfbfafb584cfc38c590fb1c9974389f1f046..e8667cbf7be8d1ddcbc996a3a7b1cf8d0cd2d854 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -389,7 +389,7 @@ static int rpc_join_usage(int argc, const char **argv)
 
 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;