sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-31 22:02:58 +03:00
Code Activity

r12886: Rename 'secure_channel_type' parameter to domain join as 'join_type'.

Browse Source 
Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2006-01-13 02:58:35 +00:00
committed by Gerald (Jerry) Carter
parent 8f7d14048f
commit a3b3e09a9a
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/libnet/libnet_join.c
View File

@ -1148,9 +1148,9 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
return NT_STATUS_NO_MEMORY; 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; 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; acct_type = ACB_WSTRUST;
} else { } else {
r->out.error_string = NULL; 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 * 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) { if (!sct) {
r->out.error_string = NULL; r->out.error_string = NULL;
talloc_free(tmp_mem); 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) 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: case SEC_CHAN_WKSTA:
return libnet_Join_primary_domain(ctx, mem_ctx, r); return libnet_Join_primary_domain(ctx, mem_ctx, r);
case SEC_CHAN_BDC: 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, r->out.error_string = talloc_asprintf(mem_ctx,
"Invalid secure channel type specified (%08X) attempting to join domain %s", "Invalid join type specified (%08X) attempting to join domain %s",
r->in.secure_channel_type, r->in.domain_name); r->in.join_type, r->in.domain_name);
return NT_STATUS_INVALID_PARAMETER; return NT_STATUS_INVALID_PARAMETER;
} }

2
source/libnet/libnet_join.h
View File

@ -65,7 +65,7 @@ struct libnet_Join {
struct { struct {
const char *domain_name; const char *domain_name;
const char *netbios_name; const char *netbios_name;
enum netr_SchannelType secure_channel_type; enum netr_SchannelType join_type;
enum libnet_Join_level level; enum libnet_Join_level level;
} in; } in;

2
source/utils/net/net_join.c
View File

@ -68,7 +68,7 @@ int net_join(struct net_context *ctx, int argc, const char **argv)
/* prepare parameters for the join */ /* prepare parameters for the join */
r->in.netbios_name = lp_netbios_name(); r->in.netbios_name = lp_netbios_name();
r->in.domain_name = domain_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->in.level = LIBNET_JOIN_AUTOMATIC;
r->out.error_string = NULL; r->out.error_string = NULL;