svn commit: samba r12779 - in branches/SAMBA_4_0/source/nbt_server/wins: .

[metze at samba.org]

Author: metze
Date: 2006-01-08 20:57:26 +0000 (Sun, 08 Jan 2006)
New Revision: 12779

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

Log:
allow static tomstones

metze
Modified:
   branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c


Changeset:
Modified: branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c
===================================================================
--- branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c	2006-01-08 20:50:18 UTC (rev 12778)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c	2006-01-08 20:57:26 UTC (rev 12779)
@@ -562,12 +562,7 @@
 	}
 	rec->addresses[i] = NULL;
 
-	if (rec->is_static) {
-		if (num_values < 1) {
-			status = NT_STATUS_INTERNAL_DB_CORRUPTION;
-			goto failed;
-		}
-		rec->state = WREPL_STATE_ACTIVE;
+	if (rec->is_static && rec->state == WREPL_STATE_ACTIVE) {
 		rec->expire_time = get_time_t_max();
 		for (i=0;rec->addresses[i];i++) {
 			rec->addresses[i]->expire_time = rec->expire_time;
@@ -594,10 +589,9 @@
 	size_t addr_count;
 	const char *expire_time;
 	struct ldb_message *msg = ldb_msg_new(mem_ctx);
-	if (msg == NULL) goto failed;	
+	if (msg == NULL) goto failed;
 
-	if (rec->is_static) {
-		rec->state = WREPL_STATE_ACTIVE;
+	if (rec->is_static && rec->state == WREPL_STATE_ACTIVE) {
 		rec->expire_time = get_time_t_max();
 		for (i=0;rec->addresses[i];i++) {
 			rec->addresses[i]->expire_time = rec->expire_time;