Print this page
2837 - remove print/lp* from gate and use CUPS from userland

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