OSSP CVS Repository

ossp - Difference in ossp-pkg/lmtp2nntp/lmtp2nntp_main.c versions 1.37 and 1.38
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

ossp-pkg/lmtp2nntp/lmtp2nntp_main.c 1.37 -> 1.38

--- lmtp2nntp_main.c     2002/02/05 14:56:47     1.37
+++ lmtp2nntp_main.c     2002/02/06 13:51:38     1.38
@@ -344,7 +344,6 @@
     ctx->ctx.vp = ctx;
     ctx->val = NULL;
     ctx->progname = NULL;
-    ctx->option_childsmax = 0;
     ctx->option_groupmode = GROUPMODE_UNDEF;
     ctx->option_operationmode = OPERATIONMODE_UNDEF;
     ctx->option_operationmodefakestatus = NULL;
@@ -364,6 +363,9 @@
     ctx->option_killflag = FALSE;
     ctx->option_uid = getuid();
     ctx->option_daemon = FALSE;
+    ctx->nacl = 0;
+    ctx->pacl = NULL;
+    ctx->option_childsmax = 0;
     ctx->active_childs = 0;
     ctx->l2_env = NULL;
     ctx->l2 = NULL;
@@ -371,14 +373,17 @@
     ctx->saServerbind = NULL;
     ctx->saaClientbind = NULL;
     ctx->saClientbind = NULL;
+    ctx->saaIO = NULL;
+    ctx->saIO = NULL;
+    ctx->fdIOi = -1;
+    ctx->fdIOo = -1;
     ctx->nns = 0;
     ctx->pns = NULL;
-    ctx->nacl = 0;
-    ctx->pacl = NULL;
     ctx->azGroupargs = NULL;
     ctx->asGroupargs = 0;
     initsession(&ctx->session);
     ctx->msg = NULL;
+    memset(&ctx->uname, 0, sizeof(struct utsname));
     
     /* fill in application context */
     if (val_create(&ctx->val) != VAL_OK)
@@ -623,7 +628,7 @@
     /* graceful shutdown */
     CUS:
     log0(ctx, NOTICE, "graceful shutdown shortly before exit - no more logging");
-    l2_channel_destroy(ctx->l2);
+    //l2_channel_destroy(ctx->l2);
     l2_env_destroy(ctx->l2_env);
     if (ctx->saServerbind)
         sa_destroy(ctx->saServerbind);
@@ -791,11 +796,15 @@
         }
         else {
             log1(ctx, WARNING, "NNTP session establishment to ${option.destination}[${i}] failed", i); //FIXME
-            log1(ctx, DEBUG, "removing ns[%d] from list", i);
+            log1(ctx, DEBUG, "FIXME-CURRENTLY-NOT removing ns[%d] from list", i);
             lmtp_gfs_ns(&ctx->pns[i]);
+            /*FIXME #1 this code is a leftover from the static ns array with nsc counter
+              FIXME #2 this code removes the newsservice forever!? What is the scope, what should the scope be - gateway, child process, session, posting lifetime? What is the intention of the user?
             if (i < --ctx->nns) {
                 memcpy(&ctx->pns[i], &ctx->pns[i+1], (ctx->nns - i ) * sizeof(struct ns));
             }
+            */
+            i++; //FIXME this is just to avoid infinite loop
         }
     } while (i < ctx->nns);
 

CVSTrac 2.0.1