r12618: use our primary interface address or the "winsdb:local_owner" -address

as winsOwner: attrbute for owned records

metze
(This used to be commit 37dece8304c0b9887740f4d4e8096732045a1785)

3 files changed, 33 insertions, 25 deletions

diff --git a/source4/nbt_server/wins/winsdb.c b/source4/nbt_server/wins/winsdb.c
index 42a6f19d84..47abcd4a63 100644
--- a/source4/nbt_server/wins/winsdb.c
+++ b/source4/nbt_server/wins/winsdb.c
@@ -165,14 +165,14 @@ failed:
  "172.31.1.1;winsOwner:172.31.9.202;expireTime:20050923032330.0Z;"
  are valid records
 */
-static NTSTATUS winsdb_addr_decode(struct winsdb_record *rec, struct ldb_val *val,
+static NTSTATUS winsdb_addr_decode(struct winsdb_handle *h, struct winsdb_record *rec, struct ldb_val *val,
 				   TALLOC_CTX *mem_ctx, struct winsdb_addr **_addr)
 {
 	NTSTATUS status;
 	struct winsdb_addr *addr;
-	char *address;
-	char *wins_owner;
-	char *expire_time;
+	const char *address;
+	const char *wins_owner;
+	const char *expire_time;
 	char *p;
 
 	addr = talloc(mem_ctx, struct winsdb_addr);
@@ -216,6 +216,9 @@ static NTSTATUS winsdb_addr_decode(struct winsdb_record *rec, struct ldb_val *va
 	}
 
 	*p = '\0';p++;
+	if (strcmp(wins_owner, "0.0.0.0") == 0) {
+		wins_owner = h->local_owner;
+	}
 	addr->wins_owner = talloc_strdup(addr, wins_owner);
 	if (!addr->wins_owner) {
 		status = NT_STATUS_NO_MEMORY;
@@ -393,7 +396,7 @@ NTSTATUS winsdb_lookup(struct winsdb_handle *h,
 
 	talloc_steal(tmp_ctx, res);
 
-	status = winsdb_record(res->msgs[0], tmp_ctx, &rec);
+	status = winsdb_record(h, res->msgs[0], tmp_ctx, &rec);
 	if (!NT_STATUS_IS_OK(status)) goto failed;
 
 	/* see if it has already expired */
@@ -414,7 +417,7 @@ failed:
 	return status;
 }
 
-NTSTATUS winsdb_record(struct ldb_message *msg, TALLOC_CTX *mem_ctx, struct winsdb_record **_rec)
+NTSTATUS winsdb_record(struct winsdb_handle *h, struct ldb_message *msg, TALLOC_CTX *mem_ctx, struct winsdb_record **_rec)
 {
 	NTSTATUS status;
 	struct winsdb_record *rec;
@@ -453,12 +456,8 @@ NTSTATUS winsdb_record(struct ldb_message *msg, TALLOC_CTX *mem_ctx, struct wins
 	talloc_steal(rec, rec->wins_owner);
 	talloc_steal(rec, rec->registered_by);
 
-	if (!rec->wins_owner) {
-		rec->wins_owner = talloc_strdup(rec, WINSDB_OWNER_LOCAL);
-		if (rec->wins_owner == NULL) {
-			status = NT_STATUS_NO_MEMORY;
-			goto failed;
-		}
+	if (!rec->wins_owner || strcmp(rec->wins_owner, "0.0.0.0") == 0) {
+		rec->wins_owner = h->local_owner;
 	}
 
 	el = ldb_msg_find_element(msg, "address");
@@ -488,7 +487,7 @@ NTSTATUS winsdb_record(struct ldb_message *msg, TALLOC_CTX *mem_ctx, struct wins
 	}
 
 	for (i=0;i<num_values;i++) {
-		status = winsdb_addr_decode(rec, &el->values[i], rec->addresses, &rec->addresses[i]);
+		status = winsdb_addr_decode(h, rec, &el->values[i], rec->addresses, &rec->addresses[i]);
 		if (!NT_STATUS_IS_OK(status)) goto failed;
 	}
 	rec->addresses[i] = NULL;
@@ -596,7 +595,7 @@ uint8_t winsdb_add(struct winsdb_handle *h, struct winsdb_record *rec, uint32_t
 		if (rec->version == 0) goto failed;
 	}
 	if (flags & WINSDB_FLAG_TAKE_OWNERSHIP) {
-		rec->wins_owner = WINSDB_OWNER_LOCAL;
+		rec->wins_owner = h->local_owner;
 	}
 
 	msg = winsdb_message(wins_db, rec, tmp_ctx);
@@ -637,7 +636,7 @@ uint8_t winsdb_modify(struct winsdb_handle *h, struct winsdb_record *rec, uint32
 		if (rec->version == 0) goto failed;
 	}
 	if (flags & WINSDB_FLAG_TAKE_OWNERSHIP) {
-		rec->wins_owner = WINSDB_OWNER_LOCAL;
+		rec->wins_owner = h->local_owner;
 	}
 
 	msg = winsdb_message(wins_db, rec, tmp_ctx);
@@ -698,6 +697,7 @@ failed:
 struct winsdb_handle *winsdb_connect(TALLOC_CTX *mem_ctx)
 {
 	struct winsdb_handle *h = NULL;
+	const char *owner;
 
 	h = talloc(mem_ctx, struct winsdb_handle);
 	if (!h) return NULL;
@@ -706,6 +706,14 @@ struct winsdb_handle *winsdb_connect(TALLOC_CTX *mem_ctx)
 				  system_session(h), NULL, 0, NULL);
 	if (!h->ldb) goto failed;
 
+	owner = lp_parm_string(-1, "winsdb", "local_owner");
+	if (!owner) {
+		owner = iface_n_ip(0);
+	}
+
+	h->local_owner = talloc_strdup(h, owner);
+	if (!h->local_owner) goto failed;
+
 	return h;
 failed:
 	talloc_free(h);
diff --git a/source4/nbt_server/wins/winsdb.h b/source4/nbt_server/wins/winsdb.h
index f890a10148..6bc1442f3c 100644
--- a/source4/nbt_server/wins/winsdb.h
+++ b/source4/nbt_server/wins/winsdb.h
@@ -20,9 +20,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#define WINSDB_OWNER_LOCAL	"0.0.0.0"
-#define WINSDB_GROUP_ADDRESS	"255.255.255.255"
-
 #define WINSDB_FLAG_ALLOC_VERSION	(1<<0)
 #define WINSDB_FLAG_TAKE_OWNERSHIP	(1<<1)
 
@@ -53,6 +50,9 @@ struct winsdb_record {
 struct winsdb_handle {
 	/* wins server database handle */
 	struct ldb_context *ldb;
+
+	/* local owner address */
+	const char *local_owner;
 };
 
 struct wins_server {
diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c
index c01ab9a19b..3eddfb7639 100644
--- a/source4/nbt_server/wins/winsserver.c
+++ b/source4/nbt_server/wins/winsserver.c
@@ -91,7 +91,7 @@ static uint8_t wins_register_new(struct nbt_name_socket *nbtsock,
 
 	rec.addresses     = winsdb_addr_list_add(rec.addresses,
 						 address,
-						 WINSDB_OWNER_LOCAL,
+						 winssrv->wins_db->local_owner,
 						 rec.expire_time);
 	if (rec.addresses == NULL) return NBT_RCODE_SVR;
 
@@ -122,11 +122,11 @@ static uint8_t wins_update_ttl(struct nbt_name_socket *nbtsock,
 	rec->registered_by = src->addr;
 
 	if (winsdb_addr) {
-		winsdb_addr->wins_owner  = WINSDB_OWNER_LOCAL;
+		winsdb_addr->wins_owner  = winssrv->wins_db->local_owner;
 		winsdb_addr->expire_time = rec->expire_time;
 	}
 
-	if (strcmp(WINSDB_OWNER_LOCAL, rec->wins_owner) != 0) {
+	if (strcmp(winssrv->wins_db->local_owner, rec->wins_owner) != 0) {
 		modify_flags = WINSDB_FLAG_ALLOC_VERSION | WINSDB_FLAG_TAKE_OWNERSHIP;
 	}
 
@@ -155,7 +155,7 @@ static uint8_t wins_sgroup_merge(struct nbt_name_socket *nbtsock,
 
 	rec->addresses     = winsdb_addr_list_add(rec->addresses,
 						  address,
-						  WINSDB_OWNER_LOCAL,
+						  winssrv->wins_db->local_owner,
 						  rec->expire_time);
 	if (rec->addresses == NULL) return NBT_RCODE_SVR;
 
@@ -243,7 +243,7 @@ static void wins_wack_allow(struct wack_state *s)
 			break;
 		}
 		if (found) {
-			rec->addresses[i]->wins_owner = WINSDB_OWNER_LOCAL;
+			rec->addresses[i]->wins_owner = s->winssrv->wins_db->local_owner;
 			rec->addresses[i]->expire_time = rec->expire_time;
 			continue;
 		}
@@ -253,7 +253,7 @@ static void wins_wack_allow(struct wack_state *s)
 
 	rec->addresses = winsdb_addr_list_add(rec->addresses,
 					      s->reg_address,
-					      WINSDB_OWNER_LOCAL,
+					      s->winssrv->wins_db->local_owner,
 					      rec->expire_time);
 	if (rec->addresses == NULL) goto failed;
 
@@ -597,7 +597,7 @@ static void nbtd_winsserver_query(struct nbt_name_socket *nbtsock,
 			nbtd_negative_name_query_reply(nbtsock, packet, src);
 			return;
 		}
-		addresses[0] = WINSDB_GROUP_ADDRESS;
+		addresses[0] = "255.255.255.255";
 		addresses[1] = NULL;
 		goto found;
 	}