You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2007/04/04 20:37:31 UTC
svn commit: r525571 - /httpd/httpd/trunk/support/htpasswd.c
Author: trawick
Date: Wed Apr 4 11:37:30 2007
New Revision: 525571
URL: http://svn.apache.org/viewvc?view=rev&rev=525571
Log:
Make the hardcoded checks for platforms-without-crypt consistent.
This apparently fixes some oddities on TPF.
Submitted by: David Jones <oscaremma gmail.com>
Reviewed by: wrowe, trawick
Modified:
httpd/httpd/trunk/support/htpasswd.c
Modified: httpd/httpd/trunk/support/htpasswd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/htpasswd.c?view=diff&rev=525571&r1=525570&r2=525571
==============================================================================
--- httpd/httpd/trunk/support/htpasswd.c (original)
+++ httpd/httpd/trunk/support/htpasswd.c Wed Apr 4 11:37:30 2007
@@ -175,7 +175,7 @@
apr_cpystrn(cpw,pw,sizeof(cpw));
break;
-#if !(defined(WIN32) || defined(NETWARE))
+#if (!(defined(WIN32) || defined(TPF) || defined(NETWARE)))
case ALG_CRYPT:
default:
(void) srand((int) time((time_t *) NULL));
@@ -435,7 +435,7 @@
check_args(pool, argc, argv, &alg, &mask, &user, &pwfilename, &password);
-#if defined(WIN32) || defined(NETWARE)
+#if defined(WIN32) || defined(TPF) || defined(NETWARE)
if (alg == ALG_CRYPT) {
alg = ALG_APMD5;
apr_file_printf(errfile, "Automatically using MD5 format." NL);