diff options
author | Jeremy Allison <jra@samba.org> | 1998-06-27 00:27:44 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 1998-06-27 00:27:44 +0000 |
commit | d8b0a8bab2334e9214975e3ac35c1556c4030fd9 (patch) | |
tree | 04815c3cc46e0d245b208ddf4e6d3d251c2a1f46 /source3/include | |
parent | bc39cff279ef3df174c1d1408f90e88666e64237 (diff) | |
download | samba-d8b0a8bab2334e9214975e3ac35c1556c4030fd9.tar.gz samba-d8b0a8bab2334e9214975e3ac35c1556c4030fd9.tar.bz2 samba-d8b0a8bab2334e9214975e3ac35c1556c4030fd9.zip |
nisppass.c: Fixed incorrect parameter usage.
nmbd_become_lmb.c: Add 'force_new_election' parameter to some functions.
This allows the start of the election to be done *after*
the demotion from local master browser is done.
Also changed code so release of 1d name is done
immediately to allow other local master to gain it.
nmbd_elections.c: Ensured no elections are run until we have registered
the WORKGROUP<1e> name that we must listen on to participate
in elections.
nmbd_incomingdgrams.c: Use force_new_election code.
nmbd_namelistdb.c: Make update_name_in_namelist static.
nmbd_subnetdb.c: Fix bug in comparison function. We cannot use memcmp
as structure packing may make this fail.
nmbd_packets.c: Ensure that we only send one release packet when
sending a broadcast packet.
nmbd_workgroupdb.c: Ensure we put the correct value in the ElectionCriterion field.
nmblib.c: Ensure make_nmb_name zero's the struct nmb_name.
Jeremy.
(This used to be commit 1fcb094ba04f01be1261ac92198c25b21b0d5ad5)
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/proto.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 1758301ef4..edf6e60915 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1260,8 +1260,8 @@ void unbecome_local_master_success(struct subnet_record *subrec, struct in_addr released_ip); void unbecome_local_master_fail(struct subnet_record *subrec, struct response_record *rrec, struct nmb_name *fail_name); -void release_1d_name( struct subnet_record *subrec, char *workgroup_name); -void unbecome_local_master_browser(struct subnet_record *subrec, struct work_record *work); +void unbecome_local_master_browser(struct subnet_record *subrec, struct work_record *work, + BOOL force_new_election); void become_local_master_browser(struct subnet_record *subrec, struct work_record *work); void set_workgroup_local_master_browser_name( struct work_record *work, char *newname); @@ -1335,8 +1335,6 @@ void refresh_my_names(time_t t); void set_samba_nb_type(void); BOOL ms_browser_name( char *name, int type ); -void update_name_in_namelist( struct subnet_record *subrec, - struct name_record *namerec ); void remove_name_from_namelist( struct subnet_record *subrec, struct name_record *namerec ); struct name_record *find_name_on_subnet( struct subnet_record *subrec, |