r26311: Move port number specification higher up the call stack.

diff --git a/source/libcli/dgram/mailslot.c b/source/libcli/dgram/mailslot.c
index 4e94e5ee5bcfababd7cbc6e218ae320182d79811..4f9d0bfc7c03ee985270c5887759bf31486ed339 100644 (file)
--- a/source/libcli/dgram/mailslot.c
+++ b/source/libcli/dgram/mailslot.c
@@ -150,27 +150,20 @@ NTSTATUS dgram_mailslot_send(struct nbt_dgram_socket *dgmsock,
                             enum dgram_msg_type msg_type,
                             const char *mailslot_name,
                             struct nbt_name *dest_name,
-                            struct socket_address *_dest,
+                            struct socket_address *dest,
                             struct nbt_name *src_name,
                             DATA_BLOB *request)
 {
        TALLOC_CTX *tmp_ctx = talloc_new(dgmsock);
        struct nbt_dgram_packet packet;
-       struct socket_address *dest;
        struct dgram_message *msg;
        struct dgram_smb_packet *smb;
        struct smb_trans_body *trans;
        struct socket_address *src;
        NTSTATUS status;
 
-       if (_dest->port == 0) {
-               dest = socket_address_from_strings(tmp_ctx, _dest->family, 
-                                                  _dest->addr, lp_dgram_port(global_loadparm));
-       } else {
-               dest = _dest;
-       }
-       if (!dest) {
-               return NT_STATUS_NO_MEMORY;
+       if (dest->port == 0) {
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
        ZERO_STRUCT(packet);

diff --git a/source/torture/nbt/dgram.c b/source/torture/nbt/dgram.c
index f7a094b52d929e5e911f17cbea0cdb954db4abcd..e56d8c7500ded912fcc080a56c7c6ec4f4975062 100644 (file)
--- a/source/torture/nbt/dgram.c
+++ b/source/torture/nbt/dgram.c
@@ -124,7 +124,7 @@ static bool nbt_test_netlogon(struct torture_context *tctx)
        make_nbt_name_client(&myname, TEST_NAME);
 
        dest = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, 
-                                          address, 0);
+                                          address, lp_dgram_port(tctx->lp_ctx));
        torture_assert(tctx, dest != NULL, "Error getting address");
 
        status = dgram_mailslot_netlogon_send(dgmsock, &name, dest,
@@ -204,7 +204,7 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
        make_nbt_name_client(&myname, TEST_NAME);
 
        dest = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, 
-                                          address, 0);
+                                          address, lp_dgram_port(tctx->lp_ctx));
 
        torture_assert(tctx, dest != NULL, "Error getting address");
        status = dgram_mailslot_netlogon_send(dgmsock, &name, dest,
@@ -323,7 +323,7 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
        make_nbt_name_client(&myname, TEST_NAME);
 
        dest = socket_address_from_strings(dgmsock, dgmsock->sock->backend_name, 
-                                          address, 0);
+                                          address, lp_dgram_port(tctx->lp_ctx));
        torture_assert(tctx, dest != NULL, "Error getting address");
        status = dgram_mailslot_ntlogon_send(dgmsock, DGRAM_DIRECT_UNIQUE,
                                             &name, dest, &myname, &logon);