sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

lib/util Bring procid_str() into lib/util as server_id_string()

Browse Source 
This is needed for OpenChange, which prints Samba struct server_id
values in debug messages.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2011-06-08 14:05:55 +10:00
parent d01dbd6c3f
commit 16b1c77644
22 changed files with 77 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source3/lib/g_lock.c
View File

@ -108,7 +108,7 @@ static bool g_lock_parse(TALLOC_CTX *mem_ctx, TDB_DATA data,
DEBUG(10, ("locks:\n"));
for (i=0; i<num_locks; i++) {
DEBUGADD(10, ("%s: %s %s\n",
procid_str(talloc_tos(), &locks[i].pid),
server_id_str(talloc_tos(), &locks[i].pid),
((locks[i].lock_type & 1) == G_LOCK_READ) ?
"read" : "write",
(locks[i].lock_type & G_LOCK_PENDING) ?
@ -118,7 +118,7 @@ static bool g_lock_parse(TALLOC_CTX *mem_ctx, TDB_DATA data,
&& !process_exists(locks[i].pid)) {
DEBUGADD(10, ("lock owner %s died -- discarding\n",
procid_str(talloc_tos(),
server_id_str(talloc_tos(),
&locks[i].pid)));
if (i < (num_locks-1)) {
@ -146,7 +146,7 @@ static void g_lock_cleanup(int *pnum_locks, struct g_lock_rec *locks)
continue;
}
DEBUGADD(10, ("%s does not exist -- discarding\n",
procid_str(talloc_tos(), &locks[i].pid)));
server_id_str(talloc_tos(), &locks[i].pid)));
if (i < (num_locks-1)) {
locks[i] = locks[num_locks-1];
@ -496,7 +496,7 @@ static void g_lock_got_retry(struct messaging_context *msg,
bool *pretry = (bool *)private_data;
DEBUG(10, ("Got retry message from pid %s\n",
procid_str(talloc_tos(), &server_id)));
server_id_str(talloc_tos(), &server_id)));
*pretry = true;
}
@ -587,7 +587,7 @@ static NTSTATUS g_lock_force_unlock(struct g_lock_ctx *ctx, const char *name,
&data_blob_null);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, ("sending retry to %s failed: %s\n",
procid_str(talloc_tos(),
server_id_str(talloc_tos(),
&locks[i].pid),
nt_errstr(status)));
} else {