diff options
| author | Andrew Tridgell <tridge@samba.org> | 1996-07-03 02:58:18 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1996-07-03 02:58:18 +0000 |
| commit | 9c77b8ab373914ebb8c45ad912ae8af48b22c7e3 (patch) | |
| tree | 5cf6da5d2a42f844f41e3b3aa7c65d33d672b567 | |
| parent | a7f497c6d6360d05bc557d1512ac312846a70cc4 (diff) | |
| download | samba-9c77b8ab373914ebb8c45ad912ae8af48b22c7e3.tar.gz samba-9c77b8ab373914ebb8c45ad912ae8af48b22c7e3.tar.bz2 samba-9c77b8ab373914ebb8c45ad912ae8af48b22c7e3.zip | |
fixed conflict with global variable updatecount
(This used to be commit ba478e94047cc4f92ae35a508c9e62855619e665)
| -rw-r--r-- | source3/nameannounce.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/nameannounce.c b/source3/nameannounce.c index 0fad2fe7ec..14c16cadc1 100644 --- a/source3/nameannounce.c +++ b/source3/nameannounce.c @@ -200,10 +200,10 @@ void announce_backup(void) /**************************************************************************** send a host announcement packet **************************************************************************/ -void do_announce_host(int command, +static void do_announce_host(int command, char *from_name, int from_type, struct in_addr from_ip, char *to_name , int to_type , struct in_addr to_ip, - int updatecount, time_t announce_interval, + time_t announce_interval, char *server_name, int server_type, char *server_comment) { pstring outbuf; @@ -256,7 +256,7 @@ void announce_server(struct subnet_record *d, struct work_record *work, do_announce_host(ANN_LocalMasterAnnouncement, name , 0x00, d->myip, work->work_group, 0x1e, d->bcast_ip, - updatecount, ttl*1000, + ttl*1000, name, server_type, comment); DEBUG(3,("sending domain announce to %s for %s\n", @@ -268,7 +268,7 @@ void announce_server(struct subnet_record *d, struct work_record *work, do_announce_host(ANN_DomainAnnouncement, work->work_group, 0x00, d->myip, MSBROWSE , 0x01, d->bcast_ip, - updatecount, ttl*1000, + ttl*1000, name, server_type ? SV_TYPE_DOMAIN_ENUM : 0, comment); } } @@ -280,7 +280,7 @@ void announce_server(struct subnet_record *d, struct work_record *work, do_announce_host(ANN_HostAnnouncement, name , 0x00, d->myip, work->work_group, 0x1d, d->bcast_ip, - updatecount, ttl*1000, + ttl*1000, name, server_type, comment); } } |