[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Fri Mar 4 23:40:05 UTC 2016


The branch, master has been updated
       via  58d3462 source3: Honor the core soft limit of the OS.
       via  85e414a s3/rpc_server/srvsvc/srv_srvsvc_nt.c: change snum to signed int
      from  2285519 s3,s4 torture/denytest: fix possible infinite loop

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


- Log -----------------------------------------------------------------
commit 58d3462bc58290d8eb5e554c6c59cf6b73ccf58a
Author: Ira Cooper <ira at samba.org>
Date:   Thu Mar 3 13:47:32 2016 -0500

    source3: Honor the core soft limit of the OS.
    
    We should honor the soft limits set by the operating system.
    
    In any case, 16M doesn't make a useful coredump for modern
    Samba.
    
    Signed-off-by: Ira Cooper <ira at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Sat Mar  5 00:39:48 CET 2016 on sn-devel-144

commit 85e414aefc0c3e5db51d8426bdba62dc5bcc5420
Author: Aurelien Aptel <aaptel at suse.com>
Date:   Thu Mar 3 16:30:35 2016 +0100

    s3/rpc_server/srvsvc/srv_srvsvc_nt.c: change snum to signed int
    
    snum is used to store the result of the find_service() call which
    returns a signed int, with -1 being an error.
    
    with an uint32_t the error check (< 0) is always false.
    
    Signed-off-by: Aurelien Aptel <aaptel at suse.com>
    Reviewed-by: Volker Lendecke <Volker.Lendecke at SerNet.DE>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/lib/dumpcore.c                    | 15 ---------------
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c |  3 ++-
 2 files changed, 2 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/dumpcore.c b/source3/lib/dumpcore.c
index 487ccec..c72aa88 100644
--- a/source3/lib/dumpcore.c
+++ b/source3/lib/dumpcore.c
@@ -251,21 +251,6 @@ void dump_core_setup(const char *progname, const char *log_file)
 		goto out;
 	}
 
-
-#ifdef HAVE_GETRLIMIT
-#ifdef RLIMIT_CORE
-	{
-		struct rlimit rlp;
-		getrlimit(RLIMIT_CORE, &rlp);
-		rlp.rlim_cur = MAX(16*1024*1024,rlp.rlim_cur);
-		setrlimit(RLIMIT_CORE, &rlp);
-		getrlimit(RLIMIT_CORE, &rlp);
-		DEBUG(3,("Maximum core file size limits now %d(soft) %d(hard)\n",
-			 (int)rlp.rlim_cur,(int)rlp.rlim_max));
-	}
-#endif
-#endif
-
 	/* FIXME: if we have a core-plus-pid facility, configurably set
 	 * this up here.
 	 */
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 279cd9e..980411e 100644
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -1125,7 +1125,8 @@ static WERROR init_srv_conn_info_1(const char *name,
 				   uint32_t *resume_handle_p,
 				   uint32_t *total_entries)
 {
-	uint32_t num_entries = 0, snum = 0;
+	uint32_t num_entries = 0;
+	int snum = 0;
 	uint32_t resume_handle = resume_handle_p ? *resume_handle_p : 0;
 	char *share_name = NULL;
 	struct server_id *svrid_arr = NULL;


-- 
Samba Shared Repository



More information about the samba-cvs mailing list