Print this page
Bump Apache dependency to Apache 2

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/logadm/main.c
          +++ new/usr/src/cmd/logadm/main.c
↓ open down ↓ 643 lines elided ↑ open up ↑
 644  644  
 645  645                          /*
 646  646                           * last rotation is recorded as argument to -P,
 647  647                           * but if logname isn't the same as log file name
 648  648                           * then the timestamp would be recorded on a
 649  649                           * separate line in the conf file.  so if we
 650  650                           * haven't seen a -P already, we check to see if
 651  651                           * it is part of a specific entry for the log
 652  652                           * file name.  this handles the case where the
 653  653                           * logname is "apache", it supplies a log file
 654      -                         * name like "/var/apache/logs/[a-z]*_log",
 655      -                         * which expands to multiple file names.  if one
 656      -                         * of the file names is "/var/apache/logs/access_log"
 657      -                         * the the -P will be attached to a line with that
      654 +                         * name like "/var/apache2/2.2/logs/[a-z]*_log",
      655 +                         * which expands to multiple file names.  if one of
      656 +                         * the file names is "/var/apache2/2.2/logs/access_log"
      657 +                         * then the -P will be attached to a line with that
 658  658                           * logname in the conf file.
 659  659                           */
 660  660                          if (opts_count(opts, "P")) {
 661  661                                  off_t last = opts_optarg_int(opts, "P");
 662  662  
 663  663                                  /* return if not enough time has passed */
 664  664                                  if (Now - last < when)
 665  665                                          return (B_TRUE);
 666  666                          } else if ((cfopts = conf_opts(fname)) != NULL &&
 667  667                              opts_count(cfopts, "P")) {
↓ open down ↓ 508 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX