sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

r26406: Make a copy to prevent modification of the loadparm configuration.

Browse Source 
(This used to be commit c0f2775fd8)
This commit is contained in:
Jelmer Vernooij
2007-12-11 22:23:34 +01:00
committed by Stefan Metzmacher
parent c64c571591
commit fc88ba4a7e
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source4/lib/socket/connect.c
View File

@ -123,7 +123,7 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
set_blocking(socket_get_fd(sock), false);
if (resolve_ctx && server_address->addr && strcmp(sock->backend_name, "ipv4") == 0) {
if (resolve_ctx != NULL && server_address->addr && strcmp(sock->backend_name, "ipv4") == 0) {
struct nbt_name name;
struct composite_context *creq;
make_nbt_name_client(&name, server_address->addr);

11
source4/lib/socket/interface.c
View File

@ -118,6 +118,7 @@ static void interpret_interface(TALLOC_CTX *mem_ctx,
{
struct in_addr ip, nmask;
char *p;
char *address;
int i, added=0;
ip.s_addr = 0;
@ -154,10 +155,13 @@ static void interpret_interface(TALLOC_CTX *mem_ctx,
return;
}
address = talloc_strdup(mem_ctx, token);
p = strchr_m(address,'/');
/* parse it into an IP address/netmasklength pair */
*p++ = 0;
ip.s_addr = interpret_addr2(token).s_addr;
ip.s_addr = interpret_addr2(address).s_addr;
if (strlen(p) > 2) {
nmask.s_addr = interpret_addr2(p).s_addr;
@ -172,14 +176,17 @@ static void interpret_interface(TALLOC_CTX *mem_ctx,
if (same_net(ip, probed_ifaces[i].ip, nmask)) {
add_interface(mem_ctx, probed_ifaces[i].ip, nmask,
local_interfaces);
talloc_free(address);
return;
}
}
DEBUG(2,("Can't determine ip for broadcast address %s\n", token));
DEBUG(2,("Can't determine ip for broadcast address %s\n", address));
talloc_free(address);
return;
}
add_interface(mem_ctx, ip, nmask, local_interfaces);
talloc_free(address);
}