svn commit: samba r26311 - in branches/SAMBA_4_0: . source/libcli/dgram source/torture/nbt

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-06 16:41:53 +0000 (Thu, 06 Dec 2007)
New Revision: 26311

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26311

Log:
Move port number specification higher up the call stack.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/libcli/dgram/mailslot.c
   branches/SAMBA_4_0/source/torture/nbt/dgram.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/libcli/dgram/mailslot.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/dgram/mailslot.c	2007-12-06 16:36:54 UTC (rev 26310)
+++ branches/SAMBA_4_0/source/libcli/dgram/mailslot.c	2007-12-06 16:41:53 UTC (rev 26311)
@@ -150,28 +150,21 @@
 			     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->port == 0) {
+		return NT_STATUS_INVALID_PARAMETER;
 	}
-	if (!dest) {
-		return NT_STATUS_NO_MEMORY;
-	}
 
 	ZERO_STRUCT(packet);
 	packet.msg_type = msg_type;

Modified: branches/SAMBA_4_0/source/torture/nbt/dgram.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/dgram.c	2007-12-06 16:36:54 UTC (rev 26310)
+++ branches/SAMBA_4_0/source/torture/nbt/dgram.c	2007-12-06 16:41:53 UTC (rev 26311)
@@ -124,7 +124,7 @@
 	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 @@
 	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 @@
 	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);