OSSP CVS Repository

ossp - Check-in [1995]
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [Patchset]  [Tagging/Branching] 

Check-in Number: 1995
Date: 2002-Mar-13 17:22:09 (local)
2002-Mar-13 16:22:09 (UTC)
User:thl
Branch:
Comment: flush while looking for the var_expand reentrance problem
Tickets:
Inspections:
Files:
ossp-pkg/lmtp2nntp/lmtp2nntp_config.c      1.68 -> 1.69     1 inserted, 0 deleted
ossp-pkg/lmtp2nntp/lmtp2nntp_l2.c      1.1 -> 1.2     6 inserted, 0 deleted
ossp-pkg/lmtp2nntp/lmtp2nntp_main.c      1.51 -> 1.52     6 inserted, 3 deleted
ossp-pkg/lmtp2nntp/lmtp2nntp_config.c 1.68 -> 1.69 

--- lmtp2nntp_config.c   2002/03/13 14:50:37     1.68
+++ lmtp2nntp_config.c   2002/03/13 16:22:09     1.69
@@ -183,6 +183,7 @@
      * should not be used in the remainder of the program flow.
      */
     logbook(ctx->l2, L2_LEVEL_NOTICE, "startup, version %s", lmtp2nntp_version.v_gnu);
+    //logbook(ctx->l2, L2_LEVEL_NOTICE, "FIXME>>>${option.destination[0]}<<<FIXME>>>${option.destination[1]}<<<");
 
     /* --version FLAG */
     try {

ossp-pkg/lmtp2nntp/lmtp2nntp_l2.c 1.1 -> 1.2 

--- lmtp2nntp_l2.c       2002/03/13 13:58:39     1.1
+++ lmtp2nntp_l2.c       2002/03/13 16:22:09     1.2
@@ -85,10 +85,16 @@
     if (cfg->var == NULL)
         return L2_ERR_ARG;
 
+/*FIXME for safety until (l2?) bug causing overlapping output is found
+fprintf(stderr, "FIXME buf=***%s***(%d)\n", buf, buf_size);
+*/
     /* expand variables */
     if ((var_rc = var_expand(cfg->var, buf, buf_size, &buf2, &buf2_size, FALSE)) != VAR_OK) {
         return L2_ERR_USE;
     }
+/*FIXME for safety until (l2?) bug causing overlapping output is found
+fprintf(stderr, "FIXME buf2=***%s***(%d)\n", buf2, buf2_size);
+*/
 
     /* push data downstream */
     downstream = NULL;

ossp-pkg/lmtp2nntp/lmtp2nntp_main.c 1.51 -> 1.52 

--- lmtp2nntp_main.c     2002/03/13 15:32:58     1.51
+++ lmtp2nntp_main.c     2002/03/13 16:22:09     1.52
@@ -122,10 +122,9 @@
     l2_channel_t *ch2 = NULL;
 
     if (strchr(fmt, '$') == NULL) {
-        if (l2_channel_downstream(ch, &ch2) == L2_OK)
-            ch = ch2;
-        else
+        if (l2_channel_downstream(ch, &ch2) != L2_OK)
             return;
+        ch = ch2;
     }
     va_start(ap, fmt);
     l2_channel_vlog(ch, level, fmt, ap);
@@ -155,7 +154,9 @@
     char *cp;
     optionval_t *ov;
 
+    /*FIXME for safety until (l2?) bug causing overlapping output is found
     logbook(ctx->l2, L2_LEVEL_DEBUG, "ctx_lookup variable \"%s\" (%d)", var_ptr, var_len);
+    */
 
     rc = VAR_ERR_UNDEFINED_VARIABLE;
     if (strncasecmp(var_ptr, "option.", strlen("option.")) == 0) {
@@ -214,12 +215,14 @@
         free(cp);
     }
 
+    /*FIXME for safety until (l2?) bug causing overlapping output is found
     if (rc == VAR_OK) {
         logbook(ctx->l2, L2_LEVEL_DEBUG, "ctx_lookup variable \"%s\" (%d) ok: result is \"%s\" (%d)", var_ptr, var_len, *val_ptr, *val_len);
     }
     else {
         logbook(ctx->l2, L2_LEVEL_DEBUG, "ctx_lookup variable \"%s\" (%d) failed: %s (%d)", var_ptr, var_len, var_strerror(var, rc, &cp) == VAR_OK ? cp : "Unknown Error", rc);
     }
+    */
 
     return rc;
 }

CVSTrac 2.0.1