Index: ossp-pkg/lmtp2nntp/lmtp2nntp_main.c
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_main.c,v
rcsdiff -q -kk '-r1.50' '-r1.51' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/lmtp2nntp_main.c,v' 2>/dev/null
--- lmtp2nntp_main.c	2002/03/13 14:41:13	1.50
+++ lmtp2nntp_main.c	2002/03/13 15:32:58	1.51
@@ -816,15 +816,15 @@
     do {
         logbook(ctx->l2, L2_LEVEL_DEBUG, "trying ns[%d]", i);
         bOk = TRUE;
-        logbook(ctx->l2, L2_LEVEL_TRACE, "try ${option.destination}[%d]", i); //FIXME
+        logbook(ctx->l2, L2_LEVEL_TRACE, "try ${option.destination[%d]}", i);
 
         ctx->pns[i].l2 = ctx->l2;
 
         if (bOk && (ctx->saaClientbind != NULL)) {
-            logbook(ctx->l2, L2_LEVEL_DEBUG, "bind local socket to ${option.clientbind}"); //FIXME
+            logbook(ctx->l2, L2_LEVEL_DEBUG, "bind local socket to ${option.client}");
             if (sa_bind(ctx->pns[i].sa, ctx->saaClientbind) != SA_OK) {
                 bOk = FALSE;
-                logbook(ctx->l2, L2_LEVEL_ERROR, "binding NNTP client to local address ${option.clientbind} failed, %m"); //FIXME
+                logbook(ctx->l2, L2_LEVEL_ERROR, "binding NNTP client to local address ${option.client} failed, %m");
             }
         }
 
@@ -837,7 +837,7 @@
             logbook(ctx->l2, L2_LEVEL_DEBUG, "connect");
             if (sa_connect(ctx->pns[i].sa, ctx->pns[i].saa) != SA_OK) {
                 bOk = FALSE;
-                logbook(ctx->l2, L2_LEVEL_WARNING, "connect to ${option.destination}[%d] failed, %m", i); //FIXME
+                logbook(ctx->l2, L2_LEVEL_WARNING, "connect to ${option.destination[%d]} failed, %m", i);
             }
         }
 
@@ -861,11 +861,11 @@
         }
 
         if (bOk) {
-            logbook(ctx->l2, L2_LEVEL_INFO, "NNTP session to ${option.destination}[%d] successfully established", i); //FIXME
+            logbook(ctx->l2, L2_LEVEL_INFO, "NNTP session to ${option.destination[%d]} successfully established", i);
             i++;
         }
         else {
-            logbook(ctx->l2, L2_LEVEL_WARNING, "NNTP session establishment to ${option.destination}[%d] failed", i); //FIXME
+            logbook(ctx->l2, L2_LEVEL_WARNING, "NNTP session establishment to ${option.destination[%d]} failed", i);
             logbook(ctx->l2, L2_LEVEL_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
@@ -1631,8 +1631,8 @@
         for (i = 0; i < ctx->nns; i++) {
             if (ctx->pns[i].rc != NNTP_OK) {
                 str_format(errorstring, sizeof(errorstring), 
-                "${option.destination}[%d] returned %s\n" /*FIXME*/
-                "${option.destination}[%d] lastresp \"%s\"",  /*FIXME*/
+                "${option.destination[%d]} returned %s\n"
+                "${option.destination[%d]} lastresp \"%s\"",
                 i, nntp_error(ctx->pns[i].rc), 
                 i, nntp_lastresp(ctx->pns[i].nntp));
                 argz_add(&azErr, &asErr, errorstring);