diff options
| author | Jeff Trawick <trawick@apache.org> | 2007-04-09 21:49:59 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2007-04-09 21:49:59 +0200 |
| commit | f0d875349267ba23b3f93e0c674cc465d22aef98 (patch) | |
| tree | e3b36f8144bb212620ec3719ee2bc68014835c51 /support/htdbm.c | |
| parent | Correct behavior of HTTP request headers sent by ab in presence of -H command- (diff) | |
| download | apache2-f0d875349267ba23b3f93e0c674cc465d22aef98.tar.xz apache2-f0d875349267ba23b3f93e0c674cc465d22aef98.zip | |
htdbm: Enable crypt support on platforms with crypt() but not
<crypt.h>, such as z/OS.
We assume that the ancient code in htpasswd has it right --
all but Windows, TPF, and NetWare have crypt().
Submitted by: David Jones <oscaremma gmail.com>
Reviewed by: wrowe, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@526892 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support/htdbm.c')
| -rw-r--r-- | support/htdbm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/support/htdbm.c b/support/htdbm.c index dc9aa66604..aebc207ccc 100644 --- a/support/htdbm.c +++ b/support/htdbm.c @@ -69,7 +69,7 @@ #define ALG_APMD5 1 #define ALG_APSHA 2 -#if APR_HAVE_CRYPT_H +#if (!(defined(WIN32) || defined(TPF) || defined(NETWARE))) #define ALG_CRYPT 3 #endif @@ -311,12 +311,12 @@ static apr_status_t htdbm_make(htdbm_t *htdbm) case ALG_PLAIN: /* XXX this len limitation is not in sync with any HTTPd len. */ apr_cpystrn(cpw,htdbm->userpass,sizeof(cpw)); -#if APR_HAVE_CRYPT_H +#if (!(defined(WIN32) || defined(TPF) || defined(NETWARE))) fprintf(stderr, "Warning: Plain text passwords aren't supported by the " "server on this platform!\n"); #endif break; -#if APR_HAVE_CRYPT_H +#if (!(defined(WIN32) || defined(TPF) || defined(NETWARE))) case ALG_CRYPT: (void) srand((int) time((time_t *) NULL)); to64(&salt[0], rand(), 8); @@ -347,7 +347,7 @@ static apr_status_t htdbm_valid_username(htdbm_t *htdbm) static void htdbm_usage(void) { -#if APR_HAVE_CRYPT_H +#if (!(defined(WIN32) || defined(TPF) || defined(NETWARE))) #define CRYPT_OPTION "d" #else #define CRYPT_OPTION "" @@ -367,7 +367,7 @@ static void htdbm_usage(void) fprintf(stderr, " -c Create a new database.\n"); fprintf(stderr, " -n Don't update database; display results on stdout.\n"); fprintf(stderr, " -m Force MD5 encryption of the password (default).\n"); -#if APR_HAVE_CRYPT_H +#if (!(defined(WIN32) || defined(TPF) || defined(NETWARE))) fprintf(stderr, " -d Force CRYPT encryption of the password (now deprecated).\n"); #endif fprintf(stderr, " -p Do not encrypt the password (plaintext).\n"); @@ -474,7 +474,7 @@ int main(int argc, const char * const argv[]) case 's': h->alg = ALG_APSHA; break; -#if APR_HAVE_CRYPT_H +#if (!(defined(WIN32) || defined(TPF) || defined(NETWARE))) case 'd': h->alg = ALG_CRYPT; break; |