From 8d957ae7f665fbb4ce5d3ed0978fa968dc607af5 Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Mon, 17 Jan 2000 16:32:44 +0000 Subject: [PATCH] Garbage characters when displaying the remote host name. --- CHANGES | 9 ++++++--- common/dumprmt.c | 11 ++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 129df01..08cdf81 100644 --- 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 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 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 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 b56cc27..072b0f5 100644 --- 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); -- 2.39.2