From 3ffb30e8be5bcddca9d0489e1993085a4995c3af Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Thu, 1 Aug 1996 17:49:40 +0000 Subject: local_only NetServerEnum syncs can now be issued. bug spotted in nameservresp.c - arguments to test subnet the response is received on (same_net()) were the wrong way round (ccm@shentel.net) samba was adding WORKGROUP(1e) as a unique not a group name: fixed this bug in reply_name_status() and reply_name_query(): WINS entries weren't being looked up. name status reply adds local SELF entries to WINS SELF entries: some SELF entries are only added locally, while others are only added via WINS. name status needs to have both, combined. a sync will only occur when an ANN_LocalMasterAnnouncement is received, NOT an ANN_HostAnnouncement or an ANN_DomainAnnouncement. when samba is a member of a workgroup, it looks for (using a wins server) and announces to its domain master. NAME_QUERY_ANNOUNCE_HOST - yet another 'state' - has been created to do this: do the name query on the wins server and send the announce host to the answer to this query. jeremy @ vantive wrote the original code to do this, which used the name_query() function. i'm trying to avoid name_query: it times out and generally messes things up, but using queue_netbios_packet() and queue_netbios_pkt_wins() is... not intuitive? lkcl with help from jra (This used to be commit 6e932e4bae8b46e7ff4a55a75484bad78308336a) --- source3/namedbresp.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/namedbresp.c') diff --git a/source3/namedbresp.c b/source3/namedbresp.c index c453d9bbec..d89bfe8ae8 100644 --- a/source3/namedbresp.c +++ b/source3/namedbresp.c @@ -94,6 +94,7 @@ void remove_response_record(struct subnet_record *d, struct response_record *make_response_queue_record(enum state_type state, int id,uint16 fd, int quest_type, char *name,int type, int nb_flags, time_t ttl, + int server_type, char *my_name, char *my_comment, BOOL bcast,BOOL recurse, struct in_addr send_ip, struct in_addr reply_to_ip) { @@ -111,10 +112,13 @@ struct response_record *make_response_queue_record(enum state_type state, make_nmb_name(&n->name, name, type, scope); n->nb_flags = nb_flags; n->ttl = ttl; + n->server_type = server_type; n->bcast = bcast; n->recurse = recurse; n->send_ip = send_ip; n->reply_to_ip = reply_to_ip; + StrnCpy(my_name , n->my_name , sizeof(n->my_name )-1); + StrnCpy(my_comment, n->my_comment, sizeof(n->my_comment)-1); n->repeat_interval = 1; /* XXXX should be in ms */ n->repeat_count = 3; /* 3 retries */ -- cgit