[SCM] Samba Shared Repository - branch master updated

[Rusty Russell]

The branch, master has been updated
       via  f80e399 source4/smbd/pidfile: don't panic if pid file is corrupt.
      from  0a1aaca replace: define INT64_MAX when not defined

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


- Log -----------------------------------------------------------------
commit f80e399ab26ea23ba258f885cec7c6c28c62baaa
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Thu Jun 28 11:04:25 2012 +0930

    source4/smbd/pidfile: don't panic if pid file is corrupt.
    
    In particular, on a virtual machine after a forced reboot, it
    contained "Ille" instead of a valid PID.  Given it was the right
    length, I'm assuming it was filesystem corruption.
    
    process_exists_by_pid() then panics, when given a pid < 1.
    
    Reported-by: lostogre on #samba-technical
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    
    Autobuild-User(master): Rusty Russell <rusty at rustcorp.com.au>
    Autobuild-Date(master): Thu Jun 28 05:19:24 CEST 2012 on sn-devel-104

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

Summary of changes:
 source4/smbd/pidfile.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/smbd/pidfile.c b/source4/smbd/pidfile.c
index b7d1c27..32d3964 100644
--- a/source4/smbd/pidfile.c
+++ b/source4/smbd/pidfile.c
@@ -57,6 +57,9 @@ pid_t pidfile_pid(const char *piddir, const char *name)
 	}
 
 	ret = (pid_t)atoi(pidstr);
+	if (ret <= 0) {
+		goto noproc;
+	}
 	
 	if (!process_exists_by_pid(ret)) {
 		goto noproc;


-- 
Samba Shared Repository