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

[Alexander Gattin]

Author: xrgtn-guest
Date: 2006-01-16 01:27:51 +0000 (Mon, 16 Jan 2006)
New Revision: 811

Modified:
   trunk/debian/patches/484_su-p_preserve_PATH
Log:
use right pointer type from shelle() and run_shell() envp

Modified: trunk/debian/patches/484_su-p_preserve_PATH
===================================================================
--- trunk/debian/patches/484_su-p_preserve_PATH	2006-01-16 01:07:41 UTC (rev 810)
+++ trunk/debian/patches/484_su-p_preserve_PATH	2006-01-16 01:27:51 UTC (rev 811)
@@ -25,15 +25,15 @@
 
 Index: shadow-4.0.14/src/su.c
 ===================================================================
---- shadow-4.0.14.orig/src/su.c	2006-01-15 11:14:14.000000000 +0200
-+++ shadow-4.0.14/src/su.c	2006-01-15 11:14:14.000000000 +0200
+--- shadow-4.0.14.orig/src/su.c	2006-01-16 02:51:03.000000000 +0200
++++ shadow-4.0.14/src/su.c	2006-01-16 03:23:07.000000000 +0200
 @@ -174,7 +174,8 @@
   * have been applied.  Some work was needed to get it integrated into
   * su.c from shadow.
   */
 -static void run_shell (const char *shellstr, char *args[], int doshell)
 +static void run_shell (const char *shellstr, char *args[], int doshell,
-+		const char *envp)
++		char *const envp[])
  {
  	int child;
  	sigset_t ourset;
@@ -89,20 +89,20 @@
  	exit (1);
 Index: shadow-4.0.14/lib/prototypes.h
 ===================================================================
---- shadow-4.0.14.orig/lib/prototypes.h	2006-01-15 11:13:45.000000000 +0200
-+++ shadow-4.0.14/lib/prototypes.h	2006-01-15 11:14:14.000000000 +0200
+--- shadow-4.0.14.orig/lib/prototypes.h	2006-01-16 02:50:22.000000000 +0200
++++ shadow-4.0.14/lib/prototypes.h	2006-01-16 03:22:27.000000000 +0200
 @@ -150,6 +150,7 @@
  
  /* shell.c */
  extern void shell (const char *, const char *);
-+extern int shelle (const char *, const char *, const char *);
++extern int shelle (const char *, const char *, char *const *);
  
  /* strtoday.c */
  extern long strtoday (const char *);
 Index: shadow-4.0.14/libmisc/shell.c
 ===================================================================
---- shadow-4.0.14.orig/libmisc/shell.c	2006-01-15 11:13:45.000000000 +0200
-+++ shadow-4.0.14/libmisc/shell.c	2006-01-15 11:16:47.000000000 +0200
+--- shadow-4.0.14.orig/libmisc/shell.c	2006-01-16 02:50:22.000000000 +0200
++++ shadow-4.0.14/libmisc/shell.c	2006-01-16 03:24:12.000000000 +0200
 @@ -38,8 +38,15 @@
  extern char **newenvp;
  extern size_t newenvc;
@@ -110,7 +110,7 @@
 +/* shell - left here for compatibility (actually being frontend to shelle) */
 +void shell (const char *file, const char *arg) {
 +	int err;
-+	err = shelle (file, arg, (const char *)newenvp);
++	err = shelle (file, arg, newenvp);
 +	if (err) exit (1);
 +}
 +
@@ -125,7 +125,7 @@
   */
  
 -void shell (const char *file, const char *arg)
-+int shelle (const char *file, const char *arg, const char *envp)
++int shelle (const char *file, const char *arg, char *const envp[])
  {
  	char arg0[1024];
  	int err;