summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-02-23 15:04:10 +0100
committerVolker Lendecke <vl@samba.org>2010-02-23 15:30:00 +0100
commit752bffc53fcf296f841d62ffbf8d424f9e8e66bd (patch)
treed5139fe0fd5974d94262524112679e5cc6efd0e1 /source3/smbd
parentce7727c1cc2fe4caa9b2d6e33530c3483dd5f980 (diff)
downloadsamba-752bffc53fcf296f841d62ffbf8d424f9e8e66bd.tar.gz
samba-752bffc53fcf296f841d62ffbf8d424f9e8e66bd.tar.bz2
samba-752bffc53fcf296f841d62ffbf8d424f9e8e66bd.zip
s3: Consolidate server_id_self into the equivalent procid_self()
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/server.c2
-rw-r--r--source3/smbd/service.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index ea1ef2ef89..9d7de1637a 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -60,7 +60,7 @@ struct messaging_context *smbd_messaging_context(void)
{
if (smbd_msg_ctx == NULL) {
smbd_msg_ctx = messaging_init(talloc_autofree_context(),
- server_id_self(),
+ procid_self(),
smbd_event_context());
}
if (smbd_msg_ctx == NULL) {
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 4bc5ca1a5c..0452ef5e99 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -888,7 +888,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
on_err_call_dis_hook = true;
if ((!conn->printer) && (!conn->ipc)) {
- conn->notify_ctx = notify_init(conn, server_id_self(),
+ conn->notify_ctx = notify_init(conn, procid_self(),
smbd_messaging_context(),
smbd_event_context(),
conn);