From: Jeff Trawick <trawick@apache.org>
Date: Wed, 12 Apr 2006 01:58:08 +0000 (+0000)
Subject: If we don't have a prototype for crypt() we shouldn't
X-Git-Tag: 2.3.0~2457
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eb56e278685bd7db177daebdcad8ddde908831e;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/support/htdbm.c b/support/htdbm.c
index 84ab8f07e9a..07057e77309 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 588c892ed1e..19ad32b9518 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
     }