sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

param: Remove parameter "cldap port"

Browse Source 
This was not used consistently across all of our code base, and I
don't see a reason why this should ever not be port 389.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Volker Lendecke 2024-10-28 13:46:20 +01:00
parent 43b2d4104b
commit 527d81fc5e
13 changed files with 34 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WHATSNEW.txt
View File

@ -35,6 +35,12 @@ REMOVED FEATURES
The "nmbd proxy logon" feature was removed. This was used before
Samba4 acquired a NBT server.
The parameter "cldap port" has been removed. CLDAP runs over UDP port
389, we don't see a reason why this should ever be changed to a
different port. Moreover, we had several places in the code where
Samba did not respect this parameter, so the behaviour was at least
inconsistent.
fruit:posix_rename
------------------
@ -58,6 +64,7 @@ smb.conf changes
smb3 directory leases New Auto
vfs mkdir use tmp name New Auto
fruit:posix_rename Removed
cldap port Removed
KNOWN ISSUES
============

12
docs-xml/smbdotconf/protocol/cldapport.xml
View File

@ -1,12 +0,0 @@
<samba:parameter name="cldap port"
context="G"
type="integer"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This option controls the port used by the CLDAP protocol.
</para>
</description>
<value type="default">389</value>
<value type="example">3389</value>
</samba:parameter>

1
lib/param/loadparm.c
View File

@ -2840,7 +2840,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lpcfg_do_global_parameter(lp_ctx, "smb ports", "445 139");
lpcfg_do_global_parameter_var(lp_ctx, "nbt port", "%d", NBT_NAME_SERVICE_PORT);
lpcfg_do_global_parameter_var(lp_ctx, "dgram port", "%d", NBT_DGRAM_SERVICE_PORT);
lpcfg_do_global_parameter(lp_ctx, "cldap port", "389");
lpcfg_do_global_parameter(lp_ctx, "krb5 port", "88");
lpcfg_do_global_parameter(lp_ctx, "kpasswd port", "464");
lpcfg_do_global_parameter_var(lp_ctx, "dns port", "%d", DNS_SERVICE_PORT);

2
source3/param/loadparm.c
View File

