diff options
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/dbwrap/dbwrap_watch.c | 2 | ||||
| -rw-r--r-- | source3/lib/g_lock.c | 4 | ||||
| -rw-r--r-- | source3/lib/util.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/dbwrap/dbwrap_watch.c b/source3/lib/dbwrap/dbwrap_watch.c index ea75427ffc..701ac9d02f 100644 --- a/source3/lib/dbwrap/dbwrap_watch.c +++ b/source3/lib/dbwrap/dbwrap_watch.c @@ -166,7 +166,7 @@ static NTSTATUS dbwrap_record_del_watcher(TDB_DATA w_key, struct server_id id) num_ids = value.dsize / sizeof(struct server_id); for (i=0; i<num_ids; i++) { - if (procid_equal(&id, &ids[i])) { + if (serverid_equal(&id, &ids[i])) { ids[i] = ids[num_ids-1]; value.dsize -= sizeof(struct server_id); break; diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c index 06a14fac6c..d505b6bea6 100644 --- a/source3/lib/g_lock.c +++ b/source3/lib/g_lock.c @@ -119,7 +119,7 @@ static NTSTATUS g_lock_trylock(struct db_record *rec, struct server_id self, } for (i=0; i<num_locks; i++) { - if (procid_equal(&self, &locks[i].pid)) { + if (serverid_equal(&self, &locks[i].pid)) { status = NT_STATUS_INTERNAL_ERROR; goto done; } @@ -327,7 +327,7 @@ NTSTATUS g_lock_unlock(struct g_lock_ctx *ctx, const char *name) goto done; } for (i=0; i<num_locks; i++) { - if (procid_equal(&self, &locks[i].pid)) { + if (serverid_equal(&self, &locks[i].pid)) { break; } } diff --git a/source3/lib/util.c b/source3/lib/util.c index 2a01e2c9f9..653fff5c64 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -2058,7 +2058,7 @@ struct server_id *new_server_id_task(TALLOC_CTX *mem_ctx) return server_id; } -bool procid_equal(const struct server_id *p1, const struct server_id *p2) +bool serverid_equal(const struct server_id *p1, const struct server_id *p2) { if (p1->pid != p2->pid) { return false; |