[Pkg-sysvinit-commits] r755 - in sysvinit/trunk/debian: . patches

[Thomas Hood]

Author: jdthood-guest
Date: 2006-02-19 21:35:48 +0000 (Sun, 19 Feb 2006)
New Revision: 755

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/25_last_sanify.dpatch
Log:
Fix #353585

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-02-17 10:44:35 UTC (rev 754)
+++ sysvinit/trunk/debian/changelog	2006-02-19 21:35:48 UTC (rev 755)
@@ -1,4 +1,4 @@
-sysvinit (2.86.ds1-13~3) unstable; urgency=low
+sysvinit (2.86.ds1-13~4) unstable; urgency=low
 
   [ Thomas Hood ]
   * umountroot: Tweak handling of error messages from mount
@@ -7,6 +7,7 @@
   * sysv-rc: /etc/init.d/README: Refer user to /usr/share/doc/sysv-rc/
     (Closes: #353083)
   * /etc/init.d/skeleton: Source init-functions  (Closes: #353212)
+  * last:  Fix strncmp bug  (Closes: #353585)
 
  -- Thomas Hood <jdthood at yahoo.co.uk>  Mon, 13 Feb 2006 08:42:44 +0100
 

Modified: sysvinit/trunk/debian/patches/25_last_sanify.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/25_last_sanify.dpatch	2006-02-17 10:44:35 UTC (rev 754)
+++ sysvinit/trunk/debian/patches/25_last_sanify.dpatch	2006-02-19 21:35:48 UTC (rev 755)
@@ -9,9 +9,9 @@
 
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/last.c /tmp/dpep-work.bMPzBG/trunk/src/last.c
+diff -urNad --exclude=CVS --exclude=.svn ./src/last.c /tmp/dpep-work.yygu5p/trunk/src/last.c
 --- ./src/last.c	2005-12-02 17:22:57.000000000 +0100
-+++ /tmp/dpep-work.bMPzBG/trunk/src/last.c	2006-01-24 22:12:35.000000000 +0100
++++ /tmp/dpep-work.yygu5p/trunk/src/last.c	2006-02-19 22:35:31.000000000 +0100
 @@ -418,7 +418,6 @@
  			sprintf(length, "- no logout");
  			break;
@@ -20,6 +20,15 @@
  			break;
  		case R_TIMECHANGE:
  			logouttime[0] = 0;
+@@ -717,7 +716,7 @@
+ 			ut.ut_type = SHUTDOWN_TIME;
+ 		else if (strncmp(ut.ut_user, "reboot", 6) == 0)
+ 			ut.ut_type = BOOT_TIME;
+-		else if (strncmp(ut.ut_user, "runlevel", 7) == 0)
++		else if (strncmp(ut.ut_user, "runlevel", 8) == 0)
+ 			ut.ut_type = RUN_LVL;
+ 	}
+ #if 1 /*def COMPAT*/
 @@ -752,7 +751,7 @@
  		case SHUTDOWN_TIME:
  			if (extended) {