@ -943,8 +943,6 @@ void loadparm_s3_init_globals(struct loadparm_context *lp_ctx,
Globals.nsupdate_command = str_list_make_v3_const(NULL, "/usr/bin/nsupdate -g", NULL);
Globals.cldap_port = 389;
Globals.dgram_port = NBT_DGRAM_SERVICE_PORT;
Globals.nbt_port = NBT_NAME_SERVICE_PORT;

9
source4/cldap_server/cldap_server.c
View File

@ -106,15 +106,12 @@ static NTSTATUS cldapd_add_socket(struct cldapd_server *cldapd, struct loadparm_
NTSTATUS status;
int ret;
ret = tsocket_address_inet_from_strings(cldapd,
"ip",
address,
lpcfg_cldap_port(lp_ctx),
&socket_address);
ret = tsocket_address_inet_from_strings(
cldapd, "ip", address, 389, &socket_address);
if (ret != 0) {
status = map_nt_error_from_unix_common(errno);
DEBUG(0,("invalid address %s:%d - %s:%s\n",
address, lpcfg_cldap_port(lp_ctx),
address, 389,
gai_strerror(ret), nt_errstr(status)));
return status;
}

6
source4/libnet/libnet_become_dc.c
View File

@ -764,10 +764,8 @@ static void becomeDC_send_cldap(struct libnet_BecomeDC_state *s)
s->cldap.io.in.acct_control = -1;
s->cldap.io.in.version = NETLOGON_NT_VERSION_5 | NETLOGON_NT_VERSION_5EX;
ret = tsocket_address_inet_from_strings(s, "ip",
s->source_dsa.address,
lpcfg_cldap_port(s->libnet->lp_ctx),
&dest_address);
ret = tsocket_address_inet_from_strings(
s, "ip", s->source_dsa.address, 389, &dest_address);
if (ret != 0) {
c->status = map_nt_error_from_unix_common(errno);
if (!composite_is_ok(c)) return;

7
source4/libnet/libnet_site.c
View File

@ -57,10 +57,8 @@ NTSTATUS libnet_FindSite(TALLOC_CTX *ctx, struct libnet_context *lctx, struct li
search.in.acct_control = -1;
search.in.version = NETLOGON_NT_VERSION_5 | NETLOGON_NT_VERSION_5EX;
ret = tsocket_address_inet_from_strings(tmp_ctx, "ip",
r->in.dest_address,
r->in.cldap_port,
&dest_address);
ret = tsocket_address_inet_from_strings(
tmp_ctx, "ip", r->in.dest_address, 389, &dest_address);
if (ret != 0) {
r->out.error_string = NULL;
status = map_nt_error_from_unix_common(errno);
@ -189,7 +187,6 @@ NTSTATUS libnet_JoinSite(struct libnet_context *ctx,
r->in.dest_address = dest_addr;
r->in.netbios_name = libnet_r->in.netbios_name;
r->in.domain_dn_str = libnet_r->out.domain_dn_str;
r->in.cldap_port = lpcfg_cldap_port(ctx->lp_ctx);
status = libnet_FindSite(tmp_ctx, ctx, r);
if (!NT_STATUS_IS_OK(status)) {

1
source4/libnet/libnet_site.h
View File

@ -22,7 +22,6 @@ struct libnet_JoinSite {
const char *dest_address;
const char *netbios_name;
const char *domain_dn_str;
uint16_t cldap_port;
} in;
struct {

6
source4/libnet/libnet_unbecome_dc.c
View File

@ -271,10 +271,8 @@ static void unbecomeDC_send_cldap(struct libnet_UnbecomeDC_state *s)
s->cldap.io.in.acct_control = -1;
s->cldap.io.in.version = NETLOGON_NT_VERSION_5 | NETLOGON_NT_VERSION_5EX;
ret = tsocket_address_inet_from_strings(s, "ip",
s->source_dsa.address,
lpcfg_cldap_port(s->libnet->lp_ctx),
&dest_address);
ret = tsocket_address_inet_from_strings(
s, "ip", s->source_dsa.address, 389, &dest_address);
if (ret != 0) {
c->status = map_nt_error_from_unix_common(errno);
if (!composite_is_ok(c)) return;

6
source4/torture/ldap/cldap.c
View File

@ -100,10 +100,8 @@ static bool test_cldap_generic(struct torture_context *tctx, const char *dest)
talloc_asprintf(tctx,"Failed to resolve %s: %s",
nbt_name.name, nt_errstr(status)));
ret = tsocket_address_inet_from_strings(tctx, "ip",
ip,
lpcfg_cldap_port(tctx->lp_ctx),
&dest_addr);
ret = tsocket_address_inet_from_strings(
tctx, "ip", ip, 389, &dest_addr);
CHECK_VAL(ret, 0);
/* cldap_socket_init should now know about the dest. address */

12
source4/torture/ldap/cldapbench.c
View File

@ -67,10 +67,8 @@ static bool bench_cldap_netlogon(struct torture_context *tctx, const char *addre
struct tsocket_address *dest_addr;
int ret;
ret = tsocket_address_inet_from_strings(tctx, "ip",
address,
lpcfg_cldap_port(tctx->lp_ctx),
&dest_addr);
ret = tsocket_address_inet_from_strings(
tctx, "ip", address, 389, &dest_addr);
CHECK_VAL(ret, 0);
status = cldap_socket_init(tctx, NULL, dest_addr, &cldap);
@ -151,10 +149,8 @@ static bool bench_cldap_rootdse(struct torture_context *tctx, const char *addres
struct tsocket_address *dest_addr;
int ret;
ret = tsocket_address_inet_from_strings(tctx, "ip",
address,
lpcfg_cldap_port(tctx->lp_ctx),
&dest_addr);
ret = tsocket_address_inet_from_strings(
tctx, "ip", address, 389, &dest_addr);
CHECK_VAL(ret, 0);
/* cldap_socket_init should now know about the dest. address */

5
source4/torture/ldap/netlogon.c
View File

@ -717,10 +717,7 @@ bool torture_netlogon_udp(struct torture_context *tctx)
talloc_asprintf(tctx,"Failed to resolve %s: %s",
nbt_name.name, nt_errstr(status)));
r = tsocket_address_inet_from_strings(tctx, "ip",
ip,
lpcfg_cldap_port(tctx->lp_ctx),
&dest_addr);
r = tsocket_address_inet_from_strings(tctx, "ip", ip, 389, &dest_addr);
CHECK_VAL(r, 0);
/* cldap_socket_init should now know about the dest. address */

19
source4/torture/rpc/lsa.c
View File

@ -4421,14 +4421,17 @@ static bool check_dom_trust_pw(struct dcerpc_pipe *p,
talloc_asprintf(tctx,"Failed to resolve %s: %s",
nbt_name.name, nt_errstr(status)));
rc = tsocket_address_inet_from_strings(tctx, "ip",
ip,
lpcfg_cldap_port(tctx->lp_ctx),
&dest_addr);
torture_assert_int_equal(tctx, rc, 0,
talloc_asprintf(tctx,
"tsocket_address_inet_from_strings failed parsing %s:%d",
host, lpcfg_cldap_port(tctx->lp_ctx)));
rc = tsocket_address_inet_from_strings(
tctx, "ip", ip, 389, &dest_addr);
torture_assert_int_equal(
tctx,
rc,
0,
talloc_asprintf(tctx,
"tsocket_address_inet_from_strings failed "
"parsing %s:%d",
host,
389));
/* cldap_socket_init should now know about the dest. address */
status = cldap_socket_init(tctx, NULL, dest_addr, &cldap);