diff options
| author | Andreas Schneider <asn@samba.org> | 2011-06-16 15:49:41 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-07-04 18:28:26 +1000 |
| commit | 73d28912a4ff8393c655e239eb3d011cf67ad005 (patch) | |
| tree | 0e78e7ff8aad8df4e714930b650ecd4c2ebdf49c | |
| parent | ae05a7aec62d9ffcb02ee17d0f5f18e1e7ab1803 (diff) | |
| download | samba-73d28912a4ff8393c655e239eb3d011cf67ad005.tar.gz samba-73d28912a4ff8393c655e239eb3d011cf67ad005.tar.bz2 samba-73d28912a4ff8393c655e239eb3d011cf67ad005.zip | |
s3-smbd: Replace client_id in smbd service.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source3/smbd/service.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 1f87b9d785..73c3c4f20c 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -228,12 +228,22 @@ bool set_current_service(connection_struct *conn, uint16 flags, bool do_chdir) This function modifies dev, ecode. ****************************************************************************/ -static NTSTATUS share_sanity_checks(struct client_address *client_id, int snum, +static NTSTATUS share_sanity_checks(const struct tsocket_address *remote_address, + const char *rhost, + int snum, fstring dev) { - if (!lp_snum_ok(snum) || + char *raddr; + + raddr = tsocket_address_inet_addr_string(remote_address, + talloc_tos()); + if (raddr == NULL) { + return NT_STATUS_NO_MEMORY; + } + + if (!lp_snum_ok(snum) || !allow_access(lp_hostsdeny(snum), lp_hostsallow(snum), - client_id->name, client_id->addr)) { + rhost, raddr)) { return NT_STATUS_ACCESS_DENIED; } @@ -529,7 +539,10 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn, fstrcpy(dev, pdev); - *pstatus = share_sanity_checks(&sconn->client_id, snum, dev); + *pstatus = share_sanity_checks(sconn->remote_address, + sconn->remote_hostname, + snum, + dev); if (NT_STATUS_IS_ERR(*pstatus)) { goto err_root_exit; } @@ -869,7 +882,8 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn, if( DEBUGLVL( IS_IPC(conn) ? 3 : 1 ) ) { dbgtext( "%s (%s) ", get_remote_machine_name(), - conn->sconn->client_id.addr ); + tsocket_address_string(conn->sconn->remote_address, + talloc_tos()) ); dbgtext( "%s", srv_is_signing_active(sconn) ? "signed " : ""); dbgtext( "connect to service %s ", lp_servicename(snum) ); dbgtext( "initially as user %s ", @@ -1068,7 +1082,8 @@ void close_cnum(connection_struct *conn, uint16 vuid) DEBUG(IS_IPC(conn)?3:1, ("%s (%s) closed connection to service %s\n", get_remote_machine_name(), - conn->sconn->client_id.addr, + tsocket_address_string(conn->sconn->remote_address, + talloc_tos()), lp_servicename(SNUM(conn)))); /* Call VFS disconnect hook */ |