[SCM] Samba Shared Repository - branch v4-21-stable updated

[Jule Anger]

The branch, v4-21-stable has been updated
       via  5bb01bb65c3 VERSION: Disable GIT_SNAPSHOT for the 4.21.0rc4 release.
       via  a8dda787430 WHATSNEW: Add release notes for Samba 4.21.0rc4.
       via  37bbe0ca09e s3:smbd: fix NULL dereference in case of readlink failure
       via  0d41094f130 lib/param: Don't treat a missing include file as an error in handle_include().
       via  851c488ea1c VERSION: Bump version up to Samba 4.21.0rc4...
      from  bb4874ba201 VERSION: Disable GIT_SNAPSHOT for the 4.21.0rc3 release.

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-21-stable


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 VERSION              |  2 +-
 WHATSNEW.txt         | 12 +++++++++++-
 lib/param/loadparm.c |  2 +-
 source3/smbd/open.c  |  4 ++++
 4 files changed, 17 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/VERSION b/VERSION
index dd2eb2f8a9c..77c8124b889 100644
--- a/VERSION
+++ b/VERSION
@@ -89,7 +89,7 @@ SAMBA_VERSION_PRE_RELEASE=
 # e.g. SAMBA_VERSION_RC_RELEASE=1                      #
 #  ->  "3.0.0rc1"                                      #
 ########################################################
-SAMBA_VERSION_RC_RELEASE=3
+SAMBA_VERSION_RC_RELEASE=4
 
 ########################################################
 # To mark SVN snapshots this should be set to 'yes'    #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 9eee53ae713..84677c8af53 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,7 +1,7 @@
 Release Announcements
 =====================
 
-This is the third release candidate of Samba 4.21.  This is *not*
+This is the fourth release candidate of Samba 4.21.  This is *not*
 intended for production environments and is designed for testing
 purposes only.  Please report any defects via the Samba bug reporting
 system at https://bugzilla.samba.org/.
@@ -280,6 +280,16 @@ smb.conf changes
   sync machine password script            script
 
 
+CHANGES SINCE 4.21.0rc3
+=======================
+
+o  Pavel Filipenský <pfilipensky at samba.org>
+   * BUG 15698: samba-tool can not load the default configuration file.
+
+o  Shachar Sharon <ssharon at redhat.com>
+   * BUG 15700: Crash when readlinkat fails.
+
+
 CHANGES SINCE 4.21.0rc2
 =======================
 
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 0afdcebb02d..ed5160d547b 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -1132,7 +1132,7 @@ bool handle_include(struct loadparm_context *lp_ctx, struct loadparm_service *se
 
 	DEBUG(2, ("Can't find include file %s\n", fname));
 
-	return false;
+	return true;
 }
 
 /***************************************************************************
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 7999b3f082e..f2c5c17bbd0 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -582,6 +582,10 @@ static NTSTATUS symlink_target_below_conn(
 			talloc_tos(), dirfsp, symlink_name, &target);
 	}
 
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
+
 	status = safe_symlink_target_path(talloc_tos(),
 					  connection_path,
 					  dirfsp->fsp_name->base_name,


-- 
Samba Shared Repository