summaryrefslogtreecommitdiff
path: root/source4/smb_server
diff options
context:
space:
mode:
Diffstat (limited to 'source4/smb_server')
-rw-r--r--source4/smb_server/conn.c2
-rw-r--r--source4/smb_server/service.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/source4/smb_server/conn.c b/source4/smb_server/conn.c
index 45c5376e25..6ca8e4286c 100644
--- a/source4/smb_server/conn.c
+++ b/source4/smb_server/conn.c
@@ -52,7 +52,7 @@ static int smbsrv_tcon_destructor(void *ptr)
DEBUG(3,("%s closed connection to service %s\n",
socket_get_peer_addr(tcon->smb_conn->connection->socket, tcon),
- lp_servicename(SNUM(tcon))));
+ lp_servicename(tcon->service)));
/* tell the ntvfs backend that we are disconnecting */
ntvfs_disconnect(tcon);
diff --git a/source4/smb_server/service.c b/source4/smb_server/service.c
index 180deaf8c5..bb74a5c2d9 100644
--- a/source4/smb_server/service.c
+++ b/source4/smb_server/service.c
@@ -73,7 +73,7 @@ static int find_service(const char *service)
iService = lp_servicenumber(service);
- if (iService >= 0 && !VALID_SNUM(iService)) {
+ if (iService >= 0 && !lp_snum_ok(iService)) {
DEBUG(0,("Invalid snum %d for %s\n",iService, service));
iService = -1;
}
@@ -117,7 +117,8 @@ static NTSTATUS make_connection_snum(struct smbsrv_request *req,
/* init ntvfs function pointers */
status = ntvfs_init_connection(req, type);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("ntvfs_init_connection failed for service %s\n", lp_servicename(SNUM(tcon))));
+ DEBUG(0, ("ntvfs_init_connection failed for service %s\n",
+ lp_servicename(tcon->service)));
return status;
}