[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Wed May 18 17:27:03 UTC 2016


The branch, master has been updated
       via  f15b23f packaging: Set default limit for core file size in service files
       via  ba9ccc6 packaging: Set default limit for core file size in init scripts
       via  46524b4 packaging: Remove ulimit usage for setting core file size limit
      from  aa57604 s3:smbd: fix anonymous authentication if signing is mandatory

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


- Log -----------------------------------------------------------------
commit f15b23f8358d7b2f60b1df0f81bb93a2c8789af4
Author: Anoop C S <anoopcs at redhat.com>
Date:   Tue May 10 15:08:07 2016 +0530

    packaging: Set default limit for core file size in service files
    
    This change adds the missing LimitCORE variable setting in nmb and
    winbind service files to have no limit for coredumps by default.
    
    Signed-off-by: Anoop C S <anoopcs at redhat.com>
    Reviewed-by: Jose A. Rivera <jarrpa at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Wed May 18 19:26:49 CEST 2016 on sn-devel-144

commit ba9ccc6be48e8541748afbf31d5e5dba7d1baf8e
Author: Anoop C S <anoopcs at redhat.com>
Date:   Tue May 10 21:07:01 2016 +0530

    packaging: Set default limit for core file size in init scripts
    
    SysV init scripts used for initiating smb and winbind services
    determines the value for default limit of coredump from variable
    named DAEMON_COREFILE_LIMIT within a bash env. Therefore this
    patch explicitly sets this variable to 'unlimited' so as to have
    no limit for core file size by default.
    
    Signed-off-by: Anoop C S <anoopcs at redhat.com>
    Reviewed-by: Jose A. Rivera <jarrpa at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>

commit 46524b4543acc9d104d85136c0a4a9e006fc099c
Author: Anoop C S <anoopcs at redhat.com>
Date:   Tue May 10 14:50:14 2016 +0530

    packaging: Remove ulimit usage for setting core file size limit
    
    Recent commit ebd139c4db7e51a2d7843a773991f15cadf504dd modified smb.init
    to set core file size to 'unlimited' by default using the ulimit command.
    But when smb and winbind services are initiated via sysv init scripts,
    another variable named DAEMON_COREFILE_LIMIT takes higher priority in
    deciding the core file size. Therefore setting default value using ulimit
    command is useless.
    
    Signed-off-by: Anoop C S <anoopcs at redhat.com>
    Reviewed-by: Jose A. Rivera <jarrpa at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>

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

Summary of changes:
 packaging/RHEL-CTDB/setup/smb.init     | 3 ++-
 packaging/RHEL-CTDB/setup/winbind.init | 2 ++
 packaging/RHEL/setup/smb.init          | 3 ++-
 packaging/RHEL/setup/winbind.init      | 2 ++
 packaging/systemd/nmb.service          | 1 +
 packaging/systemd/winbind.service      | 1 +
 6 files changed, 10 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL-CTDB/setup/smb.init b/packaging/RHEL-CTDB/setup/smb.init
index 00984d2..39bf0a8 100644
--- a/packaging/RHEL-CTDB/setup/smb.init
+++ b/packaging/RHEL-CTDB/setup/smb.init
@@ -18,6 +18,8 @@ else
   exit 0
 fi
 
+DAEMON_COREFILE_LIMIT='unlimited'
+
 # Avoid using root's TMPDIR
 unset TMPDIR
 
@@ -51,7 +53,6 @@ RETVAL=0
 start() {
 	KIND="SMB"
 	echo -n $"Starting $KIND services: "
-	ulimit -c unlimited
 	daemon smbd $SMBDOPTIONS
 	RETVAL=$?
 	echo
diff --git a/packaging/RHEL-CTDB/setup/winbind.init b/packaging/RHEL-CTDB/setup/winbind.init
index a99038f..2a9dd82 100644
--- a/packaging/RHEL-CTDB/setup/winbind.init
+++ b/packaging/RHEL-CTDB/setup/winbind.init
@@ -16,6 +16,8 @@ else
   exit 0
 fi
 
+DAEMON_COREFILE_LIMIT='unlimited'
+
 # Avoid using root's TMPDIR
 unset TMPDIR
 
diff --git a/packaging/RHEL/setup/smb.init b/packaging/RHEL/setup/smb.init
index dff9cd8..96fb74a 100644
--- a/packaging/RHEL/setup/smb.init
+++ b/packaging/RHEL/setup/smb.init
@@ -18,6 +18,8 @@ else
   exit 0
 fi
 
+DAEMON_COREFILE_LIMIT='unlimited'
+
 # Avoid using root's TMPDIR
 unset TMPDIR
 
@@ -50,7 +52,6 @@ RETVAL=0
 start() {
 	KIND="SMB"
 	echo -n $"Starting $KIND services: "
-	ulimit -c unlimited
 	daemon smbd $SMBDOPTIONS
 	RETVAL=$?
 	echo
diff --git a/packaging/RHEL/setup/winbind.init b/packaging/RHEL/setup/winbind.init
index a99038f..2a9dd82 100644
--- a/packaging/RHEL/setup/winbind.init
+++ b/packaging/RHEL/setup/winbind.init
@@ -16,6 +16,8 @@ else
   exit 0
 fi
 
+DAEMON_COREFILE_LIMIT='unlimited'
+
 # Avoid using root's TMPDIR
 unset TMPDIR
 
diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service
index 3d71a7d..992c0cd 100644
--- a/packaging/systemd/nmb.service
+++ b/packaging/systemd/nmb.service
@@ -9,6 +9,7 @@ PIDFile=/run/nmbd.pid
 EnvironmentFile=-/etc/sysconfig/samba
 ExecStart=/usr/sbin/nmbd $NMBDOPTIONS
 ExecReload=/usr/bin/kill -HUP $MAINPID
+LimitCORE=infinity
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service
index f711a17..c511488 100644
--- a/packaging/systemd/winbind.service
+++ b/packaging/systemd/winbind.service
@@ -9,6 +9,7 @@ PIDFile=/run/winbindd.pid
 EnvironmentFile=-/etc/sysconfig/samba
 ExecStart=/usr/sbin/winbindd "$WINBINDOPTIONS"
 ExecReload=/usr/bin/kill -HUP $MAINPID
+LimitCORE=infinity
 
 [Install]
 WantedBy=multi-user.target


-- 
Samba Shared Repository



More information about the samba-cvs mailing list