diff options
author | Andrew Tridgell <tridge@samba.org> | 1998-08-31 07:23:11 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 1998-08-31 07:23:11 +0000 |
commit | 222b6d90e09288091028f5e0435f1d4a74153f66 (patch) | |
tree | a544352e2a19d725707f4ed928fa054d16cf9f33 | |
parent | 0a5718b0aef29706be81a50f2ac2c5eb4c6fbb32 (diff) | |
download | samba-222b6d90e09288091028f5e0435f1d4a74153f66.tar.gz samba-222b6d90e09288091028f5e0435f1d4a74153f66.tar.xz samba-222b6d90e09288091028f5e0435f1d4a74153f66.zip |
minor fixes to the DMB<->DMB sync code. We now get the dmb name from
the local_master name on the unicast subnet if it is unknown.
-rw-r--r-- | source/nmbd/nmbd_browsesync.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source/nmbd/nmbd_browsesync.c b/source/nmbd/nmbd_browsesync.c index b1fb4e631fd..5969395ef77 100644 --- a/source/nmbd/nmbd_browsesync.c +++ b/source/nmbd/nmbd_browsesync.c @@ -585,21 +585,26 @@ void sync_all_dmbs(time_t t) /* count how many syncs we might need to do */ for (work=unicast_subnet->workgrouplist; work; work = work->next) { - if (strcmp(global_myworkgroup, work->work_group) && - !ip_equal(work->dmb_addr, ipzero)) { + if (strcmp(global_myworkgroup, work->work_group)) { count++; } } /* sync with a probability of 1/count */ for (work=unicast_subnet->workgrouplist; work; work = work->next) { - if (strcmp(global_myworkgroup, work->work_group) && - !ip_equal(work->dmb_addr, ipzero)) { - + if (strcmp(global_myworkgroup, work->work_group)) { if (((unsigned)random()) % count != 0) continue; lastrun = t; + if (!work->dmb_name.name[0]) { + /* we don't know the DMB - assume it is + the same as the unicast local master */ + make_nmb_name(&work->dmb_name, + work->local_master_browser_name, + 0x20, scope); + } + DEBUG(3,("initiating DMB<->DMB sync with %s(%s)\n", work->dmb_name.name, inet_ntoa(work->dmb_addr))); |