Merge from 3.0 - fix domain joins not to always join as BDC.

(This used to be commit 09bc2dd51c8407536b68aaeaeba4546f93256ec2)

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 91f82a5dbe01542a56cdd4dc1e8cd513055f764c..203d849786ba1fec3efaa253f10eb93bd37f918c 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -648,7 +648,7 @@ int net_ads_join(int argc, const char **argv)
        void *res;
        DOM_SID dom_sid;
        char *ou_str;
-       uint32 sec_channel_type;
+       uint32 sec_channel_type = SEC_CHAN_WKSTA;
        uint32 account_type = UF_WORKSTATION_TRUST_ACCOUNT;
 
        if (argc > 0) org_unit = argv[0];
@@ -658,11 +658,6 @@ int net_ads_join(int argc, const char **argv)
                return -1;
        }
 
-       /* check what type of join 
-          TODO: make this variable like RPC
-       */
-       account_type = UF_WORKSTATION_TRUST_ACCOUNT;
-
        tmp_password = generate_random_str(DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH);
        password = strdup(tmp_password);
 

diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index 35564b1e10c27a924892f46ff4ceb1037e630231..e389cf8ef8de6e653df376b43d97eea0a7ba0726 100644 (file)
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -143,11 +143,14 @@ int net_rpc_join_newstyle(int argc, const char **argv)
        switch (sec_channel_type) {
        case SEC_CHAN_WKSTA:
                acb_info = ACB_WSTRUST;
+               break;
        case SEC_CHAN_BDC:
                acb_info = ACB_SVRTRUST;
+               break;
 #if 0
        case SEC_CHAN_DOMAIN:
                acb_info = ACB_DOMTRUST;
+               break;
 #endif
        }