arpwatch-debian_11opt_sendmail_path.patch

   1 Index: arpwatch/arpsnmp.8
   2 diff -u arpwatch/arpsnmp.8:1.1.1.1.2.1 arpwatch/arpsnmp.8:1.1.1.1.4.4
   3 --- arpwatch/arpsnmp.8:1.1.1.1.2.1      Thu Aug 12 22:16:18 2004
   4 +++ arpwatch/arpsnmp.8  Thu Aug 12 22:23:48 2004
   5 @@ -40,6 +40,14 @@
   6  .\" **
   7  .br
   8  .ti +8
   9 +[
  10 +.B -s
  11 +.I sendmail_path
  12 +]
  13 +.\" **
  14 +.\" **
  15 +.br
  16 +.ti +8
  17  .I file
  18  [
  19  .I ...
  20 @@ -70,6 +78,15 @@
  21  .\" **
  22  .\" **
  23  .LP
  24 +(Debian) The
  25 +.B -s
  26 +flag is used to specify the path to the sendmail program.
  27 +Any program that takes the option -odi and then text from stdin
  28 +can be substituted. This is useful for redirecting reports
  29 +to log files instead of mail.
  30 +.\" **
  31 +.\" **
  32 +.LP
  33  Note that an empty
  34  .I arp.dat
  35  file must be created before the first time you run
  36 Index: arpwatch/arpsnmp.c
  37 diff -u arpwatch/arpsnmp.c:1.1.1.1.2.2 arpwatch/arpsnmp.c:1.1.1.1.2.1.2.2
  38 --- arpwatch/arpsnmp.c:1.1.1.1.2.2      Tue Aug 10 11:14:13 2004
  39 +++ arpwatch/arpsnmp.c  Tue Aug 10 11:16:17 2004
  40 @@ -67,6 +67,7 @@
  41  __dead void usage(void) __attribute__((volatile));
  42
  43  char *prog;
  44 +char *path_sendmail = PATH_SENDMAIL;
  45
  46  extern int optind;
  47  extern int opterr;
  48 @@ -81,6 +82,7 @@
  49         char options[] =
  50                 "d"
  51                 "f:"
  52 +               "s:"
  53         ;
  54
  55         if ((cp = strrchr(argv[0], '/')) != NULL)
  56 @@ -109,6 +111,10 @@
  57                         arpfile = optarg;
  58                         break;
  59
  60 +               case 's':
  61 +                       path_sendmail = optarg;
  62 +                       break;
  63 +
  64                 default:
  65                         usage();
  66                 }
  67 @@ -189,6 +195,7 @@
  68         char usage[] =
  69                 "[-d] "
  70                 "[-f datafile] "
  71 +               "[-s sendmail_path] "
  72                 "file [...]\n"
  73         ;
  74
  75 Index: arpwatch/arpwatch.8
  76 diff -u arpwatch/arpwatch.8:1.1.1.1.2.2 arpwatch/arpwatch.8:1.1.1.1.4.5
  77 --- arpwatch/arpwatch.8:1.1.1.1.2.2     Thu Aug 12 22:31:09 2004
  78 +++ arpwatch/arpwatch.8 Thu Aug 12 22:35:07 2004
  79 @@ -63,6 +63,14 @@
  80  ]
  81  .\" **
  82  .\" **
  83 +.br
  84 +.ti +8
  85 +[
  86 +.B -s
  87 +.I sendmail_path
  88 +]
  89 +.\" **
  90 +.\" **
  91  .ad
  92  .SH DESCRIPTION
  93  .B Arpwatch
  94 @@ -127,6 +135,15 @@
  95  .\" **
  96  .\" **
  97  .LP
  98 +(Debian) The
  99 +.B -s
 100 +flag is used to specify the path to the sendmail program.
 101 +Any program that takes the option -odi and then text from stdin
 102 +can be substituted. This is useful for redirecting reports
 103 +to log files instead of mail.
 104 +.\" **
 105 +.\" **
 106 +.LP
 107  Note that an empty
 108  .I arp.dat
 109  file must be created before the first time you run
 110 Index: arpwatch/arpwatch.c
 111 diff -u arpwatch/arpwatch.c:1.1.1.1.2.5 arpwatch/arpwatch.c:1.1.1.1.2.1.2.3
 112 --- arpwatch/arpwatch.c:1.1.1.1.2.5     Sat Aug 14 02:33:07 2004
 113 +++ arpwatch/arpwatch.c Fri Aug 13 00:12:22 2004
 114 @@ -106,6 +106,7 @@
 115  #endif
 116
 117  char *prog;
 118 +char *path_sendmail = PATH_SENDMAIL;
 119
 120  int can_checkpoint;
 121  int swapped;
 122 @@ -172,6 +173,9 @@
 123                 "r:"
 124                 /**/
 125                 /**/
 126 +               "s:"
 127 +               /**/
 128 +               /**/
 129         ;
 130
 131         if (argv[0] == NULL)
 132 @@ -223,6 +227,11 @@
 133                         break;
 134                 /**/
 135                 /**/
 136 +               case 's':
 137 +                       path_sendmail = optarg;
 138 +                       break;
 139 +               /**/
 140 +               /**/
 141                 default:
 142                         usage();
 143                 }
 144 @@ -785,6 +794,9 @@
 145                 "[-r file] "
 146                 /**/
 147                 /**/
 148 +               "[-s sendmail_path] "
 149 +               /**/
 150 +               /**/
 151                 "\n"
 152         ;
 153
 154 Index: arpwatch/report.c
 155 diff -u arpwatch/report.c:1.1.1.1 arpwatch/report.c:1.1.1.1.4.1
 156 --- arpwatch/report.c:1.1.1.1   Tue Apr 17 13:31:37 2001
 157 +++ arpwatch/report.c   Tue Apr 17 13:49:16 2001
 158 @@ -235,6 +235,7 @@
 159  report(register char *title, register u_int32_t a, register u_char *e1,
 160      register u_char *e2, register time_t *t1p, register time_t *t2p)
 161  {
 162 +        extern char *path_sendmail;
 163         register char *cp, *hn;
 164         register int fd, pid;
 165         register FILE *f;
 166 @@ -242,7 +243,7 @@
 167         char *fmt = "%20s: %s\n";
 168         char *watcher = WATCHER;
 169         char *watchee = WATCHEE;
 170 -       char *sendmail = PATH_SENDMAIL;
 171 +       char *sendmail = path_sendmail;
 172         char *unknown = "<unknown>";
 173         char buf[132];
 174         static int init = 0;