diff options
| author | Jeremy Allison <jra@samba.org> | 2007-11-03 23:20:10 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-11-03 23:20:10 -0700 |
| commit | 5b0b4f23ef5fec3d1ad518237f973d4e014b5766 (patch) | |
| tree | f75cdfaef81e5fcc0cf7061e0141b97831508ee1 /source3/lib/substitute.c | |
| parent | 51a0354d751f48a2542984c81e218da33669bbeb (diff) | |
| download | samba-5b0b4f23ef5fec3d1ad518237f973d4e014b5766.tar.gz samba-5b0b4f23ef5fec3d1ad518237f973d4e014b5766.tar.bz2 samba-5b0b4f23ef5fec3d1ad518237f973d4e014b5766.zip | |
Remove most of the remaining globals out of lib/util_sock.c.
I have a plan for dealing with the remaining..... Watch
this space.
Jeremy.
(This used to be commit 963fc7685212689f02b3adcc05b4273ee5c382d4)
Diffstat (limited to 'source3/lib/substitute.c')
| -rw-r--r-- | source3/lib/substitute.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index bd15399b13..7f357e9f67 100644 --- a/source3/lib/substitute.c +++ b/source3/lib/substitute.c @@ -52,7 +52,8 @@ void set_local_machine_name(const char* local_name, bool perm) */ if ( strequal(tmp_local_machine, "*SMBSERVER") || strequal(tmp_local_machine, "*SMBSERV") ) { - fstrcpy( local_machine, client_socket_addr(addr, sizeof(addr)) ); + fstrcpy( local_machine, + client_socket_addr(get_client_fd(), addr, sizeof(addr)) ); return; } @@ -497,11 +498,11 @@ char *alloc_sub_basic(const char *smb_name, const char *domain_name, break; case 'I' : a_string = realloc_string_sub(a_string, "%I", - client_addr(addr, sizeof(addr))); + client_addr(get_client_fd(),addr, sizeof(addr))); break; case 'i': a_string = realloc_string_sub( a_string, "%i", - client_socket_addr(addr, sizeof(addr)) ); + client_socket_addr(get_client_fd(), addr, sizeof(addr)) ); break; case 'L' : if ( StrnCaseCmp(p, "%LOGONSERVER%", strlen("%LOGONSERVER%")) == 0 ) { @@ -517,7 +518,7 @@ char *alloc_sub_basic(const char *smb_name, const char *domain_name, a_string = realloc_string_sub(a_string, "%N", automount_server(smb_name)); break; case 'M' : - a_string = realloc_string_sub(a_string, "%M", client_name()); + a_string = realloc_string_sub(a_string, "%M", client_name(get_client_fd())); break; case 'R' : a_string = realloc_string_sub(a_string, "%R", remote_proto); |