svn rev #3299: trunk/gssftp/ ftp/ ftpd/

[ghudson@MIT.EDU]

Commit By: ghudson
Log Message:
ticket: 6713
status: open

Fixed some uses of variables as format strings.  Based on a patch from
Guillaume Rousse <Guillaume.Rousse at inria.fr>.  Deferred changes to
telnet/utilities.c.



Changed Files:
U   trunk/gssftp/ftp/cmds.c
U   trunk/gssftp/ftpd/ftpd.c
Modified: trunk/gssftp/ftp/cmds.c
===================================================================
--- trunk/gssftp/ftp/cmds.c	2010-03-02 23:57:40 UTC (rev 3298)
+++ trunk/gssftp/ftp/cmds.c	2010-05-03 19:51:50 UTC (rev 3299)
@@ -1824,7 +1824,7 @@
 			len += strlen(strncpy(&buf[len], argv[i], sizeof(buf) - 1 - len));
 		}
 	}
-	if (command(buf) == PRELIM) {
+	if (command("%s", buf) == PRELIM) {
 		while (getreply(0) == PRELIM);
 	}
 }

Modified: trunk/gssftp/ftpd/ftpd.c
===================================================================
--- trunk/gssftp/ftpd/ftpd.c	2010-03-02 23:57:40 UTC (rev 3298)
+++ trunk/gssftp/ftpd/ftpd.c	2010-05-03 19:51:50 UTC (rev 3299)
@@ -2360,7 +2360,7 @@
 		globerr = NULL;
 		dirlist = ftpglob(whichfiles);
 		if (globerr != NULL) {
-			reply(550, globerr);
+			reply(550, "%s", globerr);
 			return;
 		} else if (dirlist == NULL) {
 			errno = ENOENT;
@@ -2536,7 +2536,7 @@
 log_gss_error(int severity, OM_uint32 maj_stat, OM_uint32 min_stat,
 	      const char *s)
 {
-    syslog(severity, s);
+    syslog(severity, "%s", s);
     with_gss_error_text(log_gss_error_1, maj_stat, min_stat, severity);
 }