2.0.6 patch set part 1

[Peter Van Epp]

	Still too big so I'll slit this in half so it will go through :-).

	And 5 patches against 2.0.6-fixes.1 (which are not needed if you are
up to date as they have all been on the list before) that fix up printing on 
2.0.6 so we can compare apples to apples as much as possible. You can test
by using the ra2.conf.full file in the next message, if it prints without 
seg faulting on 2.0.6 then you don't need these patches :-). 

*** common/argus_client.c.orig	Mon Feb 13 20:32:51 2006
--- common/argus_client.c	Sun Feb 26 20:48:51 2006
***************
*** 69,74 ****
--- 69,78 ----
           RaPrintDate = 0;
           for (x = 0; x < MAX_PRINT_ALG_TYPES; x++) {
              if (!strncmp (RaPrintKeyWords[x], soption, strlen(RaPrintKeyWords[x]))) {
+ 	       if (x == 0) {
+ 		  RaPrintStartTime = 1;
+ 		  RaPrintLastTime = 1;
+ 	       }
                 if (x < 3) RaPrintDate++;
                 switch (RaOptionOperation) {
                    case RA_ADD_OPTION:
***************
*** 3090,3096 ****
     }
  
     if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) {
!       char tmpbuf[128], *ptr = tmpbuf, *str = RaLabel, lastchr = ' ';
  
        bzero (tmpbuf, sizeof(tmpbuf));
        lastchr = RaFieldDelimiter;
--- 3094,3100 ----
     }
  
     if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) {
!       char tmpbuf[1024], *ptr = tmpbuf, *str = RaLabel, lastchr = ' ';
  
        bzero (tmpbuf, sizeof(tmpbuf));
        lastchr = RaFieldDelimiter;
***************
*** 3120,3127 ****
  {
     if (lflag)
        ArgusPrintLastDateLabel (buf);
!    else
        ArgusPrintStartDateLabel (buf);
  }
  
  
--- 3124,3133 ----
  {
     if (lflag)
        ArgusPrintLastDateLabel (buf);
!    else {
        ArgusPrintStartDateLabel (buf);
+       ArgusPrintLastDateLabel (buf);
+    }
  }
  
  
***************
*** 3448,3454 ****
           if (len & 0x01)
              sprintf(&buf[strlen(buf)], " ");
        }
!    }
  }
  
  void
--- 3454,3461 ----
           if (len & 0x01)
              sprintf(&buf[strlen(buf)], " ");
        }
!    } else 
!       sprintf (&buf[strlen(buf)], " srcUdata%cdstUdata ", RaFieldDelimiter);
  }
  
  void

*** common/argus_filter.c.orig	Wed Mar 26 20:26:54 2003
--- common/argus_filter.c	Tue Sep  7 13:50:52 2004
***************
*** 3954,3960 ****
  
        while (table->name)
           table = table->nxt;
!       if (nflag > 1) {
           char buf[32];
  
           (void)sprintf(buf, "%d", port);
--- 3954,3960 ----
  
        while (table->name)
           table = table->nxt;
!       if (nflag > 2) {
           char buf[32];
  
           (void)sprintf(buf, "%d", port);
***************
*** 4143,4149 ****
        f_netmask = mask;
     }
  
!    if (nflag > 1)
        /*
         * Simplest way to suppress names.
         */
--- 4143,4149 ----
        f_netmask = mask;
     }
  
!    if (nflag > 2)
        /*
         * Simplest way to suppress names.
         */

*** common/argus_parse.c.orig	Sat Dec  6 09:42:13 2003
--- common/argus_parse.c	Tue Sep  7 13:51:03 2004
***************
*** 3995,4004 ****
                                break;
   
                             case RA_PRINT_HOSTNAMES:
!                               if (!(strncasecmp(optarg, "yes", 3)))
                                   nflag = 0;
!                               else
!                                  nflag = 1;
                                break;
  
                             case RA_PRINT_LOCALONLY:
--- 3995,4008 ----
                                break;
   
                             case RA_PRINT_HOSTNAMES:
!                               if (!(strncasecmp(optarg, "all", 3))) 
                                   nflag = 0;
!                               else if (!(strncasecmp(optarg, "port", 4)))
!                                     nflag = 1;
!                               else if (!(strncasecmp(optarg, "protocol", 8)))
! 				    nflag = 2;
! 			      else  /* assume the value was "none" */
! 				    nflag = 3;
                                break;
  
                             case RA_PRINT_LOCALONLY: