The branch, v4-22-stable has been updated
       via  93f8fdc858b VERSION: Disable GIT_SNAPSHOT for the 4.22.0rc2 release.
       via  c58af936e23 WHATSNEW: Add release notes for Samba 4.22.0rc2.
       via  cd4a7251545 libnet4: free tevent request even on error
       via  753c9bfdad9 libnet4: check return value of DC lookup
       via  f941348890b VERSION: Bump version up to Samba 4.22.0rc2...
      from  fc3005dbad5 VERSION: Disable GIT_SNAPSHOT for the Samba 4.22.0rc1 
release.

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


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

Summary of changes:
 VERSION                        | 2 +-
 WHATSNEW.txt                   | 8 ++++++++
 source4/libnet/libnet_lookup.c | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/VERSION b/VERSION
index 1954746576f..532ea4abac4 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=1
+SAMBA_VERSION_RC_RELEASE=2
 
 ########################################################
 # To mark SVN snapshots this should be set to 'yes'    #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 76aecf200cd..2c4b5494c03 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -77,6 +77,14 @@ smb.conf changes
   fruit:posix_rename                      Removed
   cldap port                              Removed
 
+
+CHANGES SINCE 4.21.0rc1
+=======================
+
+o  Björn Baumbach <b...@sernet.de>
+   * BUG 15798: libnet4: seg fault after dc lookup failure
+
+
 KNOWN ISSUES
 ============
 
diff --git a/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c
index f8477c7258c..fe021b9f4d8 100644
--- a/source4/libnet/libnet_lookup.c
+++ b/source4/libnet/libnet_lookup.c
@@ -224,6 +224,9 @@ NTSTATUS libnet_LookupDCs_recv(struct tevent_req *req, 
TALLOC_CTX *mem_ctx,
        struct finddcs finddcs_io;
        status = finddcs_cldap_recv(req, mem_ctx, &finddcs_io);
        talloc_free(req);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
        io->out.num_dcs = 1;
        io->out.dcs = talloc(mem_ctx, struct nbt_dc_name);
        NT_STATUS_HAVE_NO_MEMORY(io->out.dcs);


-- 
Samba Shared Repository

Reply via email to