[SCM] Samba Shared Repository - branch master updated

[David Disseldorp]

The branch, master has been updated
       via  0d5f217 heimdal: Fix CID 745516 Use after free
       via  671a2fa docs: Fix typo in "max open files" description
      from  72b240f autorid: Correctly init range_index for "delete range"

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


- Log -----------------------------------------------------------------
commit 0d5f217cfe03df7258be37adf0f20067a8e30fa8
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 11 10:21:54 2013 +0000

    heimdal: Fix CID 745516 Use after free
    
    If the loop is exited normally, i.e. we did not find anything proper
    within DH_NUM_TRIES, we try to BN_free a second time.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): David Disseldorp <ddiss at samba.org>
    Autobuild-Date(master): Thu Nov 14 19:17:06 CET 2013 on sn-devel-104

commit 671a2fa3f8f35484f9d0635566b081887c8ffbe8
Author: Scott Lovenberg <scott.lovenberg at gmail.com>
Date:   Thu Nov 14 09:52:29 2013 -0500

    docs: Fix typo in "max open files" description
    
    Removed extra word "The" from parameter description.
    
    Signed-off-by: Scott Lovenberg <scott.lovenberg at gmail.com>
    [ddiss at samba.org: removed white space damage]
    Reviewed-by: David Disseldorp <ddiss at samba.org>

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

Summary of changes:
 docs-xml/smbdotconf/tuning/maxopenfiles.xml |    2 +-
 source4/heimdal/lib/hcrypto/dh-ltm.c        |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/tuning/maxopenfiles.xml b/docs-xml/smbdotconf/tuning/maxopenfiles.xml
index 8c1a49f..8c8ad9c 100644
--- a/docs-xml/smbdotconf/tuning/maxopenfiles.xml
+++ b/docs-xml/smbdotconf/tuning/maxopenfiles.xml
@@ -7,7 +7,7 @@
     <para>This parameter limits the maximum number of
     open files that one <citerefentry><refentrytitle>smbd</refentrytitle>
     <manvolnum>8</manvolnum></citerefentry> file
-    serving process may have open for a client at any one time. The
+    serving process may have open for a client at any one time.
     This parameter can be set very high (16404) as Samba uses
     only one bit per unopened file. Setting this parameter lower than
     16404 will cause Samba to complain and set this value back to
diff --git a/source4/heimdal/lib/hcrypto/dh-ltm.c b/source4/heimdal/lib/hcrypto/dh-ltm.c
index 6af43cf..f4e0313 100644
--- a/source4/heimdal/lib/hcrypto/dh-ltm.c
+++ b/source4/heimdal/lib/hcrypto/dh-ltm.c
@@ -108,8 +108,10 @@ ltm_dh_generate_key(DH *dh)
 		return 0;
 	    }
 	}
-	if (dh->pub_key)
+	if (dh->pub_key) {
 	    BN_free(dh->pub_key);
+	    dh->pub_key = NULL;
+	}
 
 	mp_init_multi(&pub, &priv_key, &g, &p, NULL);
 


-- 
Samba Shared Repository