sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r1104: get_called_name is used in the printing subsystem. In case of multi-homed

Browse Source 
servers we need to make sure that the clients are given back the IP address
they connected to.

Volker
This commit is contained in:
Volker Lendecke 2004-06-10 17:09:00 +00:00 committed by Gerald (Jerry) Carter
parent d8a545368c
commit 5f482df169
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/lib/util_sock.c
View File

@ -52,6 +52,23 @@ static char *get_socket_addr(int fd)
return addr_buf;
}
static int get_socket_port(int fd)
{
struct sockaddr sa;
struct sockaddr_in *sockin = (struct sockaddr_in *) (&sa);
socklen_t length = sizeof(sa);
if (fd == -1)
return -1;
if (getsockname(fd, &sa, &length) < 0) {
DEBUG(0,("getpeername failed. Error was %s\n", strerror(errno) ));
return -1;
}
return ntohs(sockin->sin_port);
}
/****************************************************************************
Determine if a file descriptor is in fact a socket.
****************************************************************************/
@ -837,6 +854,11 @@ char *client_socket_addr(void)
return get_socket_addr(client_fd);
}
int client_socket_port(void)
{
return get_socket_port(client_fd);
}
struct in_addr *client_inaddr(struct sockaddr *sa)
{
struct sockaddr_in *sockin = (struct sockaddr_in *) (sa);

5
source/param/loadparm.c
View File

@ -4262,7 +4262,10 @@ const char *get_called_name(void)
extern fstring local_machine;
static fstring called_name;
if (!*local_machine) {
if ( (!*local_machine) ||
(client_socket_port() == 445) ) {
/* Everybody coming in on 445 should be able to live with the
* IP address */
fstrcpy(called_name, client_socket_addr());
DEBUG(8,("get_called_name: assuming that client used IP address [%s] as called name.\n",
called_name));