s3:util: rename procid_equal() to serverid_equal()

Signed-off-by: Stefan Metzmacher <metze@samba.org>

5 files changed, 9 insertions, 9 deletions

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 1fb7bdeb84..a3eedbfa6b 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -232,7 +232,7 @@ static void notify_deferred_opens(struct smbd_server_connection *sconn,
 	for (i=0; i<num_deferred; i++) {
 		struct share_mode_entry *e = &deferred[i];
 
-		if (procid_equal(&self, &e->pid)) {
+		if (serverid_equal(&self, &e->pid)) {
  			/*
  			 * We need to notify ourself to retry the open.  Do
  			 * this by finding the queued SMB record, moving it to
@@ -427,7 +427,7 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
 			    && (e->flags & SHARE_MODE_FLAG_POSIX_OPEN)) {
 				continue;
 			}
-			if (procid_equal(&self, &e->pid) &&
+			if (serverid_equal(&self, &e->pid) &&
 			    (e->share_file_id == fsp->fh->gen_id)) {
 				continue;
 			}
@@ -1103,7 +1103,7 @@ static NTSTATUS close_directory(struct smb_request *req, files_struct *fsp,
 				if (fsp->posix_open && (e->flags & SHARE_MODE_FLAG_POSIX_OPEN)) {
 					continue;
 				}
-				if (procid_equal(&self, &e->pid) &&
+				if (serverid_equal(&self, &e->pid) &&
 				    (e->share_file_id == fsp->fh->gen_id)) {
 					continue;
 				}
diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index 9af3b459ff..4fb1b351f3 100644
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -453,7 +453,7 @@ static NTSTATUS notify_del_entry(struct db_record *rec,
 		if (e->private_data != private_data) {
 			continue;
 		}
-		if (procid_equal(&e->server, pid)) {
+		if (serverid_equal(&e->server, pid)) {
 			break;
 		}
 	}
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 26d6971a42..273f3b2c1e 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -913,7 +913,7 @@ static void validate_my_share_entries(struct smbd_server_connection *sconn,
 	struct server_id self = messaging_server_id(sconn->msg_ctx);
 	files_struct *fsp;
 
-	if (!procid_equal(&self, &share_entry->pid)) {
+	if (!serverid_equal(&self, &share_entry->pid)) {
 		return;
 	}
 
@@ -1363,7 +1363,7 @@ static void defer_open(struct share_mode_lock *lck,
 		struct share_mode_entry *e = &lck->data->share_modes[i];
 
 		if (is_deferred_open_entry(e) &&
-		    procid_equal(&self, &e->pid) &&
+		    serverid_equal(&self, &e->pid) &&
 		    (e->op_mid == req->mid)) {
 			DEBUG(0, ("Trying to defer an already deferred "
 				"request: mid=%llu, exiting\n",
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 54d95a25b5..406ffd1e3d 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -564,7 +564,7 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx,
 
 	/* Need to wait before sending a break
 	   message if we sent ourselves this message. */
-	if (procid_equal(&self, &src)) {
+	if (serverid_equal(&self, &src)) {
 		wait_before_sending_break();
 	}
 
@@ -876,7 +876,7 @@ static void do_break_to_none(struct tevent_req *req)
  		 * Bugid #5980.
  		 */
 
-		if (procid_equal(&self, &share_entry->pid)) {
+		if (serverid_equal(&self, &share_entry->pid)) {
 			struct files_struct *cur_fsp =
 				initial_break_processing(state->sconn,
 					share_entry->id,
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 2658a3a27f..81e56eb208 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -343,7 +343,7 @@ static int shutdown_other_smbds(const struct connections_key *key,
 		return 0;
 	}
 
-	if (procid_equal(&crec->pid, &self_pid)) {
+	if (serverid_equal(&crec->pid, &self_pid)) {
 		DEBUG(10, ("It's me\n"));
 		return 0;
 	}