Garbage characters when displaying the remote host name.

diff --git a/CHANGES b/CHANGES
index 129df01fde54810d6869eb44b4ec514791853232..08cdf8112a30123a86d86cfaba52d1358e5fb3f0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.34 2000/01/11 12:32:53 tiniou Exp $
+$Id: CHANGES,v 1.35 2000/01/17 16:32:44 stelian Exp $
 
 Changes between versions 0.4b12 and 0.4b13 (released ???????????????)
 =====================================================================
@@ -10,15 +10,18 @@ Changes between versions 0.4b12 and 0.4b13 (released ???????????????)
        spec file. Thanks to Christian Weisgerber 
        <naddy@mips.rhein-neckar.de> for submitting this.
 
-3.     Fix a bug in dump related to the 'filetype' feature of ext2fs,
+3.     Fixed a bug in dump related to the 'filetype' feature of ext2fs,
        causing dump to block when dumping really huge filesystems.
        Many thanks to Patrik Schindler <poc@pocnet.net> for 
        helping me find this bug.
 
-4.     Fix the treatment for an interrupt signal when dump access
+4.     Fixed the treatment for an interrupt signal when dump access
        the remote tape through RSH. Thanks to Christian Weisgerber
        <naddy@mips.rhein-neckar.de> for providing the patch.
 
+5.     Fixed a bug which was causing dump/restore to display
+       garbage characters instead of the remote host name.
+
 Changes between versions 0.4b11 and 0.4b12 (released January 8, 2000)
 =====================================================================
 

diff --git a/common/dumprmt.c b/common/dumprmt.c
index b56cc27c9659d41fe6ca7a77edfae223ef99fd3b..072b0f50d1c4fbab6733a6f6bb465d4a17d665a7 100644 (file)
--- a/common/dumprmt.c
+++ b/common/dumprmt.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: dumprmt.c,v 1.9 2000/01/11 12:33:44 tiniou Exp $";
+       "$Id: dumprmt.c,v 1.10 2000/01/17 16:32:44 stelian Exp $";
 #endif /* not lint */
 
 #ifdef __linux__
@@ -169,6 +169,7 @@ rmtgetconn(void)
        int size;
        int throughput;
        int on;
+       char *rmtpeercopy;
 
        rsh = getenv("RSH");
 
@@ -210,13 +211,17 @@ rmtgetconn(void)
                }
        }
        else {
+               /* Copy rmtpeer to rmtpeercopy to ignore the
+                  return value from rcmd. I cannot figure if
+                  this is this a bug in rcmd or in my code... */
+               rmtpeercopy = (char *)rmtpeer;
 #ifdef KERBEROS
                if (dokerberos)
-                       tormtape = krcmd((char **)&rmtpeer, sp->s_port, tuser, rmt, &errfd,
+                       tormtape = krcmd(&rmtpeercopy, sp->s_port, tuser, rmt, &errfd,
                                       (char *)0);
                else
 #endif
-                       tormtape = rcmd((char **)&rmtpeer, (u_short)sp->s_port, pwd->pw_name,
+                       tormtape = rcmd(&rmtpeercopy, (u_short)sp->s_port, pwd->pw_name,
                                      tuser, rmt, &errfd);
                if (tormtape < 0) {
                        msg("login to %s as %s failed.\n", rmtpeer, tuser);