[rsh/f14/master] Fix typo in rexec.c (#650119).

Adam Tkac atkac at fedoraproject.org
Mon Nov 8 12:19:19 UTC 2010


commit faf6538db89f491e1763f6b4ff4959dc12f54fa1
Author: Adam Tkac <atkac at redhat.com>
Date:   Mon Nov 8 13:18:50 2010 +0100

    Fix typo in rexec.c (#650119).
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>
    
    Conflicts:
    
    	rsh.spec

 netkit-rsh-0.17-rh650119.patch |   12 ++++++++++++
 rsh.spec                       |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/netkit-rsh-0.17-rh650119.patch b/netkit-rsh-0.17-rh650119.patch
new file mode 100644
index 0000000..0881c18
--- /dev/null
+++ b/netkit-rsh-0.17-rh650119.patch
@@ -0,0 +1,12 @@
+diff -up netkit-rsh-0.17/rexec/rexec.c.rh650119 netkit-rsh-0.17/rexec/rexec.c
+--- netkit-rsh-0.17/rexec/rexec.c.rh650119	2010-11-08 13:14:20.946845218 +0100
++++ netkit-rsh-0.17/rexec/rexec.c	2010-11-08 13:14:36.126838888 +0100
+@@ -315,7 +315,7 @@ void parse_options(char *argv[], int arg
+       {
+         int passlen = strlen(optarg);
+ 
+-	*passwd = malloc((char *)malloc((passlen+1)*sizeof(char)));
++	*passwd = (char *)malloc((passlen+1)*sizeof(char));
+         if(*passwd == NULL)
+         {
+           fprintf(stderr, "%s: can't allocate memory!\n", argv[0]);
diff --git a/rsh.spec b/rsh.spec
index e64342e..dd49f1b 100644
--- a/rsh.spec
+++ b/rsh.spec
@@ -1,7 +1,7 @@
 Summary: Clients for remote access commands (rsh, rlogin, rcp)
 Name: rsh
 Version: 0.17
-Release: 62%{?dist}
+Release: 63%{?dist}
 License: BSD
 Group: Applications/Internet
 
@@ -76,6 +76,7 @@ Patch37: netkit-rsh-0.17-arg_max.patch
 Patch38: netkit-rsh-0.17-rh448904.patch
 Patch39: netkit-rsh-0.17-rh461903.patch
 Patch40: netkit-rsh-0.17-rh473492.patch
+Patch41: netkit-rsh-0.17-rh650119.patch
 
 %description
 The rsh package contains a set of programs which allow users to run
@@ -141,6 +142,7 @@ from other machines
 %patch38 -p1 -b .rh448904
 %patch39 -p1 -b .rh461903
 %patch40 -p1 -b .rh473492
+%patch41 -p1 -b .rh650119
 
 # No, I don't know what this is doing in the tarball.
 rm -f rexec/rexec
@@ -210,6 +212,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*.8*
 
 %changelog
+* Mon Nov 09 2010 Adam Tkac <atkac redhat com> - 0.17-63
+- fix typo in rexec.c (#650119)
+
 * Tue Jan 5 2010 Jan Gorig  <jgorig redhat com> - 0.17-62
 - add check for return values (#473492)
 


More information about the scm-commits mailing list