svn commit: samba r10539 - in branches/tmp/samba4-winsrepl/source: nbt_server nbt_server/wins torture/nbt

[metze at samba.org]

Author: metze
Date: 2005-09-27 12:59:47 +0000 (Tue, 27 Sep 2005)
New Revision: 10539

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

Log:
fix the build for changes from SAMBA_4_0 branch

metze
Modified:
   branches/tmp/samba4-winsrepl/source/nbt_server/nbt_server.c
   branches/tmp/samba4-winsrepl/source/nbt_server/wins/winsdb.c
   branches/tmp/samba4-winsrepl/source/torture/nbt/dgram.c


Changeset:
Modified: branches/tmp/samba4-winsrepl/source/nbt_server/nbt_server.c
===================================================================
--- branches/tmp/samba4-winsrepl/source/nbt_server/nbt_server.c	2005-09-27 12:54:51 UTC (rev 10538)
+++ branches/tmp/samba4-winsrepl/source/nbt_server/nbt_server.c	2005-09-27 12:59:47 UTC (rev 10539)
@@ -50,7 +50,7 @@
 
 static void getdc_recv_ntlogon_reply(struct dgram_mailslot_handler *dgmslot, 
 				     struct nbt_dgram_packet *packet, 
-				     const char *src_address, int src_port)
+				     const struct nbt_peer_socket *src)
 {
 	struct getdc_state *s =
 		talloc_get_type(dgmslot->private, struct getdc_state);
@@ -108,6 +108,7 @@
 	struct nbt_ntlogon_sam_logon *r;
 	struct nbt_dgram_socket *sock;
 	struct nbt_name src, dst;
+	struct nbt_peer_socket dest;
 	struct dgram_mailslot_handler *handler;
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 
@@ -141,8 +142,10 @@
 	make_nbt_name_client(&src, req->in.my_computername);
 	make_nbt_name(&dst, req->in.domainname, 0x1c);
 
+	dest.addr = req->in.ip_address;
+	dest.port = 138;
 	status = dgram_mailslot_ntlogon_send(sock, DGRAM_DIRECT_GROUP,
-					     &dst, req->in.ip_address, 138,
+					     &dst, &dest,
 					     &src, &p);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0, ("dgram_mailslot_ntlogon_send failed: %s\n",

Modified: branches/tmp/samba4-winsrepl/source/nbt_server/wins/winsdb.c
===================================================================
--- branches/tmp/samba4-winsrepl/source/nbt_server/wins/winsdb.c	2005-09-27 12:54:51 UTC (rev 10538)
+++ branches/tmp/samba4-winsrepl/source/nbt_server/wins/winsdb.c	2005-09-27 12:59:47 UTC (rev 10539)
@@ -509,6 +509,7 @@
 
 	rec->version = winsdb_allocate_version(winssrv);
 	if (rec->version == 0) goto failed;
+	rec->wins_owner = WINSDB_OWNER_LOCAL;
 
 	msg = winsdb_message(winssrv->wins_db, rec, tmp_ctx);
 	if (msg == NULL) goto failed;
@@ -581,8 +582,8 @@
 	int trans;
 	int ret;
 
-	if(!winsdb_remove_version(winssrv, rec->version))
-		goto failed;
+	trans = ldb_transaction_start(ldb);
+	if (trans != LDB_SUCCESS) goto failed;
 
 	dn = winsdb_dn(tmp_ctx, rec->name);
 	if (dn == NULL) goto failed;

Modified: branches/tmp/samba4-winsrepl/source/torture/nbt/dgram.c
===================================================================
--- branches/tmp/samba4-winsrepl/source/torture/nbt/dgram.c	2005-09-27 12:54:51 UTC (rev 10538)
+++ branches/tmp/samba4-winsrepl/source/torture/nbt/dgram.c	2005-09-27 12:59:47 UTC (rev 10539)
@@ -260,9 +260,10 @@
 
 	make_nbt_name_client(&myname, TEST_NAME);
 
+	dest.port = 0;
+	dest.addr = address;
 	status = dgram_mailslot_ntlogon_send(dgmsock, DGRAM_DIRECT_UNIQUE,
-					     &name, address, 
-					      0, &myname, &logon);
+					     &name, &dest, &myname, &logon);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Failed to send ntlogon request - %s\n", nt_errstr(status));
 		goto failed;