projects / people / mlorenz / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 6edc270a MF |
1 | ------------------------------------------------------------ |
| 2 | revno: 14177 | |
| 3 | revision-id: squid3@treenet.co.nz-20170701073754-4x1i6p5s1gzk73co | |
| 4 | parent: squid3@treenet.co.nz-20170701073514-uzowexcysowqostf | |
| 5 | committer: Amos Jeffries <squid3@treenet.co.nz> | |
| 6 | branch nick: 3.5 | |
| 7 | timestamp: Sat 2017-07-01 19:37:54 +1200 | |
| 8 | message: | |
| 9 | basic_ncsa_auth: fix hash listing wrap in man(8) page | |
| 10 | ||
| 11 | '*' list bullet points must be indented with whitespace. | |
| 12 | If they are not the list is treated as a single wrapped paragraph. | |
| 13 | ------------------------------------------------------------ | |
| 14 | # Bazaar merge directive format 2 (Bazaar 0.90) | |
| 15 | # revision_id: squid3@treenet.co.nz-20170701073754-4x1i6p5s1gzk73co | |
| 16 | # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 | |
| 17 | # testament_sha1: ffd783ab19a438c56affcdc6c1d106fa00403f4f | |
| 18 | # timestamp: 2017-07-01 07:45:09 +0000 | |
| 19 | # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 | |
| 20 | # base_revision_id: squid3@treenet.co.nz-20170701073514-\ | |
| 21 | # uzowexcysowqostf | |
| 22 | # | |
| 23 | # Begin patch | |
| 24 | === modified file 'helpers/basic_auth/NCSA/basic_ncsa_auth.8' | |
| 25 | --- helpers/basic_auth/NCSA/basic_ncsa_auth.8 2017-01-01 00:16:45 +0000 | |
| 26 | +++ helpers/basic_auth/NCSA/basic_ncsa_auth.8 2017-07-01 07:37:54 +0000 | |
| 27 | @@ -18,15 +18,15 @@ | |
| 28 | .PP | |
| 29 | This authenticator accepts: | |
| 30 | .BR | |
| 31 | -* Blowfish - for passwords 72 characters or less in length | |
| 32 | -.BR | |
| 33 | -* SHA256 - with salting and magic strings | |
| 34 | -.BR | |
| 35 | -* SHA512 - with salting and magic strings | |
| 36 | -.BR | |
| 37 | -* MD5 - with optional salt and magic strings | |
| 38 | -.BR | |
| 39 | -* DES - for passwords 8 characters or less in length | |
| 40 | + * Blowfish \- for passwords 72 characters or less in length. | |
| 41 | +.BR | |
| 42 | + * SHA256 \- with salting and magic strings. | |
| 43 | +.BR | |
| 44 | + * SHA512 \- with salting and magic strings. | |
| 45 | +.BR | |
| 46 | + * MD5 \- with optional salt and magic strings. | |
| 47 | +.BR | |
| 48 | + * DES \- for passwords 8 characters or less in length. | |
| 49 | . | |
| 50 | NOTE: Blowfish and SHA algorithms require system-specific support. | |
| 51 | . | |
| 52 |