summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-04-22 05:32:01 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-04-22 05:32:01 +0000
commit96e1202f23177d07097eef09c36cf4eef22ae000 (patch)
tree119159c897f34940d567c28b9a56994ca286332c /source3
parentcbdb436e2147fe2215439305ab226048e1ae9b0e (diff)
downloadsamba-96e1202f23177d07097eef09c36cf4eef22ae000.tar.gz
samba-96e1202f23177d07097eef09c36cf4eef22ae000.tar.bz2
samba-96e1202f23177d07097eef09c36cf4eef22ae000.zip
Fix up bugs in the new 'store sec_channel type' code - we were always joining
as a BDC. Andrew Bartlett (This used to be commit f35674e7552dcfece342e7bece10bbfb0e81cbf8)
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 3615fd0e94..a498104bce 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -637,7 +637,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];
@@ -647,11 +647,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
}