[Pkg-shadow-commits] sid/debian/patches 405_subsystem_remove_*_in_shell.dpatch,NONE,1.1 006_libmisc.dpatch,1.2,1.3 007_lib.dpatch,1.3,1.4 00list,1.5,1.6

[Nicolas FRAN??OIS]

Update of /cvsroot/pkg-shadow/sid/debian/patches
In directory haydn:/tmp/cvs-serv2953

Modified Files:
	006_libmisc.dpatch 007_lib.dpatch 00list 
Added Files:
	405_subsystem_remove_*_in_shell.dpatch 
Log Message:
Move the modification of 'subsystem' from 006_libmisc and 007_lib to 
405_subsystem_remove_*_in_shell.


Index: 007_lib.dpatch
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/patches/007_lib.dpatch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- 007_lib.dpatch	17 Apr 2005 17:27:03 -0000	1.3
+++ 007_lib.dpatch	17 Apr 2005 18:20:16 -0000	1.4
@@ -624,15 +624,3 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -Nru shadow-4.0.3/lib/prototypes.h shadow-4.0.3_30.4/lib/prototypes.h
---- shadow-4.0.3/lib/prototypes.h	2000-08-26 20:27:17.000000000 +0200
-+++ shadow-4.0.3_30.4/lib/prototypes.h	2004-11-02 22:17:37.000000000 +0100
-@@ -203,7 +203,7 @@
- extern void sulog(const char *, int, const char *, const char *);
- 
- /* sub.c */
--extern void subsystem(const struct passwd *);
-+extern void subsystem(struct passwd *);
- 
- /* ttytype.c */
- extern void ttytype(const char *);

Index: 00list
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/patches/00list,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- 00list	17 Apr 2005 17:27:03 -0000	1.5
+++ 00list	17 Apr 2005 18:20:17 -0000	1.6
@@ -58,3 +58,4 @@
 #402_missing_debian_man_pages
 403_sg_symlink_162339_163652
 404_undef_USE_PAM
+405_subsystem_remove_*_in_shell

Index: 006_libmisc.dpatch
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/patches/006_libmisc.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 006_libmisc.dpatch	17 Apr 2005 09:22:35 -0000	1.2
+++ 006_libmisc.dpatch	17 Apr 2005 18:20:16 -0000	1.3
@@ -3311,27 +3311,6 @@
  	pam_end(pamh, PAM_SUCCESS);
  }
  #else /* !USE_PAM */
-diff -Nru shadow-4.0.3/libmisc/sub.c shadow-4.0.3_30.4/libmisc/sub.c
---- shadow-4.0.3/libmisc/sub.c	1999-03-07 20:14:43.000000000 +0100
-+++ shadow-4.0.3_30.4/libmisc/sub.c	2004-11-02 22:17:35.000000000 +0100
-@@ -51,7 +51,7 @@
-  */
- 
- void
--subsystem(const struct passwd *pw)
-+subsystem(struct passwd *pw)
- {
- 	/*
- 	 * The new root directory must begin with a "/" character.
-@@ -75,4 +75,8 @@
- 		closelog();
- 		exit (1);
- 	}
-+
-+	/* Now fixup the shell to get rid of that '*' */
-+	if (*pw->pw_shell == '*')
-+		pw->pw_shell++;
- }
 diff -Nru shadow-4.0.3/libmisc/xmalloc.c shadow-4.0.3_30.4/libmisc/xmalloc.c
 --- shadow-4.0.3/libmisc/xmalloc.c	1998-12-28 21:34:56.000000000 +0100
 +++ shadow-4.0.3_30.4/libmisc/xmalloc.c	2004-11-02 22:17:35.000000000 +0100

--- NEW FILE: 405_subsystem_remove_*_in_shell.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 405_subsystem_remove_*_in_shell.dpatch by Nicolas FRANCOIS <nicolas.francois@centraliens.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Remove the * at the beginning of the shell for subsystem logins.
## DP: It fixed #82893
## DP:
## DP: This was fixed upstream by removing the * before calling subsystem.
## DP: Thus, it is no more needed (but does not harm).

@DPATCH@
diff -urNad shadow-4.0.3/lib/prototypes.h /tmp/dpep.Ff9YlN/shadow-4.0.3/lib/prototypes.h
--- shadow-4.0.3/lib/prototypes.h	2005-04-17 19:40:40.837048000 +0200
+++ /tmp/dpep.Ff9YlN/shadow-4.0.3/lib/prototypes.h	2005-04-17 19:44:06.817048000 +0200
@@ -203,7 +203,7 @@
 extern void sulog(const char *, int, const char *, const char *);
 
 /* sub.c */
-extern void subsystem(const struct passwd *);
+extern void subsystem(struct passwd *);
 
 /* ttytype.c */
 extern void ttytype(const char *);
diff -urNad shadow-4.0.3/libmisc/sub.c /tmp/dpep.Ff9YlN/shadow-4.0.3/libmisc/sub.c
--- shadow-4.0.3/libmisc/sub.c	2005-04-17 19:40:40.907048000 +0200
+++ /tmp/dpep.Ff9YlN/shadow-4.0.3/libmisc/sub.c	2005-04-17 19:44:06.817048000 +0200
@@ -51,7 +51,7 @@
  */
 
 void
-subsystem(const struct passwd *pw)
+subsystem(struct passwd *pw)
 {
 	/*
 	 * The new root directory must begin with a "/" character.
@@ -75,4 +75,8 @@
 		closelog();
 		exit (1);
 	}
+
+	/* Now fixup the shell to get rid of that '*' */
+	if (*pw->pw_shell == '*')
+		pw->pw_shell++;
 }