lib: Remove #define serverid_equal server_id_equal

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/include/proto.h b/source3/include/proto.h
index c98f7cfa351b8c5d96d8b1a67a7af77eeb9cb9be..cdec671dac366b818222e33f879f4c720233ec70 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -399,7 +399,6 @@ uint32_t map_share_mode_to_deny_mode(uint32_t share_access, uint32_t private_opt
 
 #include "lib/util_procid.h"
 
-#define serverid_equal(p1, p2) server_id_equal(p1,p2)
 struct server_id interpret_pid(const char *pid_string);
 bool is_offset_safe(const char *buf_base, size_t buf_len, char *ptr, size_t off);
 char *get_safe_ptr(const char *buf_base, size_t buf_len, char *ptr, size_t off);

diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index ef6bbb52613b901d446f24ba30b86d62b7478c67..54caf924864f6412f91a644d57e5a31eb9f84c13 100644 (file)
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -244,7 +244,7 @@ static NTSTATUS g_lock_trylock(struct db_record *rec, struct server_id self,
 
                g_lock_get_rec(&lck, i, &lock);
 
-               if (serverid_equal(&self, &lock.pid)) {
+               if (server_id_equal(&self, &lock.pid)) {
                        if (lock.lock_type == type) {
                                status = NT_STATUS_WAS_LOCKED;
                                goto done;
@@ -528,7 +528,7 @@ static void g_lock_unlock_fn(struct db_record *rec,
        for (i=0; i<lck.num_recs; i++) {
                struct g_lock_rec lockrec;
                g_lock_get_rec(&lck, i, &lockrec);
-               if (serverid_equal(&state->self, &lockrec.pid)) {
+               if (server_id_equal(&state->self, &lockrec.pid)) {
                        break;
                }
        }
@@ -601,7 +601,7 @@ static void g_lock_write_data_fn(struct db_record *rec,
                struct g_lock_rec lockrec;
                g_lock_get_rec(&lck, i, &lockrec);
                if ((lockrec.lock_type == G_LOCK_WRITE) &&
-                   serverid_equal(&state->self, &lockrec.pid)) {
+                   server_id_equal(&state->self, &lockrec.pid)) {
                        break;
                }
        }

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index f3fb75ef1368ac0eed2f0e4f99f0d86fca7f0441..c0ff99a21c5bf04355f59cc6bd30c5d4ec359ee7 100644 (file)
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -112,7 +112,7 @@ const struct GUID *brl_req_guid(const struct byte_range_lock *brl)
 static bool brl_same_context(const struct lock_context *ctx1,
                             const struct lock_context *ctx2)
 {
-       return (serverid_equal(&ctx1->pid, &ctx2->pid) &&
+       return (server_id_equal(&ctx1->pid, &ctx2->pid) &&
                (ctx1->smblctx == ctx2->smblctx) &&
                (ctx1->tid == ctx2->tid));
 }
@@ -1466,7 +1466,8 @@ void brl_close_fnum(struct byte_range_lock *br_lck)
        for (i=0; i < num_locks_copy; i++) {
                struct lock_struct *lock = &locks_copy[i];
 
-               if (lock->context.tid == tid && serverid_equal(&lock->context.pid, &pid) &&
+               if (lock->context.tid == tid &&
+                   server_id_equal(&lock->context.pid, &pid) &&
                                (lock->fnum == fnum)) {
                        brl_unlock(
                                br_lck,
@@ -1525,7 +1526,7 @@ bool brl_mark_disconnected(struct files_struct *fsp)
                        return false;
                }
 
-               if (!serverid_equal(&lock->context.pid, &self)) {
+               if (!server_id_equal(&lock->context.pid, &self)) {
                        TALLOC_FREE(br_lck);
                        return false;
                }

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 568d2002229563a334789cf3b6a274e771d27a33..f90458d9d4f057ac4348a1c1760ad239ac0d157e 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -532,7 +532,7 @@ static bool rename_share_filename_fn(
        e->name_hash = state->new_name_hash;
        *modified = true;
 
-       ok = serverid_equal(&e->pid, &state->self);
+       ok = server_id_equal(&e->pid, &state->self);
        if (ok) {
                return false;
        }

diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 3b75cfe481aa8ed044ac5dc56a506350b2a674ee..91485133eb275cb4035664e09dc1fb3bfe7f42a9 100644 (file)
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -681,7 +681,7 @@ static struct lock_list *posix_lock_list(TALLOC_CTX *ctx,
                }
 
                /* Ignore locks not owned by this process. */
-               if (!serverid_equal(&lock->context.pid, &lock_ctx->pid)) {
+               if (!server_id_equal(&lock->context.pid, &lock_ctx->pid)) {
                        continue;
                }
 
@@ -1223,7 +1223,7 @@ static bool locks_exist_on_context(const struct lock_struct *plocks,
                }
 
                /* Ignore locks not owned by this process. */
-               if (!serverid_equal(&lock->context.pid, &lock_ctx->pid)) {
+               if (!server_id_equal(&lock->context.pid, &lock_ctx->pid)) {
                        continue;
                }
 

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 6246a61672e51d46d55b3fec03504d6d5e6358b9..d4de3cdcfdd5dd76fdf613ae04977c29fce6ec33 100644 (file)
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -862,7 +862,7 @@ static int count_sess_files_fn(struct file_id fid,
                */
                struct sessionid *sess = &info->session_list[rh + i];
                if ((e->uid == sess->uid) &&
-                    serverid_equal(&e->pid, &sess->pid)) {
+                    server_id_equal(&e->pid, &sess->pid)) {
 
                        info->ctr->array[i].num_open++;
                        return 0;
@@ -981,7 +981,8 @@ static int share_file_fn(struct file_id fid,
 
        if (strequal(d->servicepath, sfs->in_sharepath)) {
                for (i=0; i < sfs->resp_entries; i++) {
-                       if (serverid_equal(&e->pid, &sfs->svrid_arr[offset + i])) {
+                       if (server_id_equal(
+                                   &e->pid, &sfs->svrid_arr[offset + i])) {
                                sfs->netconn_arr[i].num_open ++;
                                return 0;
                        }

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 9493021c48dc1147fb29a8f6a24c42b392473ed5..2d4168c3ebe9cdfdbbb619ef816e5b7ad6f0a857 100644 (file)
--- 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 b3da84b126903b67ccb1d527a51cb32863a73ed2..e0a0fb8c41b9d0d5d171608a24bb8ed6a9d8f919 100644 (file)
--- 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 d359ef3607a7fd01d7d1b056a6a54df12fa2cb41..390933cd6cd51192d2bcd38201b765caf85690b5 100644 (file)
--- 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;
        }

diff --git a/source3/torture/test_g_lock.c b/source3/torture/test_g_lock.c
index 352121e41944ae1f1e1a15e60360ee1a5fc37f8c..615f7fcfbe8dd930e2faaa042e90274d0ed6f3a5 100644 (file)
--- a/source3/torture/test_g_lock.c
+++ b/source3/torture/test_g_lock.c
@@ -421,7 +421,7 @@ static void lock4_check(const struct g_lock_rec *locks,
                return;
        }
 
-       if (!serverid_equal(&state->me, &locks[0].pid)) {
+       if (!server_id_equal(&state->me, &locks[0].pid)) {
                struct server_id_buf buf1, buf2;
                fprintf(stderr, "me=%s, locker=%s\n",
                        server_id_str_buf(state->me, &buf1),

diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c
index 939c3635d546d7bc60557849e96b85c91f41a5e8..dd585ebc5099a064c7043b8931580a4b776a9adf 100644 (file)
--- a/source3/utils/net_status.c
+++ b/source3/utils/net_status.c
@@ -156,7 +156,7 @@ static int show_share_parseable(const struct connections_key *key,
 
        for (i=0; i<ids->num_entries; i++) {
                struct server_id id = ids->entries[i].pid;
-               if (serverid_equal(&id, &crec->pid)) {
+               if (server_id_equal(&id, &crec->pid)) {
                        guest = false;
                        break;
                }

diff --git a/source3/utils/status.c b/source3/utils/status.c
index e60f9034688b5b2d40041b9592ff68f660a96204..36f7030e4f41bb39ab97a59d392c3d52b8e49860 100644 (file)
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -93,7 +93,7 @@ static unsigned int Ucrit_checkPid(struct server_id pid)
                return 1;
 
        for (i=0;i<Ucrit_MaxPid;i++) {
-               if (serverid_equal(&pid, &Ucrit_pid[i])) {
+               if (server_id_equal(&pid, &Ucrit_pid[i])) {
                        return 1;
                }
        }