[BACK]Return to skeyaudit.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / skeyaudit

Diff for /src/usr.bin/skeyaudit/skeyaudit.c between version 1.16 and 1.17

version 1.16, 2003/04/28 20:58:35 version 1.17, 2003/05/02 20:10:46
Line 1 
Line 1 
 /*      $OpenBSD$       */  /*      $OpenBSD$       */
   
 /*  /*
  * Copyright (c) 1997, 2000 Todd C. Miller <Todd.Miller@courtesan.com>   * Copyright (c) 1997, 2000, 2003 Todd C. Miller <Todd.Miller@courtesan.com>
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 25 
Line 25 
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR   * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF   * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.   * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    *
    * Sponsored in part by the Defense Advanced Research Projects
    * Agency (DARPA) and Air Force Research Laboratory, Air Force
    * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  */   */
   
 #include <sys/param.h>  #include <sys/param.h>
Line 32 
Line 36 
   
 #include <err.h>  #include <err.h>
 #include <errno.h>  #include <errno.h>
   #include <fcntl.h>
 #include <limits.h>  #include <limits.h>
 #include <login_cap.h>  #include <login_cap.h>
 #include <paths.h>  #include <paths.h>
Line 54 
Line 59 
         char *name;          char *name;
         int ch, left, aflag, iflag, limit;          int ch, left, aflag, iflag, limit;
   
         left = aflag = iflag = 0;          aflag = iflag = 0;
         limit = 12;          limit = 12;
         while ((ch = getopt(argc, argv, "ail:")) != -1)          while ((ch = getopt(argc, argv, "ail:")) != -1)
                 switch(ch) {                  switch(ch) {
Line 79 
Line 84 
                         usage();                          usage();
         }          }
   
           /*
            * Make sure STDIN_FILENO, STDOUT_FILENO, and STDERR_FILENO are open.
            * If not, open /dev/null in their place or bail.
            * If we are in interactive mode, STDOUT_FILENO *must* be open.
            */
           for (ch = STDIN_FILENO; ch <= STDERR_FILENO; ch++) {
                   if (fcntl(ch, F_GETFL, &left) == -1 && errno == EBADF) {
                           if (ch == STDOUT_FILENO && iflag)
                                   exit(1);        /* need stdout for -i */
                           if (open(_PATH_DEVNULL, O_RDWR, 0644) == -1)
                                   exit(1);        /* just bail */
                   }
           }
   
         if (argc - optind > 0)          if (argc - optind > 0)
                 usage();                  usage();
   
         /* Need key.keyfile zero'd at the very least */          /* Need key.keyfile zero'd at the very least */
         (void)memset(&key, 0, sizeof(key));          (void)memset(&key, 0, sizeof(key));
   
           left = 0;
         if (aflag) {          if (aflag) {
                 while ((ch = skeygetnext(&key)) == 0) {                  while ((ch = skeygetnext(&key)) == 0) {
                         left = key.n - 1;                          left = key.n - 1;
Line 92 
Line 112 
                                 continue;                                  continue;
                         if (left >= limit)                          if (left >= limit)
                                 continue;                                  continue;
                           (void)fclose(key.keyfile);
                           key.keyfile = NULL;
                         notify(pw, left, iflag);                          notify(pw, left, iflag);
                 }                  }
                 if (ch == -1)                  if (ch == -1)
Line 160 
Line 182 
         (void)fprintf(out,          (void)fprintf(out,
 "Type \"skeyinit -s\" to reinitialize your sequence number.\n\n");  "Type \"skeyinit -s\" to reinitialize your sequence number.\n\n");
   
         (void)fclose(out);          if (!interactive) {
         if (!interactive)                  (void)fclose(out);
                 (void)waitpid(pid, NULL, 0);                  (void)waitpid(pid, NULL, 0);
           }
 }  }
   
 FILE *  FILE *
Legend:
Removed from v.1.16  
changed lines
  Added in v.1.17