commit 611f5b4b938f2ffcf2a2e71a847e4fd12587ca4b
author Rom Lemarchand <romlem@google.com> Mon Jan 14 14:11:01 2013 -0800
committer Rom Lemarchand <romlem@google.com> Mon Jan 28 13:11:32 2013 -0800
tree 4992df2c91076bfbd1ce6e319ba688bd4acc81ed
parent 0cc2cab6af2635e3293b3611a4c0982061dbb935

logwrap: fix off by 1 argument error

Fix off by 1 argument parsing error in liblogwrap.

Change-Id: I79832ae338a71c445f9f616d780c577826874386

logwrapper/logwrap.c

diff --git a/logwrapper/logwrap.c b/logwrapper/logwrap.c
index 9cd3fe4..09f8b81 100644
--- a/logwrapper/logwrap.c
+++ b/logwrapper/logwrap.c
@@ -227,7 +227,7 @@
         dup2(child_ptty, 2);
         close(child_ptty);
 
-        child(argc - 1, &argv[1]);
+        child(argc, argv);
         fatal("This should never happen\n");
         return -1;
     } else {
@@ -268,7 +268,7 @@
         setgid(AID_LOG);
         setuid(AID_LOG);
 
-        rc = parent(argv[1], parent_ptty, sockets[1], pid, status);
+        rc = parent(argv[0], parent_ptty, sockets[1], pid, status);
     }
 
     close(sockets[0]);

logwrapper/logwrapper.c

diff --git a/logwrapper/logwrapper.c b/logwrapper/logwrapper.c
index 4f1bff9..e647b4d 100644
--- a/logwrapper/logwrapper.c
+++ b/logwrapper/logwrapper.c
@@ -59,7 +59,7 @@
         usage();
     }
 
-    rc = logwrap(argc, argv, &status);
+    rc = logwrap(argc - 1, &argv[1], &status);
     if (!rc) {
         if (WIFEXITED(status))
             rc = WEXITSTATUS(status);