The branch, master has been updated via b7d350b45bc s3:smbd: Fix build on AIX from f353c930969 waf: let CHECK_SIZEOF check for 64 bit also
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit b7d350b45bc032bf1b61f0184500d068631b7329 Author: Bjoern Jacke <b...@sernet.de> Date: Wed Nov 28 04:38:44 2018 -0600 s3:smbd: Fix build on AIX 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 <b...@sernet.de> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Fri Jan 4 16:29:50 CET 2019 on sn-devel-144 ----------------------------------------------------------------------- Summary of changes: source3/smbd/sesssetup.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 4174c9868f3..a607abb5010 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -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); -- Samba Shared Repository