summaryrefslogtreecommitdiffstats
path: root/support
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2006-04-12 03:58:08 +0200
committerJeff Trawick <trawick@apache.org>2006-04-12 03:58:08 +0200
commit7eb56e278685bd7db177daebdcad8ddde908831e (patch)
tree90e781d4da5477722369aba7cdeca852d7f09060 /support
parentThe crypt() prototype is in <unistd.h> instead of <crypt.h> (diff)
downloadapache2-7eb56e278685bd7db177daebdcad8ddde908831e.tar.xz
apache2-7eb56e278685bd7db177daebdcad8ddde908831e.zip
If we don't have a prototype for crypt() we shouldn't
be calling it. Casting to the desired pointer return type hides the truncation of the return value when sizeof(ptr) > sizeof(int) and no prototype was included. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393365 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support')
-rw-r--r--support/htdbm.c2
-rw-r--r--support/htpasswd.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/support/htdbm.c b/support/htdbm.c
index 84ab8f07e9..07057e7730 100644
--- a/support/htdbm.c
+++ b/support/htdbm.c
@@ -321,7 +321,7 @@ static apr_status_t htdbm_make(htdbm_t *htdbm)
(void) srand((int) time((time_t *) NULL));
to64(&salt[0], rand(), 8);
salt[8] = '\0';
- apr_cpystrn(cpw, (char *)crypt(htdbm->userpass, salt), sizeof(cpw) - 1);
+ apr_cpystrn(cpw, crypt(htdbm->userpass, salt), sizeof(cpw) - 1);
fprintf(stderr, "CRYPT is now deprecated, use MD5 instead!\n");
#endif
default:
diff --git a/support/htpasswd.c b/support/htpasswd.c
index 588c892ed1..19ad32b951 100644
--- a/support/htpasswd.c
+++ b/support/htpasswd.c
@@ -182,7 +182,7 @@ static int mkrecord(char *user, char *record, apr_size_t rlen, char *passwd,
to64(&salt[0], rand(), 8);
salt[8] = '\0';
- apr_cpystrn(cpw, (char *)crypt(pw, salt), sizeof(cpw) - 1);
+ apr_cpystrn(cpw, crypt(pw, salt), sizeof(cpw) - 1);
break;
#endif
}