diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-02-10 07:39:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:40 -0500 |
| commit | 75ddf59ea110117578acd3a7b889549bfb40473c (patch) | |
| tree | 426a4ad58c5e827c846b6a3f1ace4bbbf8749d03 /source4/smb_server | |
| parent | a5bd1ccadab723c531963c219a1ac2b6b0c8b845 (diff) | |
| download | samba-75ddf59ea110117578acd3a7b889549bfb40473c.tar.gz samba-75ddf59ea110117578acd3a7b889549bfb40473c.tar.bz2 samba-75ddf59ea110117578acd3a7b889549bfb40473c.zip | |
r5308: trimmed back a lot of the old macros from smb_macros.h
(This used to be commit bf43c9bdcf9e654d123f6a2b29feb9189ca9e561)
Diffstat (limited to 'source4/smb_server')
| -rw-r--r-- | source4/smb_server/conn.c | 2 | ||||
| -rw-r--r-- | source4/smb_server/service.c | 5 |
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; } |