[upstart/f12/master] don't rewind utmp file pointer (#632568)

Petr Lautrbach plautrba at fedoraproject.org
Tue Sep 21 10:13:32 UTC 2010


commit 001a2458dbe4e6d9976b3d3de73b299f63bd6823
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Mon Sep 20 22:34:07 2010 +0200

    don't rewind utmp file pointer (#632568)

 upstart-utmp.patch |    5 ++---
 upstart.spec       |    5 ++++-
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/upstart-utmp.patch b/upstart-utmp.patch
index 814c108..c19e012 100644
--- a/upstart-utmp.patch
+++ b/upstart-utmp.patch
@@ -1,5 +1,5 @@
 diff --git a/init/job.c b/init/job.c
-index ddf4369..fb0cf1b 100644
+index ddf4369..b4a73d8 100644
 --- a/init/job.c
 +++ b/init/job.c
 @@ -35,6 +35,8 @@
@@ -20,7 +20,7 @@ index ddf4369..fb0cf1b 100644
  
  	nih_assert (data == NULL);
  	nih_assert (pid > 0);
-@@ -1732,6 +1736,39 @@ job_child_reaper (void  *data,
+@@ -1732,6 +1736,38 @@ job_child_reaper (void  *data,
  		job->kill_timer = NULL;
  	}
  
@@ -41,7 +41,6 @@ index ddf4369..fb0cf1b 100644
 +			memset(utmptr->ut_host, 0, UT_HOSTSIZE);
 +			utmptr->ut_time = 0;
 +			/* Update existing utmp file. */
-+			setutxent();
 +			pututxline(utmptr);
 +
 +			/* set ut_time for log */
diff --git a/upstart.spec b/upstart.spec
index e89396e..f5d93a4 100644
--- a/upstart.spec
+++ b/upstart.spec
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.3.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Mon Sep 20 2010 Petr Lautrbach <plautrba at redhat.com> 0.3.11-5
+- Don't rewind utmp file pointer (#632568)
+
 * Tue Mar 09 2010 Petr Lautrbach <plautrba at redhat.com> 0.3.11-4
 - Update utmp and wtmp records when process die (#470004)
 


More information about the scm-commits mailing list