Fixed a security problem where the custom snprintf() would always be used. Thanks...

[betaftpd] / cmds.h

diff --git a/cmds.h b/cmds.h
index 88b04d19fc6e6b5fd63a69d87ec16d97eb898f47..8075f1c1c1cba5eef1cc6b71b7e3e01cb9418495 100644 (file)
--- a/cmds.h
+++ b/cmds.h
@@ -2,7 +2,7 @@
     Copyright (C) 1999-2000 Steinar H. Gunderson
 
     This program is is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License, version 2 if the
+    it under the terms of the GNU General Public License, version 2 of the
     License as published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
@@ -15,6 +15,11 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
+#ifndef _CMDS_H
+#define _CMDS_H 1
+
+#include <ftpd.h>
+
 /*
  * TRAP_ERROR: This is a quick way of doing a test for an error condition.
  *             if an error occurs (or more precisely, if the value supplied is
@@ -49,7 +54,7 @@
        }
 #endif
 
-#define CMD_PROTO(cmd) int cmd_ ## cmd ## (struct conn * const c)
+#define CMD_PROTO(cmd) void cmd_ ## cmd (struct conn * const c)
 
 int do_chdir(struct conn * const c, const char * const newd);
 CMD_PROTO(user);
@@ -127,3 +132,5 @@ char *do_pwd(struct conn * const c, char * const retbuf, const char * const dir)
 #define POLLIN         0x001
 #define POLLOUT                0x004
 #endif
+
+#endif