[Pkg-shadow-commits] r3480 - in upstream/trunk: . src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-09-18 17:24:15 +0000 (Sun, 18 Sep 2011)
New Revision: 3480

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/chsh.c
Log:
	* src/chsh.c: No needto remove lines tarting with '#' from
	/etc/shells. This is already done by getusershell() and these
	shell would fail the access(X_OK) test.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-09-18 17:02:10 UTC (rev 3479)
+++ upstream/trunk/ChangeLog	2011-09-18 17:24:15 UTC (rev 3480)
@@ -1,5 +1,11 @@
 2011-09-18  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/chsh.c: No needto remove lines tarting with '#' from
+	/etc/shells. This is already done by getusershell() and these
+	shell would fail the access(X_OK) test.
+
+2011-09-18  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* man/generate_mans.mak: Fix the generation of translated man
 	pages. xml2po removed the comment from empty headers and the
 	config was no more inserted.

Modified: upstream/trunk/src/chsh.c
===================================================================
--- upstream/trunk/src/chsh.c	2011-09-18 17:02:10 UTC (rev 3479)
+++ upstream/trunk/src/chsh.c	2011-09-18 17:24:15 UTC (rev 3480)
@@ -2,7 +2,7 @@
  * Copyright (c) 1989 - 1994, Julianne Frances Haugh
  * Copyright (c) 1996 - 2000, Marek Michałkiewicz
  * Copyright (c) 2001 - 2006, Tomasz Kłoczko
- * Copyright (c) 2007 - 2008, Nicolas François
+ * Copyright (c) 2007 - 2011, Nicolas François
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -161,10 +161,6 @@
 #ifdef HAVE_GETUSERSHELL
 	setusershell ();
 	while ((cp = getusershell ())) {
-		if (*cp == '#') {
-			continue;
-		}
-
 		if (strcmp (cp, sh) == 0) {
 			found = true;
 			break;