svn commit: samba r10569 - in branches/SAMBA_4_0/source: libcli/wrepl torture/nbt

[metze at samba.org]

Author: metze
Date: 2005-09-28 09:58:58 +0000 (Wed, 28 Sep 2005)
New Revision: 10569

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

Log:
add all info that we have to wrepl_name, as we need it for replication :-)

metze
Modified:
   branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c
   branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.h
   branches/SAMBA_4_0/source/torture/nbt/winsreplication.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c	2005-09-28 09:33:04 UTC (rev 10568)
+++ branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c	2005-09-28 09:58:58 UTC (rev 10569)
@@ -729,7 +729,7 @@
 	status = NT_STATUS_NO_MEMORY;
 
 	io->out.names = talloc_array(packet, struct wrepl_name, io->out.num_names);
-	if (io->out.names == NULL) goto failed;
+	if (io->out.names == NULL) goto nomem;
 
 	/* convert the list of names and addresses to a sane format */
 	for (i=0;i<io->out.num_names;i++) {
@@ -739,6 +739,12 @@
 					    wname->name, wname->name_len);
 		if (!NT_STATUS_IS_OK(status)) goto failed;
 
+		name->flags	= wname->flags;
+		name->group_flag= wname->group_flag;
+		name->version_id= wname->id;
+		name->owner	= talloc_strdup(io->out.names, io->in.partner.address);
+		if (name->owner == NULL) goto nomem;
+
 		/* trying to save 1 or 2 bytes on the wire isn't a good idea */
 		if (wname->flags & 2) {
 			int j;
@@ -747,7 +753,7 @@
 			name->addresses = talloc_array(io->out.names, 
 						       struct wrepl_address, 
 						       name->num_addresses);
-			if (name->addresses == NULL) goto failed;
+			if (name->addresses == NULL) goto nomem;
 			for (j=0;j<name->num_addresses;j++) {
 				name->addresses[j].owner = 
 					talloc_steal(name->addresses, 
@@ -759,16 +765,19 @@
 		} else {
 			name->num_addresses = 1;
 			name->addresses = talloc(io->out.names, struct wrepl_address);
-			if (name->addresses == NULL) goto failed;
-			name->addresses[0].owner = io->in.partner.address;
+			if (name->addresses == NULL) goto nomem;
+			name->addresses[0].owner = talloc_strdup(name->addresses,io->in.partner.address);
+			if (name->addresses[0].owner == NULL) goto nomem;
 			name->addresses[0].address = talloc_steal(name->addresses,
 								  wname->addresses.ip);
 		}
 	}
 
 	talloc_steal(mem_ctx, io->out.names);
-	status = NT_STATUS_OK;
-
+	talloc_free(packet);
+	return NT_STATUS_OK;
+nomem:
+	status = NT_STATUS_NO_MEMORY;
 failed:
 	talloc_free(packet);
 	return status;

Modified: branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.h
===================================================================
--- branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.h	2005-09-28 09:33:04 UTC (rev 10568)
+++ branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.h	2005-09-28 09:58:58 UTC (rev 10569)
@@ -116,6 +116,10 @@
 		uint32_t num_names;
 		struct wrepl_name {
 			struct nbt_name name;
+			uint32_t flags;
+			uint32_t group_flag;
+			uint64_t version_id;
+			const char *owner;
 			uint32_t num_addresses;
 			struct wrepl_address {
 				const char *owner;

Modified: branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/winsreplication.c	2005-09-28 09:33:04 UTC (rev 10568)
+++ branches/SAMBA_4_0/source/torture/nbt/winsreplication.c	2005-09-28 09:58:58 UTC (rev 10569)
@@ -147,9 +147,12 @@
 	int i;
 
 	printf("%s\n", nbt_name_string(mem_ctx, &name->name));
+	printf("\tFLAGS: 0x%08X G_FLAG: 0x%08X VERSION_ID: %llu\n",
+		name->flags, name->group_flag, name->version_id);
+	printf("\tOWNER: %-15s\n", name->owner);
 	for (i=0;i<name->num_addresses;i++) {
-		printf("\t%s %s\n", 
-		       name->addresses[i].owner, name->addresses[i].address);
+		printf("\tADDR: %-15s OWNER: %-15s\n", 
+			name->addresses[i].address, name->addresses[i].owner);
 	}
 }