cvs commit: apache-1.3/src/support htpasswd.c

[marc]

marc        98/03/17 16:58:35

  Modified:    src/support htpasswd.c
  Log:
  Why should we include sys/signal.h?  That is bogus.
  
  Also, explicitly cast crypt() return to char*.  We should include the
  right header file (ie. crypt.h), but that is painful right now.
  
  These both follow existing practice in other parts of the code.
  
  Revision  Changes    Path
  1.13      +1 -5      apache-1.3/src/support/htpasswd.c
  
  Index: htpasswd.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/support/htpasswd.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- htpasswd.c        1998/03/13 21:52:30     1.12
  +++ htpasswd.c        1998/03/18 00:58:34     1.13
  @@ -13,11 +13,7 @@
   #include <sys/types.h>
   #include <stdio.h>
   #include <string.h>
  -#ifdef MPE
   #include <signal.h>
  -#else
  -#include <sys/signal.h>
  -#endif
   #include <stdlib.h>
   #include <time.h>
   #include <unistd.h>
  @@ -134,7 +130,7 @@
       (void) srand((int) time((time_t *) NULL));
       to64(&salt[0], rand(), 2);
       salt[2] = '\0';
  -    cpw = crypt(pw, salt);
  +    cpw = (char *)crypt(pw, salt);
       free(pw);
       fprintf(f, "%s:%s\n", user, cpw);
   }