diff options
author | Jeff Trawick <trawick@apache.org> | 2007-04-04 18:37:30 +0000 |
---|---|---|
committer | Jeff Trawick <trawick@apache.org> | 2007-04-04 18:37:30 +0000 |
commit | 8e3ede58263ebb743a16fe76e930c7a44dbd7dc1 (patch) | |
tree | 5dbc73c6389735300b7e4a5e01e6b56ca39c57a4 /support/htpasswd.c | |
parent | 28645101f9c3eb02ad2c92289114611eba19b2db (diff) | |
download | httpd-8e3ede58263ebb743a16fe76e930c7a44dbd7dc1.tar.gz |
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@525571 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support/htpasswd.c')
-rw-r--r-- | support/htpasswd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/support/htpasswd.c b/support/htpasswd.c index 9468a0ce6a..bd7e203f8e 100644 --- a/support/htpasswd.c +++ b/support/htpasswd.c @@ -175,7 +175,7 @@ static int mkrecord(char *user, char *record, apr_size_t rlen, char *passwd, 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 @@ int main(int argc, const char * const argv[]) 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); |