The branch, master has been updated
via a44a0c4 libsmb: Fix CID 1034606 Incorrect pointer comparison
via b63b53c libsmb: Fix CID 1034605 Incorrect pointer comparison
via 736397e winbindd: Fix CID 1273310 Remove structurally dead code
from 76ef9c1 build: line-break deps for 'param' subsystem
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a44a0c47cb3d356b164b2f5cb54d6942c33f9d6f
Author: Anoop C S <[email protected]>
Date: Wed Sep 9 06:37:21 2015 +0000
libsmb: Fix CID 1034606 Incorrect pointer comparison
Signed-off-by: Anoop C S <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
Autobuild-User(master): Michael Adam <[email protected]>
Autobuild-Date(master): Wed Sep 9 21:33:49 CEST 2015 on sn-devel-104
commit b63b53c8426195a5f05dfe2b6e23a2f5af232058
Author: Anoop C S <[email protected]>
Date: Wed Sep 9 06:35:15 2015 +0000
libsmb: Fix CID 1034605 Incorrect pointer comparison
Signed-off-by: Anoop C S <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
commit 736397ec49974599bc038b097567e250cdb60cc6
Author: Anoop C S <[email protected]>
Date: Tue Sep 8 08:21:47 2015 +0000
winbindd: Fix CID 1273310 Remove structurally dead code
Signed-off-by: Anoop C S <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/libsmb/libsmb_printjob.c | 4 ++--
source3/winbindd/winbindd_cm.c | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/libsmb_printjob.c b/source3/libsmb/libsmb_printjob.c
index 62e54f4..813841a 100644
--- a/source3/libsmb/libsmb_printjob.c
+++ b/source3/libsmb/libsmb_printjob.c
@@ -125,7 +125,7 @@ SMBC_print_file_ctx(SMBCCTX *c_file,
}
fid1 = f_open1(c_file, fname, O_RDONLY, 0666);
- if (fid1 < 0) {
+ if (fid1 == NULL) {
DEBUG(3, ("Error, fname=%s, errno=%i\n", fname, errno));
TALLOC_FREE(frame);
return -1; /* smbc_open sets errno */
@@ -140,7 +140,7 @@ SMBC_print_file_ctx(SMBCCTX *c_file,
}
fid2 = f_open_pj2(c_print, printq);
- if (fid2 < 0) {
+ if (fid2 == NULL) {
saverr = errno; /* Save errno */
smbc_getFunctionClose(c_file)(c_file, fid1);
errno = saverr;
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 842307f..716fa5a 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -3189,7 +3189,6 @@ static NTSTATUS cm_connect_netlogon_transport(struct
winbindd_domain *domain,
sec_chan_type = cli_credentials_get_secure_channel_type(creds);
if (sec_chan_type == SEC_CHAN_NULL) {
return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
- goto no_schannel;
}
result = rpccli_create_netlogon_creds_with_creds(creds,
@@ -3228,7 +3227,6 @@ static NTSTATUS cm_connect_netlogon_transport(struct
winbindd_domain *domain,
conn->netlogon_flags = netlogon_creds->negotiate_flags;
TALLOC_FREE(netlogon_creds);
- no_schannel:
if (!(conn->netlogon_flags & NETLOGON_NEG_AUTHENTICATED_RPC)) {
if (lp_winbind_sealed_pipes() || lp_require_strong_key()) {
result = NT_STATUS_DOWNGRADE_DETECTED;
--
Samba Shared Repository
