diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-05-07 09:35:35 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:21:52 -0500 |
| commit | 0ad4b1226c9d91b72136310d3bbb640d2c5d67b8 (patch) | |
| tree | 5802777343908206d060d7a38a1c09633bebd8e8 /source/nmbd | |
| parent | cc0cd3a12f76b8cd711e3165d4cfe920552f256d (diff) | |
| download | samba-0ad4b1226c9d91b72136310d3bbb640d2c5d67b8.tar.gz samba-0ad4b1226c9d91b72136310d3bbb640d2c5d67b8.tar.xz samba-0ad4b1226c9d91b72136310d3bbb640d2c5d67b8.zip | |
r22736: Start to merge the low-hanging fruit from the now 7000-line cluster patch.
This changes "struct process_id" to "struct server_id", keeping both is
just too much hassle. No functional change (I hope ;-))
Volker
Diffstat (limited to 'source/nmbd')
| -rw-r--r-- | source/nmbd/nmbd.c | 6 | ||||
| -rw-r--r-- | source/nmbd/nmbd_elections.c | 2 | ||||
| -rw-r--r-- | source/nmbd/nmbd_winsserver.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/nmbd/nmbd.c b/source/nmbd/nmbd.c index 3a18e667740..6e0de362b98 100644 --- a/source/nmbd/nmbd.c +++ b/source/nmbd/nmbd.c @@ -67,7 +67,7 @@ static void terminate(void) Handle a SHUTDOWN message from smbcontrol. **************************************************************************** */ -static void nmbd_terminate(int msg_type, struct process_id src, +static void nmbd_terminate(int msg_type, struct server_id src, void *buf, size_t len, void *private_data) { terminate(); @@ -262,7 +262,7 @@ static BOOL reload_nmbd_services(BOOL test) * detects that there are no subnets. **************************************************************************** */ -static void msg_reload_nmbd_services(int msg_type, struct process_id src, +static void msg_reload_nmbd_services(int msg_type, struct server_id src, void *buf, size_t len, void *private_data) { write_browse_list( 0, True ); @@ -279,7 +279,7 @@ static void msg_reload_nmbd_services(int msg_type, struct process_id src, } } -static void msg_nmbd_send_packet(int msg_type, struct process_id src, +static void msg_nmbd_send_packet(int msg_type, struct server_id src, void *buf, size_t len, void *private_data) { struct packet_struct *p = (struct packet_struct *)buf; diff --git a/source/nmbd/nmbd_elections.c b/source/nmbd/nmbd_elections.c index eb6f1b6e0aa..a053d0803b0 100644 --- a/source/nmbd/nmbd_elections.c +++ b/source/nmbd/nmbd_elections.c @@ -378,7 +378,7 @@ yet registered on subnet %s\n", nmb_namestr(&nmbname), subrec->subnet_name )); Process a internal Samba message forcing an election. ***************************************************************************/ -void nmbd_message_election(int msg_type, struct process_id src, +void nmbd_message_election(int msg_type, struct server_id src, void *buf, size_t len, void *private_data) { struct subnet_record *subrec; diff --git a/source/nmbd/nmbd_winsserver.c b/source/nmbd/nmbd_winsserver.c index 9c2fe727020..fc9b95491c5 100644 --- a/source/nmbd/nmbd_winsserver.c +++ b/source/nmbd/nmbd_winsserver.c @@ -2370,7 +2370,7 @@ void wins_write_database(time_t t, BOOL background) Process a internal Samba message receiving a wins record. ***************************************************************************/ -void nmbd_wins_new_entry(int msg_type, struct process_id src, +void nmbd_wins_new_entry(int msg_type, struct server_id src, void *buf, size_t len, void *private_data) { WINS_RECORD *record; |