[Pkg-shadow-commits] r157 - trunk/debian/patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-05-19 18:53:57 +0000 (Thu, 19 May 2005)
New Revision: 157

Added:
   trunk/debian/patches/327_newgrp_162303
Modified:
   trunk/debian/patches/008_src.dpatch
   trunk/debian/patches/series
Log:
Move the fix for a segfault in newgrp (#162303) from 008 to 327.


Modified: trunk/debian/patches/008_src.dpatch
===================================================================
--- trunk/debian/patches/008_src.dpatch	2005-05-19 12:57:55 UTC (rev 156)
+++ trunk/debian/patches/008_src.dpatch	2005-05-19 18:53:57 UTC (rev 157)
@@ -416,22 +416,6 @@
  #endif
  
  	setlocale (LC_ALL, "");
-@@ -386,8 +386,13 @@
- 		SYSLOG ((LOG_INFO, "user `%s' switched to group `%s'",
- 			 name, group));
- 	if (getdef_bool ("SYSLOG_SG_ENAB")) {
--		char *loginname = xstrdup (getlogin ());
--		char *tty = xstrdup (ttyname (0));
-+		char *loginname = getlogin ();
-+		char *tty = ttyname (0);
-+
-+		if (loginname != NULL)
-+		  loginname = xstrdup (loginname);
-+		if (tty != NULL)
-+		  tty = xstrdup (tty);
- 
- 		if (loginname == NULL)
- 			loginname = "???";
 diff -Nru shadow-4.0.3/src/su.c shadow-4.0.3_30.4/src/su.c
 --- shadow-4.0.3/src/su.c	2002-03-08 05:30:28.000000000 +0100
 +++ shadow-4.0.3_30.4/src/su.c	2004-11-02 22:17:38.000000000 +0100

Added: trunk/debian/patches/327_newgrp_162303
===================================================================
--- trunk/debian/patches/327_newgrp_162303	2005-05-19 12:57:55 UTC (rev 156)
+++ trunk/debian/patches/327_newgrp_162303	2005-05-19 18:53:57 UTC (rev 157)
@@ -0,0 +1,26 @@
+Goal: the function getlogin() and ttyname() can return NULL,
+which is not checked. (Bastian Kleineidam - 29 Sep 2002)
+Fixes: #162303
+
+Status wrt upstream: already applied upstream.
+
+Index: shadow-4.0.3/src/newgrp.c
+===================================================================
+--- shadow-4.0.3.orig/src/newgrp.c	2005-05-19 19:41:07.799079000 +0200
++++ shadow-4.0.3/src/newgrp.c	2005-05-19 20:24:06.819079000 +0200
+@@ -386,8 +386,13 @@
+ 		SYSLOG ((LOG_INFO, "user `%s' switched to group `%s'",
+ 			 name, group));
+ 	if (getdef_bool ("SYSLOG_SG_ENAB")) {
+-		char *loginname = xstrdup (getlogin ());
+-		char *tty = xstrdup (ttyname (0));
++		char *loginname = getlogin ();
++		char *tty = ttyname (0);
++
++		if (loginname != NULL)
++		  loginname = xstrdup (loginname);
++		if (tty != NULL)
++		  tty = xstrdup (tty);
+ 
+ 		if (loginname == NULL)
+ 			loginname = "???";

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-05-19 12:57:55 UTC (rev 156)
+++ trunk/debian/patches/series	2005-05-19 18:53:57 UTC (rev 157)
@@ -63,6 +63,7 @@
 324_configure.in-no-debian-dir.dpatch
 325_gshadow_5_manpage
 326_su.1_pwconv.8-typos
+327_newgrp_162303
 401_cppw_src.dpatch
 403_sg_symlink_162339_163652.dpatch
 404_undef_USE_PAM.dpatch