[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  ce85c98 selftest: fix dns_host_file in samba3 target
       via  3b1cb93 fixup: check for NULL pointers
      from  57300bb s4:rpc_server/lsa: remove msDS-TrustForestTrustInfo if FOREST_TRANSITIVE is cleared

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ce85c98caa27105a73f60223e92ea0184804780c
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Wed Jan 7 12:18:55 2015 +1300

    selftest: fix dns_host_file in samba3 target
    
    When setting up s3member twice in a row, the join ending up attempting kerberos
    and using an old ticket in the st folder, failing with bad credentials.
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Jan  7 03:58:10 CET 2015 on sn-devel-104

commit 3b1cb9385ad45eb7a9dd9e4a205f79b643c64a12
Author: Ralph Boehme <slow at samba.org>
Date:   Tue Jan 6 15:56:16 2015 -0800

    fixup: check for NULL pointers
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 selftest/target/Samba3.pm | 2 +-
 source3/lib/msghdr.c      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 89fee0b..289e464 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1016,7 +1016,7 @@ sub provision($$$$$$$$)
 	my $nss_wrapper_group = "$privatedir/group";
 	my $nss_wrapper_hosts = "$ENV{SELFTEST_PREFIX}/hosts";
 	my $resolv_conf = "$privatedir/resolv.conf";
-	my $dns_host_file = "$$ENV{SELFTEST_PREFIX}/dns_host_file";
+	my $dns_host_file = "$ENV{SELFTEST_PREFIX}/dns_host_file";
 
 	my $mod_printer_pl = "$ENV{PERL} $self->{srcdir}/source3/script/tests/printing/modprinter.pl";
 
diff --git a/source3/lib/msghdr.c b/source3/lib/msghdr.c
index 9ed1444..82f7ca7 100644
--- a/source3/lib/msghdr.c
+++ b/source3/lib/msghdr.c
@@ -40,7 +40,7 @@ ssize_t msghdr_prep_fds(struct msghdr *msg, uint8_t *buf, size_t bufsize,
 	if (num_fds > INT8_MAX) {
 		return -1;
 	}
-	if (cmsg_space > bufsize) {
+	if ((msg == NULL) || (cmsg_space > bufsize)) {
 		return cmsg_space;
 	}
 
@@ -167,7 +167,7 @@ size_t msghdr_extract_fds(struct msghdr *msg, int *fds, size_t fds_size)
 
 	num_fds = (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int);
 
-	if ((num_fds != 0) && (fds_size >= num_fds)) {
+	if ((num_fds != 0) && (fds != NULL) && (fds_size >= num_fds)) {
 		memcpy(fds, CMSG_DATA(cmsg), num_fds * sizeof(int));
 	}
 


-- 
Samba Shared Repository