summaryrefslogtreecommitdiff
path: root/source3/nmbd
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-05-07 09:35:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:21:52 -0500
commite6383f47629368d9dd4e803f17566a24e9d7359e (patch)
treecebde89910087c3220786f209da2c4e32a71bc46 /source3/nmbd
parentd1153fc79076741571b203b1d70f1536bde208f0 (diff)
downloadsamba-e6383f47629368d9dd4e803f17566a24e9d7359e.tar.gz
samba-e6383f47629368d9dd4e803f17566a24e9d7359e.tar.bz2
samba-e6383f47629368d9dd4e803f17566a24e9d7359e.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 (This used to be commit 0ad4b1226c9d91b72136310d3bbb640d2c5d67b8)
Diffstat (limited to 'source3/nmbd')
-rw-r--r--source3/nmbd/nmbd.c6
-rw-r--r--source3/nmbd/nmbd_elections.c2
-rw-r--r--source3/nmbd/nmbd_winsserver.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 3a18e66774..6e0de362b9 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/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/source3/nmbd/nmbd_elections.c b/source3/nmbd/nmbd_elections.c
index eb6f1b6e0a..a053d0803b 100644
--- a/source3/nmbd/nmbd_elections.c
+++ b/source3/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/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c
index 9c2fe72702..fc9b95491c 100644
--- a/source3/nmbd/nmbd_winsserver.c
+++ b/source3/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;