summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-04-22 05:34:43 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-04-22 05:34:43 +0000
commitdb8ff4ae56d7ce16cf68f7c712a207b062defc68 (patch)
tree1d9765f53d78c052ebeb0b32087f8ebf78ed50ed /source3
parent8f0b33382943b9e5e419dcbcf3cc7bb974b7eae2 (diff)
downloadsamba-db8ff4ae56d7ce16cf68f7c712a207b062defc68.tar.gz
samba-db8ff4ae56d7ce16cf68f7c712a207b062defc68.tar.bz2
samba-db8ff4ae56d7ce16cf68f7c712a207b062defc68.zip
Merge from 3.0 - fix domain joins not to always join as BDC.
(This used to be commit 09bc2dd51c8407536b68aaeaeba4546f93256ec2)
Diffstat (limited to 'source3')
-rw-r--r--source3/utils/net_ads.c7
-rw-r--r--source3/utils/net_rpc_join.c3
2 files changed, 4 insertions, 6 deletions
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 91f82a5dbe..203d849786 100644
--- 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 35564b1e10..e389cf8ef8 100644
--- 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
}