Commit Graph

38 Commits

Author SHA1 Message Date
93d536555a htdbm, htpasswd: print error message if out of memory
PR: 54345


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1425775 13f79535-47bb-0310-9956-ffa450edef68
2012-12-25 21:16:17 +00:00
93bcb9c25f 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420644 13f79535-47bb-0310-9956-ffa450edef68
2012-12-12 12:34:55 +00:00
566312f891 Optionally read passwords from stdin
PR: 40243
Submitted by: Adomas Paltanavicius <adomas paltanavicius gmail com>, sf


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1395256 13f79535-47bb-0310-9956-ffa450edef68
2012-10-07 09:10:14 +00:00
c2eb43db55 add support for bcrypt
PR: 49288


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1395255 13f79535-47bb-0310-9956-ffa450edef68
2012-10-07 09:06:10 +00:00
7d8882b4b4 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().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1395253 13f79535-47bb-0310-9956-ffa450edef68
2012-10-07 09:02:19 +00:00
658147f2d2 * support/htpasswd.c (mkrecord): Handle crypt() failure.
* support/htdbm.c (htdbm_make): Handle crypt() failure.

Submitted by: Paul Wouters <pwouters redhat.com>, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1346905 13f79535-47bb-0310-9956-ffa450edef68
2012-06-06 14:20:27 +00:00
61a0413706 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1102124 13f79535-47bb-0310-9956-ffa450edef68
2011-05-11 22:51:46 +00:00
f1dc8fcb39 * support/htdbm.c (htdbm_list): Fix compiler warning on x86_64.
(the field width must always be passed as an int if using "%.*")


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@814792 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 19:24:51 +00:00
2006220dec 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@814781 13f79535-47bb-0310-9956-ffa450edef68
2009-09-14 19:08:22 +00:00
0e4810f900 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@797563 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 17:15:29 +00:00
cb8a82faed remove TPF support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758936 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 00:05:18 +00:00
f0d8753492 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
2007-04-09 19:49:59 +00:00
de659cbed0 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:33:53 +00:00
dd95d7c37c Update the copyright year in all .c, .h and .xml files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:11:27 +00:00
7eb56e2786 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
2006-04-12 01:58:08 +00:00
6bc545dd7b 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().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393364 13f79535-47bb-0310-9956-ffa450edef68
2006-04-12 01:55:11 +00:00
fb17956642 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()).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@392944 13f79535-47bb-0310-9956-ffa450edef68
2006-04-10 13:31:14 +00:00
5061d9fa92 No functional Change: Removing trailing whitespace. This also
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:11:44 +00:00
e077e6efc9 Fix htdbm password validation for records which included comments.
Submitted by: Eric Covener <covener gmail.com>
Reviewed by:  trawick



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@201455 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 20:45:17 +00:00
4c242849fc * support/htdbm.c (main): Fix (valid) variable "may be used
uninitialized" warning with gcc 4.0.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190611 13f79535-47bb-0310-9956-ffa450edef68
2005-06-14 15:19:32 +00:00
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
d2e2c4e584 * 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104548 13f79535-47bb-0310-9956-ffa450edef68
2004-08-11 14:25:30 +00:00
a22426c699 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)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104078 13f79535-47bb-0310-9956-ffa450edef68
2004-06-29 13:33:24 +00:00
65c9f17999 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>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103005 13f79535-47bb-0310-9956-ffa450edef68
2004-03-17 01:03:27 +00:00
eeb57c17ad fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102619 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:40:53 +00:00
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +00:00
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +00:00
1e1a131b4e 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101946 13f79535-47bb-0310-9956-ffa450edef68
2003-12-02 09:41:45 +00:00
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
01ba81a1f4 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?)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94633 13f79535-47bb-0310-9956-ffa450edef68
2002-04-13 19:35:18 +00:00
845cbfd508 Update our copyright for this year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:48:07 +00:00
cd94c05f4b one step closer to happiness on ebcdic boxes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93482 13f79535-47bb-0310-9956-ffa450edef68
2002-02-18 18:19:06 +00:00
37bdc63e3b clean up a bunch of warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92931 13f79535-47bb-0310-9956-ffa450edef68
2002-01-19 12:16:48 +00:00
01efb5bafa As long as the spelling police are on the prowl, I figured I might as well
pitch in.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92898 13f79535-47bb-0310-9956-ffa450edef68
2002-01-18 00:14:43 +00:00
18caba24d8 allow htdbm to work with multiple DBM types by using a new option
'-T'

ps..
why doesn't this program use apr_getopt??


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92591 13f79535-47bb-0310-9956-ffa450edef68
2001-12-24 07:05:19 +00:00
dbebac4098 Thanks for the catch, Mr. Woolley, I left an out-of-place close paren.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91772 13f79535-47bb-0310-9956-ffa450edef68
2001-11-06 21:11:45 +00:00
d101bfbfe9 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_


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91768 13f79535-47bb-0310-9956-ffa450edef68
2001-11-06 16:58:59 +00:00
976679aa90 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91767 13f79535-47bb-0310-9956-ffa450edef68
2001-11-06 16:52:59 +00:00