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

gensec: Fix CID 1458419 Control flow issues (NO_EFFECT)

Browse Source 
socklen_t can be unsigned

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Fri Feb 14 13:42:26 UTC 2020 on sn-devel-184
This commit is contained in:
Volker Lendecke
2020-02-12 15:42:28 +01:00
committed by Stefan Metzmacher
parent 43c808f2ff
commit 7e78d27542
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source4/auth/gensec/gensec_krb5.c
View File

@ -145,15 +145,17 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security, bool
tlocal_addr = gensec_get_local_address(gensec_security); tlocal_addr = gensec_get_local_address(gensec_security);
if (tlocal_addr) { if (tlocal_addr) {
ssize_t sockaddr_ret;
struct samba_sockaddr addr; struct samba_sockaddr addr;
bool ok; bool ok;
addr.sa_socklen = tsocket_address_bsd_sockaddr( sockaddr_ret = tsocket_address_bsd_sockaddr(
tlocal_addr, &addr.u.sa, sizeof(addr.u.sa)); tlocal_addr, &addr.u.sa, sizeof(addr.u.sa));
if (addr.sa_socklen < 0) { if (sockaddr_ret < 0) {
talloc_free(gensec_krb5_state); talloc_free(gensec_krb5_state);
return NT_STATUS_INTERNAL_ERROR; return NT_STATUS_INTERNAL_ERROR;
} }
addr.sa_socklen = sockaddr_ret;
ok = smb_krb5_sockaddr_to_kaddr(&addr.u.ss, &my_krb5_addr); ok = smb_krb5_sockaddr_to_kaddr(&addr.u.ss, &my_krb5_addr);
if (!ok) { if (!ok) {
DBG_WARNING("smb_krb5_sockaddr_to_kaddr (local) failed\n"); DBG_WARNING("smb_krb5_sockaddr_to_kaddr (local) failed\n");
@ -164,15 +166,17 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security, bool
tremote_addr = gensec_get_remote_address(gensec_security); tremote_addr = gensec_get_remote_address(gensec_security);
if (tremote_addr) { if (tremote_addr) {
ssize_t sockaddr_ret;
struct samba_sockaddr addr; struct samba_sockaddr addr;
bool ok; bool ok;
addr.sa_socklen = tsocket_address_bsd_sockaddr( sockaddr_ret = tsocket_address_bsd_sockaddr(
tremote_addr, &addr.u.sa, sizeof(addr.u.sa)); tremote_addr, &addr.u.sa, sizeof(addr.u.sa));
if (addr.sa_socklen < 0) { if (sockaddr_ret < 0) {
talloc_free(gensec_krb5_state); talloc_free(gensec_krb5_state);
return NT_STATUS_INTERNAL_ERROR; return NT_STATUS_INTERNAL_ERROR;
} }
addr.sa_socklen = sockaddr_ret;
ok = smb_krb5_sockaddr_to_kaddr(&addr.u.ss, &peer_krb5_addr); ok = smb_krb5_sockaddr_to_kaddr(&addr.u.ss, &peer_krb5_addr);
if (!ok) { if (!ok) {
DBG_WARNING("smb_krb5_sockaddr_to_kaddr (remote) failed\n"); DBG_WARNING("smb_krb5_sockaddr_to_kaddr (remote) failed\n");