Fix command line parsing. This was introduced in r1395253 when refactoring the code. Untested PR 55264 <jrhett netconsonance com>

htdbm, htpasswd: print error message if out of memory PR: 54345

htdbm: - Add vxl to getopt - Remove "-C" from usage for -x and -l - Add space between -C and "cost" - Usage reorder and sync with htpasswd htpasswd: - Usage reorder and sync with htdbm

Optionally read passwords from stdin PR: 40243 Submitted by: Adomas Paltanavicius <adomas paltanavicius gmail com>, sf

add support for bcrypt PR: 49288

Start refactoring of htpasswd and htdbm - Move many common code parts into separate source file. This adds some of htpasswd's recent improvements to htdbm. - Rework salt generation to use the full 48bit of entropy for MD5 Previously, it would only generate 2^32 different salts on a given platform. - Use apr_getopt().

* support/htpasswd.c (mkrecord): Handle crypt() failure. * support/htdbm.c (htdbm_make): Handle crypt() failure. Submitted by: Paul Wouters <pwouters redhat.com>, jorton

Use APR_STATUS_IS_... in some more cases. While this is not strictly necessary everywhere, it makes it much easier to find the problematic cases.

* support/htdbm.c (htdbm_list): Fix compiler warning on x86_64. (the field width must always be passed as an int if using "%.*")

htdbm: don't allocate more memory for every record we dump. Thanks to Jeff Trawick for flagging this. Also ensure a space before all dumped comments.

htdbm: Fix possible buffer overflow if dbm database has very long values. PR 30586 [Dan Poirier] PR 30586 Reported by: Ulf Harnhammar, Swedish IT Incident Centre

remove TPF support

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

update license header text

Update the copyright year in all .c, .h and .xml files

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.

The crypt() prototype is in <unistd.h> instead of <crypt.h> on HP-UX. We had no prototype for crypt() there. In 64-bit mode, a crash occurred because the pointer returned by crypt() was truncated before we passed the pointer to apr_cpystrn().

htdbm: Warn the user when adding a plaintext password on a platform where it wouldn't work with the server (i.e., anywhere that has crypt()).

No functional Change: Removing trailing whitespace. This also means that "blank" lines consisting of just spaces or tabs are now really blank lines

Fix htdbm password validation for records which included comments. Submitted by: Eric Covener <covener gmail.com> Reviewed by: trawick

* support/htdbm.c (main): Fix (valid) variable "may be used uninitialized" warning with gcc 4.0.

Update copyright year to 2005 and standardize on current copyright owner line.

* modules/ssl/ssl_engine_kernel.c (ssl_callback_SSLVerify_CRL), * server/log.c (ap_log_pid), * server/mpm/prefork/prefork.c (accept_mutex_on, accept_mutex_off), * support/htdbm.c (htdbm_list): Fix some non-literal format strings (warnings from gcc -Wformat-security). PR: 30585 Submitted by: Ulf Harnhammar (SITIC), Joe Orton

Use standardized names for ISO-8859-1, see http://www.iana.org/assignments/character-sets (Using the name iso8859-1 may still work, because it is aliased in apr-iconv/ccs/charset.aliases)

Add a terminate function that gets called on atexit() so that NetWare has the chance to pause the screen to view the output before the screen is destroyed. Submitted by: Guenter Knauf <eflash@gmx.net>

fix name of The Apache Software Foundation

apply Apache License, Version 2.0

update license to 2004.

If we have a comment, place in a ':' not a ';' (has this *ever* worked?) If -n is specified and we have a comment, print the comment out too.

finished that boring job: update license to 2003. Happy New Year! ;-))

Correct const'ness of argv in all support apps, and use the new apr_app_initialize over apr_initialize for win32, and other platforms that may wish to tweak 'apr-ized' application support (e.g. Netware?)

Update our copyright for this year.

one step closer to happiness on ebcdic boxes

clean up a bunch of warnings

As long as the spelling police are on the prowl, I figured I might as well pitch in.

allow htdbm to work with multiple DBM types by using a new option '-T' ps.. why doesn't this program use apr_getopt??

Thanks for the catch, Mr. Woolley, I left an out-of-place close paren.

Eliminate 'library'+'executable' cruft. Yes - this would be a dandy library at some point in the future (perhaps 2.1?) but for this moment, simplify. Also simplify over-decorated apu_htdbm_ prefixes to simply htdbm_

Submitted by: Mladen Turk <mturk@mappingsoft.com> htdbm provides a compiled interface to dbm authentication databases, using the compiled-in dbm manager and auth schema. Resolves the hassles of grabbing the appropriate cpan package for md5 and fixing the dbm engine for dbmmanage.pl.