From: Richard Jones <rjones@redhat.com>
Date: Wed, 2 Jun 2010 14:10:38 +0000 (+0100)
Subject: base64-in: Ignore garbage characters in input.
X-Git-Tag: 1.3.18~5
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=50eed6d20de9b6d16975c3c0bbf6e545f8fba1fe;p=libguestfs.git

base64-in: Ignore garbage characters in input.

On RHEL 5 you have to specify the -i option to get the
external 'base64' command to ignore \n characters.  (The
Fedora version seems to ignore these characters anyway).

Add this option so the tests can pass on RHEL 5.
---

diff --git a/daemon/base64.c b/daemon/base64.c
index 89bf437..1d2d1d0 100644
--- a/daemon/base64.c
+++ b/daemon/base64.c
@@ -42,7 +42,7 @@ do_base64_in (const char *file)
   FILE *fp;
   char *cmd;
 
-  if (asprintf_nowarn (&cmd, "base64 -d > %R", file) == -1) {
+  if (asprintf_nowarn (&cmd, "base64 -d -i > %R", file) == -1) {
     err = errno;
     cancel_receive ();
     errno = err;