[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-5-g682df45

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  682df45d15661ed3544e2ed34bcb636200cc40f9 (commit)
       via  d01d9ff11f46cbd61b7b8c0e04431e4f0c4a8580 (commit)
      from  a2d9e48fcca6cfc2dfadef6dbd3579a30314676b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 682df45d15661ed3544e2ed34bcb636200cc40f9
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jan 3 11:14:14 2012 +0100

    Terminate csh commands with a semicolon also for dirmngr.
    
    * dirmngr/dirmngr.c (main): Terminate csh style output with a semicolon.

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 7d478b3..a72acd0 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -1066,7 +1066,7 @@ main (int argc, char **argv)
           if (csh_style)
             {
               *strchr (infostr, '=') = ' ';
-              es_printf ( "setenv %s\n", infostr);
+              es_printf ( "setenv %s;\n", infostr);
             }
           else
             {

commit d01d9ff11f46cbd61b7b8c0e04431e4f0c4a8580
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jan 3 11:13:30 2012 +0100

    Terminate csh commands with a semicolon.
    
    Fixes bug#1386.
    
    * agent/gpg-agent.c (main): Terminate csh style output with a semicolon.
    * scd/scdaemon.c: Ditto.

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index f98d821..63f4ba2 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1197,11 +1197,11 @@ main (int argc, char **argv )
               if (csh_style)
                 {
                   *strchr (infostr, '=') = ' ';
-                  es_printf ("setenv %s\n", infostr);
+                  es_printf ("setenv %s;\n", infostr);
 		  if (opt.ssh_support)
 		    {
 		      *strchr (infostr_ssh_sock, '=') = ' ';
-		      es_printf ("setenv %s\n", infostr_ssh_sock);
+		      es_printf ("setenv %s;\n", infostr_ssh_sock);
 		    }
                 }
               else
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 128ecc3..6f8d010 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -843,7 +843,7 @@ main (int argc, char **argv )
               if (csh_style)
                 {
                   *strchr (infostr, '=') = ' ';
-                  es_printf ( "setenv %s\n", infostr);
+                  es_printf ( "setenv %s;\n", infostr);
                 }
               else
                 {

-----------------------------------------------------------------------

Summary of changes:
 agent/gpg-agent.c |    4 ++--
 dirmngr/dirmngr.c |    2 +-
 scd/scdaemon.c    |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org