sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-10-24 15:33:20 +03:00
Code Activity

r8681: if SOCKET_WRAPPER_DIR starts with ./ then strip it internally. This saves us 2 more chars

Browse Source 
in the name, which is enough to get IRIX 6.4 working
This commit is contained in:
Andrew Tridgell
2005-07-21 13:45:07 +00:00
committed by Gerald (Jerry) Carter
parent e84871dd32
commit e6d9cde482
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/lib/socket_wrapper/socket_wrapper.c
View File

@@ -95,6 +95,19 @@ struct socket_info
static struct socket_info *sockets = NULL;
static const char *socket_wrapper_dir(void)
{
const char *s = getenv("SOCKET_WRAPPER_DIR");
if (s == NULL) {
return NULL;
}
if (strncmp(s, "./", 2) == 0) {
s += 2;
}
return s;
}
static int convert_un_in(const struct sockaddr_un *un, struct sockaddr_in *in, socklen_t *len)
{
unsigned int prt;
@@ -128,12 +141,12 @@ static int convert_in_un(struct socket_info *si, const struct sockaddr_in *in, s
prt = 5000;
do {
snprintf(un->sun_path, sizeof(un->sun_path), "%s/"SOCKET_FORMAT,
getenv("SOCKET_WRAPPER_DIR"), type, ++prt);
socket_wrapper_dir(), type, ++prt);
} while (stat(un->sun_path, &st) == 0 && prt < 10000);
((struct sockaddr_in *)si->myname)->sin_port = htons(prt);
}
snprintf(un->sun_path, sizeof(un->sun_path), "%s/"SOCKET_FORMAT,
getenv("SOCKET_WRAPPER_DIR"), type, prt);
socket_wrapper_dir(), type, prt);
return 0;
}
@@ -205,7 +218,7 @@ int swrap_socket(int domain, int type, int protocol)
struct socket_info *si;
int fd;
if (!getenv("SOCKET_WRAPPER_DIR")) {
if (!socket_wrapper_dir()) {
return real_socket(domain, type, protocol);
}
@@ -280,7 +293,7 @@ static int swrap_auto_bind(struct socket_info *si)
for (i=0;i<1000;i++) {
snprintf(un_addr.sun_path, sizeof(un_addr.sun_path),
"%s/"SOCKET_FORMAT, getenv("SOCKET_WRAPPER_DIR"),
"%s/"SOCKET_FORMAT, socket_wrapper_dir(),
SOCK_DGRAM, i + 10000);
if (bind(si->fd, (struct sockaddr *)&un_addr,
sizeof(un_addr)) == 0) {