src/usr.bin/htpasswd/htpasswd.c - diff

Return to htpasswd.c CVS log

Up to [local] / src / usr.bin / htpasswd

-version 1.11, 2015/02/08 23:40:34
+version 1.12, 2015/10/07 06:44:01
 Line 47
 Line 47
 Line 47
  int
  main(int argc, char** argv)
  {
-         FILE *in, *out;
+         char salt[_PASSWORD_LEN], tmpl[sizeof("/tmp/htpasswd-XXXXXXXXXX")];
-         size_t linesize;
+         char hash[_PASSWORD_LEN], pass[1024], pass2[1024];
+         char *line = NULL, *login = NULL, *tok;
+         int c, fd, loginlen, batch = 0;
+         FILE *in = NULL, *out = NULL;
+         const char *file = NULL;
+         size_t linesize = 0;
          ssize_t linelen;
          mode_t old_umask;
-         int c, fd, loginlen, batch;
-         char hash[_PASSWORD_LEN], *line, *login, pass[1024], pass2[1024];
-         char salt[_PASSWORD_LEN], tmpl[sizeof("/tmp/htpasswd-XXXXXXXXXX")];
-         char *tok;
-         const char *file;
-         file = NULL;
+         if (tame("stdio rpath wpath cpath tmppath tty", NULL) == -1)
-         login = NULL;
+                 err(1, "tame");
-         in = NULL;
-         out = NULL;
-         line = NULL;
-         linesize = 0;
-         batch = 0;
          while ((c = getopt(argc, argv, "I")) != -1) {
                  switch (c) {