From e6383f47629368d9dd4e803f17566a24e9d7359e Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 7 May 2007 09:35:35 +0000 Subject: 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) --- source3/include/smb.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/include/smb.h') diff --git a/source3/include/smb.h b/source3/include/smb.h index 6c44db5a34..f903772254 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -744,7 +744,7 @@ struct pending_message_list { /* struct returned by get_share_modes */ struct share_mode_entry { - struct process_id pid; + struct server_id pid; uint16 op_mid; uint16 op_type; uint32 access_mask; /* NTCreateX access bits (FILE_READ_DATA etc.) */ @@ -764,7 +764,7 @@ struct share_mode_entry { /* oplock break message definition - linearization of share_mode_entry. Offset Data length. -0 struct process_id pid 4 +0 struct server_id pid 4 4 uint16 op_mid 2 6 uint16 op_type 2 8 uint32 access_mask 4 @@ -822,7 +822,7 @@ struct locking_data { /* Used to store pipe open records for NetFileEnum() */ struct pipe_open_rec { - struct process_id pid; + struct server_id pid; uid_t uid; int pnum; fstring name; @@ -869,14 +869,14 @@ struct pipe_open_rec { /* key and data in the connections database - used in smbstatus and smbd */ struct connections_key { - struct process_id pid; + struct server_id pid; int cnum; fstring name; }; struct connections_data { int magic; - struct process_id pid; + struct server_id pid; int cnum; uid_t uid; gid_t gid; -- cgit