Author: abartlet Date: 2006-01-13 02:58:35 +0000 (Fri, 13 Jan 2006) New Revision: 12886
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12886 Log: Rename 'secure_channel_type' parameter to domain join as 'join_type'. Andrew Bartlett Modified: branches/SAMBA_4_0/source/libnet/libnet_join.c branches/SAMBA_4_0/source/libnet/libnet_join.h branches/SAMBA_4_0/source/utils/net/net_join.c Changeset: Modified: branches/SAMBA_4_0/source/libnet/libnet_join.c =================================================================== --- branches/SAMBA_4_0/source/libnet/libnet_join.c 2006-01-13 02:54:46 UTC (rev 12885) +++ branches/SAMBA_4_0/source/libnet/libnet_join.c 2006-01-13 02:58:35 UTC (rev 12886) @@ -1148,9 +1148,9 @@ 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 @@ /* * 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 @@ 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 @@ } 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; } Modified: branches/SAMBA_4_0/source/libnet/libnet_join.h =================================================================== --- branches/SAMBA_4_0/source/libnet/libnet_join.h 2006-01-13 02:54:46 UTC (rev 12885) +++ branches/SAMBA_4_0/source/libnet/libnet_join.h 2006-01-13 02:58:35 UTC (rev 12886) @@ -65,7 +65,7 @@ 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; Modified: branches/SAMBA_4_0/source/utils/net/net_join.c =================================================================== --- branches/SAMBA_4_0/source/utils/net/net_join.c 2006-01-13 02:54:46 UTC (rev 12885) +++ branches/SAMBA_4_0/source/utils/net/net_join.c 2006-01-13 02:58:35 UTC (rev 12886) @@ -68,7 +68,7 @@ /* 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;
