diff options
| author | Jeremy Allison <jra@samba.org> | 2007-11-03 18:15:45 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-11-03 18:15:45 -0700 |
| commit | 6658165d5e9cd186fea74e1581091233e8990e9b (patch) | |
| tree | 13d5e5fd6d9d93adb4e60e58c5abacbbb959ecc7 /source3/smbd/service.c | |
| parent | 73d407968002587eadd0ff13eb413ddf07c78771 (diff) | |
| download | samba-6658165d5e9cd186fea74e1581091233e8990e9b.tar.gz samba-6658165d5e9cd186fea74e1581091233e8990e9b.tar.bz2 samba-6658165d5e9cd186fea74e1581091233e8990e9b.zip | |
Stop get_peer_addr() and client_addr() from using global
statics. Part of my library cleanups.
Jeremy.
(This used to be commit e848506c858bd16706c1d7f6b4b032005512b8ac)
Diffstat (limited to 'source3/smbd/service.c')
| -rw-r--r-- | source3/smbd/service.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c index bb279b701f..2901cd3417 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -642,6 +642,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, fstring user; fstring dev; int ret; + char addr[INET6_ADDRSTRLEN]; *user = 0; fstrcpy(dev, pdev); @@ -757,7 +758,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser, add_session_user(user); - safe_strcpy(conn->client_address, client_addr(), + safe_strcpy(conn->client_address, client_addr(addr), sizeof(conn->client_address)-1); conn->num_files_open = 0; conn->lastused = conn->lastused_count = time(NULL); @@ -1204,6 +1205,7 @@ connection_struct *make_connection(const char *service_in, DATA_BLOB password, fstring service; fstring dev; int snum = -1; + char addr[INET6_ADDRSTRLEN]; fstrcpy(dev, pdev); @@ -1300,7 +1302,7 @@ connection_struct *make_connection(const char *service_in, DATA_BLOB password, } DEBUG(0,("%s (%s) couldn't find service %s\n", - get_remote_machine_name(), client_addr(), service)); + get_remote_machine_name(), client_addr(addr), service)); *status = NT_STATUS_BAD_NETWORK_NAME; return NULL; } |