summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2019-10-09 21:38:04 +0200
committerJeremy Allison <jra@samba.org>2019-11-06 20:36:34 +0000
commit54d673742f3a81ecdfb98f66a928d119293697ba (patch)
treefa58d1463508803e836bde6091283dad0a530dd7 /source3/smbd
parentb749c923373c7ccdc68ba2aed42c614e6a11d353 (diff)
downloadsamba-54d673742f3a81ecdfb98f66a928d119293697ba.tar.gz
lib: Remove #define serverid_equal server_id_equal
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/open.c2
-rw-r--r--source3/smbd/oplock.c2
-rw-r--r--source3/smbd/sesssetup.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 9493021c48d..2d4168c3ebe 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1566,7 +1566,7 @@ static bool validate_my_share_entries_fn(
struct validate_my_share_entries_state *state = private_data;
files_struct *fsp;
- if (!serverid_equal(&state->self, &e->pid)) {
+ if (!server_id_equal(&state->self, &e->pid)) {
return false;
}
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index b3da84b1269..e0a0fb8c41b 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -1040,7 +1040,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 (serverid_equal(&self, &src)) {
+ if (server_id_equal(&self, &src)) {
wait_before_sending_break();
}
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index d359ef3607a..390933cd6cd 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -516,7 +516,7 @@ static int shutdown_other_smbds(struct smbXsrv_session_global0 *session,
return 0;
}
- if (serverid_equal(&pid, &self_pid)) {
+ if (server_id_equal(&pid, &self_pid)) {
DEBUG(10, ("It's me\n"));
return 0;
}