diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-02 10:05:46 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-03 07:37:06 +0200 |
| commit | 85eb4377dbc9e2d25e0ee2e358e785347b09f0a7 (patch) | |
| tree | 6f9f20fc991926620678fba7df5aeb12b9241901 /source4/smb_server/smb/receive.c | |
| parent | 8da8c36b53cc115f0d446b666fc24fc9423d808e (diff) | |
| download | samba-85eb4377dbc9e2d25e0ee2e358e785347b09f0a7.tar.gz samba-85eb4377dbc9e2d25e0ee2e358e785347b09f0a7.tar.bz2 samba-85eb4377dbc9e2d25e0ee2e358e785347b09f0a7.zip | |
s4:cluster Rename .id to .pid in server_id
This also changes some DEBUG messages to use cluster_id_string()
rather than .id, to isolate them from this and other changes.
Andrew Bartlett
Diffstat (limited to 'source4/smb_server/smb/receive.c')
| -rw-r--r-- | source4/smb_server/smb/receive.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source4/smb_server/smb/receive.c b/source4/smb_server/smb/receive.c index c2503efabc..1e5d5681f4 100644 --- a/source4/smb_server/smb/receive.c +++ b/source4/smb_server/smb/receive.c @@ -25,7 +25,7 @@ #include "smb_server/smb_server.h" #include "system/filesys.h" #include "param/param.h" - +#include "cluster/cluster.h" /* send an oplock break request to a client @@ -471,6 +471,7 @@ static void switch_message(int type, struct smbsrv_request *req) int flags; struct smbsrv_connection *smb_conn = req->smb_conn; NTSTATUS status; + char *task_id; type &= 0xff; @@ -501,8 +502,10 @@ static void switch_message(int type, struct smbsrv_request *req) } } - DEBUG(5,("switch message %s (task_id %u)\n", - smb_fn_name(type), (unsigned)req->smb_conn->connection->server_id.id)); + task_id = cluster_id_string(NULL, req->smb_conn->connection->server_id); + DEBUG(5,("switch message %s (task_id %s)\n", + smb_fn_name(type), task_id)); + talloc_free(task_id); /* this must be called before we do any reply */ if (flags & SIGNING_NO_REPLY) { |