[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-278-g4aa58d1

[Mats Erik Andersson]

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 "GNU Inetutils ".

The branch, master has been updated
       via  4aa58d1102e0b24a75420f906d87d5db42858118 (commit)
      from  6aec31d308cf6fd350ccf42ba11b248f6f512d67 (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 -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=4aa58d1102e0b24a75420f906d87d5db42858118


commit 4aa58d1102e0b24a75420f906d87d5db42858118
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Apr 26 00:32:57 2013 +0200

    rcp: Make encryption portable.

diff --git a/ChangeLog b/ChangeLog
index ac05bbb..0665618 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-04-26  Mats Erik Andersson  <address@hidden>
+
+       rcp: Make encryption portable.
+
+       * src/rcp.c (main) [KERBEROS || SHISHI]: The encryption
+       switch `-x' does not belong in the remote command string.
+       It is must only be passed to `rsh'.  Remove the special
+       command string claimed for all Kerberos variants.
+
 2013-04-25  Mats Erik Andersson  <address@hidden>
 
        syslogd: Attempt to mend recurring test failures.
diff --git a/src/rcp.c b/src/rcp.c
index 6172804..0bfb826 100644
--- a/src/rcp.c
+++ b/src/rcp.c
@@ -371,20 +371,10 @@ main (int argc, char *argv[])
 #endif
 
   /* Command to be executed on remote system using "rsh". */
-#if defined KERBEROS || defined SHISHI
-  rc = asprintf (&command, "rcp%s%s%s%s", iamrecursive ? " -r" : "",
-# ifdef ENCRYPTION
-                (doencrypt && use_kerberos ? " -x" : ""),
-# else /* No encryption */
-                "",
-# endif
-                preserve_option ? " -p" : "",
-                targetshouldbedirectory ? " -d" : "");
-#else /* !KERBEROS && !SHISHI */
   rc = asprintf (&command, "rcp%s%s%s",
                 iamrecursive ? " -r" : "", preserve_option ? " -p" : "",
                 targetshouldbedirectory ? " -d" : "");
-#endif
+
   if (rc < 0)
     xalloc_die ();
 

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

Summary of changes:
 ChangeLog |    9 +++++++++
 src/rcp.c |   12 +-----------
 2 files changed, 10 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GNU Inetutils