summaryrefslogtreecommitdiff
path: root/source3/lib/substitute.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-14 10:22:12 +0200
committerVolker Lendecke <vl@samba.org>2010-08-16 13:13:10 +0200
commit96ae4570230d2d47e23da6909f6e21dd43a19868 (patch)
tree2227d283971d61991b7859ef05a8390e37eb00ee /source3/lib/substitute.c
parenta482b3e14ec4e3eada9c2477c9eae2bfbe017f53 (diff)
downloadsamba-96ae4570230d2d47e23da6909f6e21dd43a19868.tar.gz
samba-96ae4570230d2d47e23da6909f6e21dd43a19868.tar.bz2
samba-96ae4570230d2d47e23da6909f6e21dd43a19868.zip
s3: Remove get_client_fd()
Diffstat (limited to 'source3/lib/substitute.c')
-rw-r--r--source3/lib/substitute.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index dbb5f7d08a..e5f1b2dbdf 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -62,7 +62,7 @@ bool set_local_machine_name(const char *local_name, bool perm)
if (strequal(tmp_local_machine, "*SMBSERVER") ||
strequal(tmp_local_machine, "*SMBSERV") ) {
SAFE_FREE(local_machine);
- local_machine = SMB_STRDUP(client_socket_addr(get_client_fd(),
+ local_machine = SMB_STRDUP(client_socket_addr(smbd_server_fd(),
addr, sizeof(addr)) );
SAFE_FREE(tmp_local_machine);
return local_machine ? true : false;
@@ -609,7 +609,7 @@ static char *alloc_sub_basic(const char *smb_name, const char *domain_name,
break;
case 'I' : {
int offset = 0;
- client_addr(get_client_fd(), addr, sizeof(addr));
+ client_addr(smbd_server_fd(), addr, sizeof(addr));
if (strnequal(addr,"::ffff:",7)) {
offset = 7;
}
@@ -618,8 +618,10 @@ static char *alloc_sub_basic(const char *smb_name, const char *domain_name,
break;
}
case 'i':
- a_string = realloc_string_sub( a_string, "%i",
- client_socket_addr(get_client_fd(), addr, sizeof(addr)) );
+ a_string = realloc_string_sub(
+ a_string, "%i",
+ client_socket_addr(smbd_server_fd(),
+ addr, sizeof(addr)));
break;
case 'L' :
if ( StrnCaseCmp(p, "%LOGONSERVER%", strlen("%LOGONSERVER%")) == 0 ) {
@@ -635,7 +637,8 @@ static 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(get_client_fd()));
+ a_string = realloc_string_sub(
+ a_string, "%M", client_name(smbd_server_fd()));
break;
case 'R' :
a_string = realloc_string_sub(a_string, "%R", remote_proto);