r15123: Don't even try to join with an inproper configuration.

Guenther

diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c
index dd53cc5289d19e4efd081cd8a60ecc0dd9c0084c..6cd332fd3dfc48522debd7a806309af4779c8bfc 100644 (file)
--- a/source/utils/net_ads.c
+++ b/source/utils/net_ads.c
@@ -721,6 +721,13 @@ 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) || 
+           (lp_server_role() != ROLE_DOMAIN_BDC)) {
+               d_printf("can only join as domain member or as BDC\n");
+               return -1;
+       }
+
+
        if (argc > 0) {
                org_unit = argv[0];
        }

diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 561be2a41e69ad410635706c524b752345322b71..efc9bfbfafb584cfc38c590fb1c9974389f1f046 100644 (file)
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -389,6 +389,12 @@ 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) || 
+           (lp_server_role() != ROLE_DOMAIN_BDC)) {
+               d_printf("can only join as domain member or as BDC\n");
+               return -1;
+       }
+
        if ((net_rpc_perform_oldjoin(argc, argv) == 0))
                return 0;