[ProFTPD-committers] CVS: proftpd/contrib mod_tls.c,1.35,1.36

[TJ S. <cas...@us...>]

Update of /cvsroot/proftp/proftpd/contrib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25902/contrib

Modified Files:
	mod_tls.c 
Log Message:

Bug#2337 - TLSRenegotiate parameters not processed correctly.


Index: mod_tls.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/contrib/mod_tls.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mod_tls.c	10 Feb 2004 04:07:03 -0000	1.35
+++ mod_tls.c	10 Feb 2004 23:31:29 -0000	1.36
@@ -3003,7 +3003,7 @@
 
   CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL);
 
-  if (!strcasecmp(cmd->argv[1], "none")) {
+  if (strcasecmp(cmd->argv[1], "none") == 0) {
     add_config_param(cmd->argv[0], 0);
     return HANDLED(cmd);
   }
@@ -3018,8 +3018,8 @@
   c->argv[3] = pcalloc(c->pool, sizeof(unsigned char));
   *((unsigned char *) c->argv[3]) = TRUE;
 
-  for (i = 1; i < cmd->argc; i++) {
-    if (!strcmp(cmd->argv[i], "ctrl")) {
+  for (i = 1; i < cmd->argc;) {
+    if (strcmp(cmd->argv[i], "ctrl") == 0) {
       int secs = atoi(cmd->argv[i+1]);
 
       if (secs > 0)
@@ -3031,9 +3031,8 @@
           NULL));
 
       i += 2;
-    }
 
-    if (!strcmp(cmd->argv[i], "data")) {
+    } else if (strcmp(cmd->argv[i], "data") == 0) {
       char *tmp = NULL;
       unsigned long kbytes = strtoul(cmd->argv[i+1], &tmp, 10);
 
@@ -3046,9 +3045,8 @@
           NULL));
 
       i += 2;
-    }
 
-    if (!strcmp(cmd->argv[i], "required")) {
+    } else if (strcmp(cmd->argv[i], "required") == 0) {
       int bool = get_boolean(cmd, i+1);
 
       if (bool != -1)
@@ -3060,9 +3058,8 @@
           NULL));
 
       i += 2;
-    }
 
-    if (!strcmp(cmd->argv[i], "timeout")) {
+    } else if (strcmp(cmd->argv[i], "timeout") == 0) {
       int secs = atoi(cmd->argv[i+1]);
       
       if (secs > 0)