param: Remove parameter "cldap port"

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>

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index de4bb9d6e4eac3762b24566421f87f2c47528391..51632e35c70c0b23f65b8e6037899c6c4ad9eef0 100644 (file)
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -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
 ============

diff --git a/docs-xml/smbdotconf/protocol/cldapport.xml b/docs-xml/smbdotconf/protocol/cldapport.xml
deleted file mode 100644 (file)
index 3fcb2b3..0000000
--- a/docs-xml/smbdotconf/protocol/cldapport.xml
+++ /dev/null
@@ -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>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index c867527f2557db408019dbe9c535372475c9020c..aecde4ab8bd91116d9c2c3af25d2afe95a7e1e58 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -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);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 03506fd912ed2261e20027705611fcb75cdd0ee6..74afbcb5309644ebc81dad7a5f4b6973039571bd 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -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;

diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index c5d0c684b05bfffff9d5692dcd36988d10e79624..60642b0d962f8a844435daa1f2d6b130f25c998e 100644 (file)
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -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;
        }

diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index 28e38247bf724dafec36419ec4932545478d72d1..bc1f85193028523fe5105f16b2c836b9857756e0 100644 (file)
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -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;

diff --git a/source4/libnet/libnet_site.c b/source4/libnet/libnet_site.c
index 6fc2c79ae1390a81d68369957ccc123bdf8585d4..f27081f33b7a8418554ad4266d92ce0c2a0dd02f 100644 (file)
--- a/source4/libnet/libnet_site.c
+++ b/source4/libnet/libnet_site.c
@@ -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)) {

diff --git a/source4/libnet/libnet_site.h b/source4/libnet/libnet_site.h
index 8e607c5b6ae3c7d0be1d1474eaaa775cbc693980..9a0484c2a998f7c17b33351d45cffd31f255183c 100644 (file)
--- a/source4/libnet/libnet_site.h
+++ b/source4/libnet/libnet_site.h
@@ -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 {

diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c
index 9a509e0fb72f99830113702dedccca214944b9e8..dba7b90c6f51bde77dc839afd9afcd1e18f18490 100644 (file)
--- a/source4/libnet/libnet_unbecome_dc.c
+++ b/source4/libnet/libnet_unbecome_dc.c
@@ -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;

diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c
index a021f4ce3c64fdd63871db016318bdf5b5e84820..fa852b5602391e90fae791f8409bd33665c91fb6 100644 (file)
--- a/source4/torture/ldap/cldap.c
+++ b/source4/torture/ldap/cldap.c
@@ -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 */

diff --git a/source4/torture/ldap/cldapbench.c b/source4/torture/ldap/cldapbench.c
index 2b18749bc0373c5ca271b03a0b9b76712f8b6788..3b322487261134d9d80f2a3c7d8aa37647416a42 100644 (file)
--- a/source4/torture/ldap/cldapbench.c
+++ b/source4/torture/ldap/cldapbench.c
@@ -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 */

diff --git a/source4/torture/ldap/netlogon.c b/source4/torture/ldap/netlogon.c
index 7e3105447127c0f326cd93de91e7fbd2c2873f28..bfec0cb438fb6c29f8e43aaa5229e167fd41a519 100644 (file)
--- a/source4/torture/ldap/netlogon.c
+++ b/source4/torture/ldap/netlogon.c
@@ -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 */

diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 2846d2bd6296741207ca3689fb90385c387e6738..9093a8550c62cd7c28cb3a9e28a7b95bd979ad58 100644 (file)
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -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);