[oe-commits] Martin Donnelly : shadow: remove grpconv argc check

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 845a24e78835e93807cfb810fa99715ac4d14e21
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=845a24e78835e93807cfb810fa99715ac4d14e21

Author: Martin Donnelly <martin.donnelly at ge.com>
Date:   Wed Feb 27 12:58:55 2013 +0000

shadow: remove grpconv argc check

The patched version of grpconv takes arguments but the check on
argc was not removed. This patch removes this check which
otherwise results in a spurious warning during rootfs creation.

Signed-off-by: Martin Donnelly <martin.donnelly at ge.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../shadow/files/add_root_cmd_options.patch        |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/shadow/files/add_root_cmd_options.patch b/meta/recipes-extended/shadow/files/add_root_cmd_options.patch
index 5edd3b8..ab87e35 100644
--- a/meta/recipes-extended/shadow/files/add_root_cmd_options.patch
+++ b/meta/recipes-extended/shadow/files/add_root_cmd_options.patch
@@ -528,7 +528,17 @@ diff -urN shadow-4.1.4.3.orig//src/grpconv.c shadow-4.1.4.3//src/grpconv.c
  int main (int argc, char **argv)
  {
  	const struct group *gr;
-@@ -100,6 +183,8 @@
+@@ -89,9 +172,6 @@
+ 	const struct sgrp *sg;
+ 	struct sgrp sgent;
+ 
+-	if (1 != argc) {
+-		(void) fputs (_("Usage: grpconv\n"), stderr);
+-	}
+ 	Prog = Basename (argv[0]);
+ 
+ 	(void) setlocale (LC_ALL, "");
+@@ -100,6 +180,8 @@
  
  	OPENLOG ("grpconv");