[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

rssh_2.2.3-1.sarge.2 package with command line parsing fixed.



And of course I forgot the patch.

-- 
Jesus Climent                  info:www.pumuki.org dj:triplestereo.com
Unix SysAdm|Linux User #66350|Debian Developer|2.6.16|Helsinki Finland
GPG: 1024D/86946D69 BB64 2339 1CAA 7064 E429  7E18 66FC 1D7F 8694 6D69

When you dance with the devil, you wait for the song to stop.
		--Barry the Baptist (Lock, Stock and Two Smoking Barrels)
--- tmp/rssh-2.2.3/main.c.in	2006-06-24 12:23:43.000000000 +0000
+++ rssh-2.2.3/main.c.in	2006-06-24 11:54:04.000000000 +0000
@@ -174,8 +174,6 @@
 		         char **cmd )
 {
 	char    **argvec;       /* argument vector for new cmd line */
-	char	*homedir;	/* relative to chroot */
-	char	*root;		/* the chroot dir */
 	char	*temp;		/* to build chroot helper cmd line */
 	int	len;
 
@@ -229,8 +227,8 @@
 		*cmd = PATH_CHROOT_HELPER;
 
 		/* set up buffer to log command line ('"' + ' ' + '\0' = 9) */
-		len = strlen(cmdline) + strlen(root) + strlen(homedir) + 
-		      strlen(argvec[2]) + strlen(PATH_CHROOT_HELPER) + 9;
+		len = strlen(cmdline) + strlen(argvec[2]) +
+		      strlen(PATH_CHROOT_HELPER) + 9;
 		if ( !(temp = (char *)malloc(len)) ){
 			log_set_priority(LOG_ERR);
 			log_msg("OOM error in build_shell_args() (fatal)");
--- tmp/rssh-2.2.3/util.c	2006-06-24 12:23:43.000000000 +0000
+++ rssh-2.2.3/util.c	2006-06-24 11:54:09.000000000 +0000
@@ -209,13 +209,14 @@
 		return PATH_SCP;
 	}
 
-	if ( check_command(cl, opts, PATH_CVS, RSSH_ALLOW_CVS) )
+	if ( check_command(cl, opts, PATH_CVS, RSSH_ALLOW_CVS) ){
 		if ( opt_exist(cl, 'e') ){
 			fprintf(stderr, "\ninsecure -e option not allowed.");
 			log_msg("insecure -e option in cvs command line!");
 			return NULL;
 		}
 		return PATH_CVS;
+	}
 
 	if ( check_command(cl, opts, PATH_RDIST, RSSH_ALLOW_RDIST) ){
 		/* filter -P option */

Reply to: