summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-01-13 02:58:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:50:58 -0500
commitd790d8d6edbb7744cc6d3f7ca33e05a358038a42 (patch)
tree2371b06ea044f8a064555b106bd7653ed58a7824 /source4
parentf2df13958c70d9853cbe7d322716eb323a331b39 (diff)
downloadsamba-d790d8d6edbb7744cc6d3f7ca33e05a358038a42.tar.gz
samba-d790d8d6edbb7744cc6d3f7ca33e05a358038a42.tar.bz2
samba-d790d8d6edbb7744cc6d3f7ca33e05a358038a42.zip
r12886: Rename 'secure_channel_type' parameter to domain join as 'join_type'.
Andrew Bartlett (This used to be commit a3b3e09a9acc66dff7baf1a4ba0ea913bccdbd7d)
Diffstat (limited to 'source4')
-rw-r--r--source4/libnet/libnet_join.c12
-rw-r--r--source4/libnet/libnet_join.h2
-rw-r--r--source4/utils/net/net_join.c2
3 files changed, 8 insertions, 8 deletions
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index f7f2851309..c961ff0cfe 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -1148,9 +1148,9 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
return NT_STATUS_NO_MEMORY;
}
- if (r->in.secure_channel_type == SEC_CHAN_BDC) {
+ if (r->in.join_type == SEC_CHAN_BDC) {
acct_type = ACB_SVRTRUST;
- } else if (r->in.secure_channel_type == SEC_CHAN_WKSTA) {
+ } else if (r->in.join_type == SEC_CHAN_WKSTA) {
acct_type = ACB_WSTRUST;
} else {
r->out.error_string = NULL;
@@ -1209,7 +1209,7 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
/*
* now prepare the record for secrets.ldb
*/
- sct = talloc_asprintf(tmp_mem, "%d", r->in.secure_channel_type);
+ sct = talloc_asprintf(tmp_mem, "%d", r->in.join_type);
if (!sct) {
r->out.error_string = NULL;
talloc_free(tmp_mem);
@@ -1428,7 +1428,7 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
NTSTATUS libnet_Join(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, struct libnet_Join *r)
{
- switch (r->in.secure_channel_type) {
+ switch (r->in.join_type) {
case SEC_CHAN_WKSTA:
return libnet_Join_primary_domain(ctx, mem_ctx, r);
case SEC_CHAN_BDC:
@@ -1438,7 +1438,7 @@ NTSTATUS libnet_Join(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, struct lib
}
r->out.error_string = talloc_asprintf(mem_ctx,
- "Invalid secure channel type specified (%08X) attempting to join domain %s",
- r->in.secure_channel_type, r->in.domain_name);
+ "Invalid join type specified (%08X) attempting to join domain %s",
+ r->in.join_type, r->in.domain_name);
return NT_STATUS_INVALID_PARAMETER;
}
diff --git a/source4/libnet/libnet_join.h b/source4/libnet/libnet_join.h
index 78f4fd5f12..04f23c1d99 100644
--- a/source4/libnet/libnet_join.h
+++ b/source4/libnet/libnet_join.h
@@ -65,7 +65,7 @@ struct libnet_Join {
struct {
const char *domain_name;
const char *netbios_name;
- enum netr_SchannelType secure_channel_type;
+ enum netr_SchannelType join_type;
enum libnet_Join_level level;
} in;
diff --git a/source4/utils/net/net_join.c b/source4/utils/net/net_join.c
index eaa53f4c7b..407de6e89d 100644
--- a/source4/utils/net/net_join.c
+++ b/source4/utils/net/net_join.c
@@ -68,7 +68,7 @@ int net_join(struct net_context *ctx, int argc, const char **argv)
/* prepare parameters for the join */
r->in.netbios_name = lp_netbios_name();
r->in.domain_name = domain_name;
- r->in.secure_channel_type = secure_channel_type;
+ r->in.join_type = secure_channel_type;
r->in.level = LIBNET_JOIN_AUTOMATIC;
r->out.error_string = NULL;