rpms/proftpd/devel proftpd-1.3.0-cmdbufsize.patch, 1.1, 1.2 proftpd.spec, 1.22, 1.23

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13285

Modified Files:
	proftpd-1.3.0-cmdbufsize.patch proftpd.spec 
Log Message:
Fix cmdbufsize patch for missing CommandBufferSize case (#214820 once more).


proftpd-1.3.0-cmdbufsize.patch:

Index: proftpd-1.3.0-cmdbufsize.patch
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd-1.3.0-cmdbufsize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proftpd-1.3.0-cmdbufsize.patch	13 Nov 2006 18:10:35 -0000	1.1
+++ proftpd-1.3.0-cmdbufsize.patch	21 Nov 2006 11:55:23 -0000	1.2
@@ -1,6 +1,6 @@
---- src/main.c	2006/09/29 16:38:16	1.292
-+++ src/main.c	2006/10/31 22:49:03	1.293
-@@ -116,6 +116,8 @@ static unsigned char have_dead_child = F
+--- proftpd-1.3.0/src/main.c.cmdbufsize	2006-03-15 19:41:01.000000000 +0000
++++ proftpd-1.3.0/src/main.c	2006-11-17 16:53:35.000000000 +0000
+@@ -116,6 +116,8 @@
  
  static char sbuf[PR_TUNABLE_BUFFER_SIZE] = {'\0'};
  
@@ -9,28 +9,27 @@
  static char **Argv = NULL;
  static char *LastArgv = NULL;
  static const char *PidPath = PR_PID_FILE_PATH;
-@@ -832,16 +834,25 @@
-       pr_timer_reset(TIMER_IDLE, NULL);
- 
-     if (cmd_buf_size == -1) {
--      long *buf_size = get_param_ptr(main_server->conf,
--        "CommandBufferSize", FALSE);
-+      int *bufsz = get_param_ptr(main_server->conf, "CommandBufferSize",
-+        FALSE);
+@@ -823,13 +825,26 @@
+       long *buf_size = get_param_ptr(main_server->conf,
+         "CommandBufferSize", FALSE);
  
 -      if (buf_size == NULL || *buf_size <= 0)
 -        cmd_buf_size = 512;
-+      if (bufsz == NULL ||
-+          *bufsz <= 0) {
-+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
++      if (buf_size == NULL) {
++        pr_log_debug(DEBUG1, "no CommandBufferSize size given, "
++          "using default buffer size (%u)", (unsigned int) PR_DEFAULT_CMD_BUFSZ);
++        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
++
++      } else if (*buf_size <= 0) {
++	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%ld) "
 +          "given, resetting to default buffer size (%u)",
-+          *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
++          *buf_size, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
 +        cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
 +
-+      } else if (*bufsz + 1 > sizeof(buf)) {
-+	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%d) "
++      } else if (*buf_size + 1 > sizeof(buf)) {
++	pr_log_pri(PR_LOG_WARNING, "invalid CommandBufferSize size (%ld) "
 +          "given, resetting to default buffer size (%u)",
-+          *bufsz, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
++          *buf_size, (unsigned int) PR_DEFAULT_CMD_BUFSZ);
 +	cmd_buf_size = PR_DEFAULT_CMD_BUFSZ;
  
 -      else if (*buf_size + 1 > sizeof(buf)) {
@@ -38,8 +37,8 @@
 -          "Resetting to 512.");
 -	cmd_buf_size = 512;
 +      } else {
-+        pr_log_debug(DEBUG1, "setting CommandBufferSize to %d", *bufsz);
-+        cmd_buf_size = (long) *bufsz;
++        pr_log_debug(DEBUG1, "setting CommandBufferSize to %ld", *buf_size);
++        cmd_buf_size = (long) *buf_size;
        }
      }
  


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- proftpd.spec	16 Nov 2006 11:02:41 -0000	1.22
+++ proftpd.spec	21 Nov 2006 11:55:23 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -190,6 +190,9 @@
 
 
 %changelog
+* Thu Nov 16 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-10
+- Fix cmdbufsize patch for missing CommandBufferSize case (#214820 once more).
+
 * Thu Nov 16 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-9
 - Include mod_tls patch (#214820 too).