1
0
mirror of https://github.com/apache/httpd.git synced 2025-06-04 21:42:15 +03:00

75 Commits

Author SHA1 Message Date
Thom May
a1d5470e1e htpasswd.c: various cleanups and move to using apr_temp_dir_get()
Submitted by: Guenter Knauf
Reviewed by: Thom May


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102950 13f79535-47bb-0310-9956-ffa450edef68
2004-03-13 22:18:19 +00:00
André Malo
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
André Malo
c0dcb76491 fix copyright dates according the first cehck in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102592 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 14:14:53 +00:00
André Malo
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
André Malo
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
Thom May
28fa358552 Add a delete flag to htpasswd.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99828 13f79535-47bb-0310-9956-ffa450edef68
2003-05-14 19:23:30 +00:00
André Malo
abe287956a (grabbed from archive)
Check the processed file on validity. If a line is not empty
and not a comment, it must contain at least one colon. Otherwise exit
with error code 7.

Submitted by: Thom May <thom@planetarytramp.net> (on 2002-07-02)
              Kris Verbeeck <Kris.Verbeeck@ubizen.com> (on 2002-10-22)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99771 13f79535-47bb-0310-9956-ffa450edef68
2003-05-13 03:40:29 +00:00
André Malo
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
Jeff Trawick
3cf507350f template parameter passed to apr_file_mktemp() must be modifiable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97142 13f79535-47bb-0310-9956-ffa450edef68
2002-10-08 11:21:25 +00:00
Ryan Bloom
edd2f99905 We can't just create the temporary file in the current directory. If that
directory isn't writable, htpasswd won't work.  This adds a function
whose responsibility it is to find a valid directory for temporary files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97136 13f79535-47bb-0310-9956-ffa450edef68
2002-10-08 01:15:46 +00:00
Justin Erenkrantz
63be389b7b Revert r1.57 and r1.58 per Will Rowe's veto.
(I intend to add this back in if/when mod_authn_file can support the
{algo} password semantics, but we can't do a release with this code in
place.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96817 13f79535-47bb-0310-9956-ffa450edef68
2002-09-14 23:05:42 +00:00
Brian Pane
eac90b66ed truncate existing file if "-c" is used
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96811 13f79535-47bb-0310-9956-ffa450edef68
2002-09-14 17:49:37 +00:00
William A. Rowe Jr
5272c10e4f Move another non-exists test into the non-existing tests block, and
clean up the comments a bit more.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96810 13f79535-47bb-0310-9956-ffa450edef68
2002-09-14 16:43:24 +00:00
Brian Pane
f931893a12 More code cleanup: added some error checks and removed unused functions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96806 13f79535-47bb-0310-9956-ffa450edef68
2002-09-14 08:44:26 +00:00
Brian Pane
40e3215999 remove single-byte file reads
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96805 13f79535-47bb-0310-9956-ffa450edef68
2002-09-14 08:03:19 +00:00
Brian Pane
4de8023f20 cleaned up the file access checking
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96804 13f79535-47bb-0310-9956-ffa450edef68
2002-09-14 06:53:40 +00:00
William A. Rowe Jr
ae2b699a9f 1. Eliminate perror(), it's not portable.
2. Restructure bit tests, ! is a logical, not a bitwise negation.

  3. Clean up just a bit of other ! syntax fooness and excess parens.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96802 13f79535-47bb-0310-9956-ffa450edef68
2002-09-14 03:40:11 +00:00
Bradley Nicholes
5cd4500b31 Avoid a compiler error on NetWare
Submitted by: Jean-Jacques Clar (jjclar@novell.com)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96753 13f79535-47bb-0310-9956-ffa450edef68
2002-09-10 22:32:46 +00:00
Justin Erenkrantz
3283ae992d Add ability to htpasswd (via -5) to produce non-obfuscated MD5 hashes.
mod_auth_digest's passwords can not be obfuscated by the APR magic
sequence (as we don't call apr_password_validate on them), therefore we
need a tool to produce true MD5 hex hashes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96737 13f79535-47bb-0310-9956-ffa450edef68
2002-09-10 03:00:50 +00:00
Justin Erenkrantz
6c25fe06ea Style fixes. (long lines)
(Justin tweaked one character in this patch.)

Submitted by:	Thom May <thom@planetarytramp.net>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96440 13f79535-47bb-0310-9956-ffa450edef68
2002-08-19 07:28:18 +00:00
Victor J. Orlikowski
d982829aa1 Continue the Bill Rowe apr_size_t crusade.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95993 13f79535-47bb-0310-9956-ffa450edef68
2002-07-10 06:01:14 +00:00
William A. Rowe Jr
c94820f3a5 We obviously have no idea if this code is right. We can't close unopened
files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95981 13f79535-47bb-0310-9956-ffa450edef68
2002-07-08 20:25:28 +00:00
Justin Erenkrantz
7e0e99f40b Remove unused variable 'str'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95945 13f79535-47bb-0310-9956-ffa450edef68
2002-07-02 22:31:05 +00:00
Justin Erenkrantz
8474c2fac5 Use the apr_file_copy function rather than doing a system call to copy
the file.

Submitted by:	Thom May <thom@planetarytramp.net>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95944 13f79535-47bb-0310-9956-ffa450edef68
2002-07-02 22:19:13 +00:00
Justin Erenkrantz
1977fb4db5 found wasn't getting incremented when we update an exisiting record, thus
an additional new record was getting created.

Submitted by:	Thom May <thom@planetarytramp.net>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95943 13f79535-47bb-0310-9956-ffa450edef68
2002-07-02 22:15:39 +00:00
Ryan Bloom
6f5f68b58f htpasswd needs to add a newline at the end of each record.
PR:	10422
Submitted by:	Thom May [thom@planetarytramp.net]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95939 13f79535-47bb-0310-9956-ffa450edef68
2002-07-02 19:48:38 +00:00
Cliff Woolley
8011872d58 Grrrr. Fix the htpasswd -c -n logic bug *the right way* this time. :(
PR: 9989


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95806 13f79535-47bb-0310-9956-ffa450edef68
2002-06-19 17:31:19 +00:00
Cliff Woolley
b04c69cff0 * clear up a warning that NOFILE was redefined on HP/UX.
* fix a logic bug ... a binary and that should have been a binary or.
   (that one was just reporting a commandline args error, noncritical)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95753 13f79535-47bb-0310-9956-ffa450edef68
2002-06-18 02:58:36 +00:00
Roy T. Fielding
be3d2dc89b squash warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95744 13f79535-47bb-0310-9956-ffa450edef68
2002-06-18 00:33:26 +00:00
Cliff Woolley
770c87441e Get this to work on win32 :(
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95723 13f79535-47bb-0310-9956-ffa450edef68
2002-06-17 14:51:17 +00:00
Ryan Bloom
0fbe806f40 Finish the htpasswd port to APR. This brings the file checking code to
APR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95713 13f79535-47bb-0310-9956-ffa450edef68
2002-06-16 15:52:15 +00:00
Ryan Bloom
9149dd6fe1 First pass at cleaning up htpasswd. This removes the tmpnam call in
favor of apr_file_mktemp.  This also APR-izes most of the code.  The
file access code is still not using APR, but that will be fixed next.

I also re-organized some of the code to make it a little cleaner, and
to use functions where I could.

PR:	7764


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95712 13f79535-47bb-0310-9956-ffa450edef68
2002-06-16 15:14:41 +00:00
William A. Rowe Jr
89267e317c Prepare for Thom's real patch... this is a detabify only
[passes cvs diff -w with no changes.]

Submitted by:  Thom May <thom@planetarytramp.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95143 13f79535-47bb-0310-9956-ffa450edef68
2002-05-16 19:57:11 +00:00
Jeff Trawick
0f0550b08c avoid colliding with getline() as defined by glibc
(it breaks if you need to turn on _GNU_SOURCE)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95035 13f79535-47bb-0310-9956-ffa450edef68
2002-05-10 18:20:29 +00:00
William A. Rowe Jr
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
Roy T. Fielding
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
Bradley Nicholes
00053faa90 Updates to allow the utilities to run on NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92919 13f79535-47bb-0310-9956-ffa450edef68
2002-01-18 23:28:20 +00:00
William A. Rowe Jr
9b3864b084 APR_FINFO_TYPE is all we really needed here.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89642 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 19:19:39 +00:00
William A. Rowe Jr
1adf783132 A pool is a REQUIRED ARGUMENT, never optional (NULL).
This is why Mladen observed that htpasswd was still broken.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89641 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 19:13:44 +00:00
David Reid
c200a5ea11 Use a better format type for sizeof. This stops a few compiler
warnings.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88319 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 15:27:07 +00:00
Roy T. Fielding
381f88d56a Update copyright to 2001
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88184 13f79535-47bb-0310-9956-ffa450edef68
2001-02-16 04:26:53 +00:00
William A. Rowe Jr
ab06ea0b6f Still lots to apr'ize here.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88095 13f79535-47bb-0310-9956-ffa450edef68
2001-02-11 21:00:04 +00:00
Doug MacEachern
88d3406f9a renaming various functions for consistency sake
see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88019 13f79535-47bb-0310-9956-ffa450edef68
2001-02-08 07:45:33 +00:00
William A. Rowe Jr
cd1ef027c2 The changes required for the APR_FINFO_wanted argument to
apr_stat/lstat/getfileinfo.  These are -NOT- optimal, they
  are simply the required changes to get the server working.
  The size of the patch is a warning about how we need to
  really look at what we are trying to accomplish with all
  of these stat/lstat calls.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87760 13f79535-47bb-0310-9956-ffa450edef68
2001-01-20 21:42:23 +00:00
William A. Rowe Jr
59bbd68bec The big change. This is part 3 of the apr-util symbols rename, please
see the first commit of srclib/apr-util/include (cvs apr-util/include)
  for the quick glance at symbols changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87731 13f79535-47bb-0310-9956-ffa450edef68
2001-01-19 07:04:36 +00:00
Ryan Bloom
00ec6af4a5 Cleanups so that the support programs build cleanly. The Win32 values
need to be sanity checked.
Submitted by:	Cliff Woolley <cliffwoolley@yahoo.com>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87506 13f79535-47bb-0310-9956-ffa450edef68
2000-12-22 00:02:52 +00:00
William A. Rowe Jr
c2239e78bd All the supports now build on APR (+APRUTIL), no reliance on httpd.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87501 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 21:00:45 +00:00
William A. Rowe Jr
a459c026e1 This should build entirely with apr/aprutil support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87499 13f79535-47bb-0310-9956-ffa450edef68
2000-12-21 20:32:33 +00:00
Jeff Trawick
351725e726 Switch to the APR-provided APR_CHARSET_EBCDIC feature test macro.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87460 13f79535-47bb-0310-9956-ffa450edef68
2000-12-20 16:44:01 +00:00
Ryan Bloom
b5440c348a Force all Apache functions to be linked into the executable, whether they
are used or not.  This uses the same mechanism that is used for APR
and APR-util.  This may not be the correct solution, but it works, and that
is what I really care about.  This also renames CHARSET_EBCDIC to
AP_CHARSET_EBCDIC.  This is for namespace correctness, but it also makes
the exports script a bit easier.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87424 13f79535-47bb-0310-9956-ffa450edef68
2000-12-19 17:05:48 +00:00