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

Diff for /src/usr.bin/skeyinit/skeyinit.c between version 1.33 and 1.34

version 1.33, 2002/05/16 17:54:34 version 1.34, 2002/05/17 00:55:54
Line 137 
Line 137 
                 usage(argv[0]);                  usage(argv[0]);
   
         /* Handle -C, -D, and -E */          /* Handle -C, -D, and -E */
         if (enable)          if (convert || enable) {
                 enable_db(enable);                  if (convert)
         if (convert)                          convert_db();
                 convert_db();                  else
                           enable_db(enable);
                   exit(0);
           }
   
         /* Check for optional user string. */          /* Check for optional user string. */
         if (argc == 1) {          if (argc == 1) {
Line 438 
Line 441 
                 if (chmod(_PATH_SKEYDIR, 0) != 0 && errno != ENOENT)                  if (chmod(_PATH_SKEYDIR, 0) != 0 && errno != ENOENT)
                         err(1, "can't chmod %s", _PATH_SKEYDIR);                          err(1, "can't chmod %s", _PATH_SKEYDIR);
         }          }
         exit(0);  
 }  }
   
 #define _PATH_SKEYKEYS  "/etc/skeykeys"  #define _PATH_SKEYKEYS  "/etc/skeykeys"
Line 457 
Line 459 
                 err(1, "can't open %s", _PATH_SKEYKEYS);                  err(1, "can't open %s", _PATH_SKEYKEYS);
         if (flock(fileno(keyfile), LOCK_EX) != 0)          if (flock(fileno(keyfile), LOCK_EX) != 0)
                 err(1, "can't lock %s", _PATH_SKEYKEYS);                  err(1, "can't lock %s", _PATH_SKEYKEYS);
         if (mkdir(_PATH_SKEYDIR, 01730) != 0 && errno != EEXIST)          enable_db(1);
                 err(1, "can't mkdir %s", _PATH_SKEYDIR);  
         if (chmod(_PATH_SKEYDIR, 01730) != 0)  
                 err(1, "can't chmod %s", _PATH_SKEYDIR);  
   
         /*          /*
          * Loop over each entry in _PATH_SKEYKEYS, creating a file           * Loop over each entry in _PATH_SKEYKEYS, creating a file
Line 511 
Line 510 
         printf("%s has been populated.  NOTE: %s has *not* been removed.\n"          printf("%s has been populated.  NOTE: %s has *not* been removed.\n"
             "It should be removed once you have verified that the new keys "              "It should be removed once you have verified that the new keys "
             "work.\n", _PATH_SKEYDIR, _PATH_SKEYKEYS);              "work.\n", _PATH_SKEYDIR, _PATH_SKEYKEYS);
         exit(0);  
 }  }
   
 #define TIMEOUT_MSG     "Timed out waiting for input.\n"  #define TIMEOUT_MSG     "Timed out waiting for input.\n"
Legend:
Removed from v.1.33  
changed lines
  Added in v.1.34