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

s3:smbd: Fix build on AIX

Browse Source 
AIX makes a define of ip_len in netinet/ip.h (sic!)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13731

Signed-off-by: Bjoern Jacke <bj@sernet.de>
Reviewed-by: Andreas Schneider <asn@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Jan  4 16:29:50 CET 2019 on sn-devel-144
This commit is contained in:
Bjoern Jacke
2018-11-28 04:38:44 -06:00
committed by Andreas Schneider
parent f353c93096
commit b7d350b45b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source3/smbd/sesssetup.c
View File

@ -482,7 +482,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req)
struct shutdown_state {
const char *ip;
size_t ip_len;
size_t ip_length;
struct messaging_context *msg_ctx;
};
@ -517,10 +517,10 @@ static int shutdown_other_smbds(struct smbXsrv_session_global0 *session,
}
addr_len = port_colon - addr;
if ((addr_len != state->ip_len) ||
(strncmp(addr, state->ip, state->ip_len) != 0)) {
if ((addr_len != state->ip_length) ||
(strncmp(addr, state->ip, state->ip_length) != 0)) {
DEBUG(10, ("%s (%zu) does not match %s (%zu)\n",
state->ip, state->ip_len, addr, addr_len));
state->ip, state->ip_length, addr, addr_len));
return 0;
}
@ -554,7 +554,7 @@ static void setup_new_vc_session(struct smbd_server_connection *sconn)
if (port_colon == NULL) {
return;
}
state.ip_len = port_colon - addr;
state.ip_length = port_colon - addr;
state.msg_ctx = sconn->msg_ctx;
smbXsrv_session_global_traverse(shutdown_other_smbds, &state);
TALLOC_FREE(addr);