From 080d251af88c3fcfcd83ba58773795208bd43c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= Date: Tue, 4 Dec 2012 10:54:05 +0100 Subject: [PATCH] ntlm_auth(1): fix format and make examples visible (bug #9569) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "" is no child of "". So these examples were not visible. Using a varlist instead may be not the best way but it does look nice. Signed-off-by: Björn Baumbach Reviewed-by: Michael Adam Reviewed-by: Volker Lendecke (cherry picked from commit cabc89a1e72fc95300d4b6f8d480a7d666221b8b) --- docs-xml/manpages/ntlm_auth.1.xml | 195 +++++++++++++++++++++----------------- 1 file changed, 108 insertions(+), 87 deletions(-) diff --git a/docs-xml/manpages/ntlm_auth.1.xml b/docs-xml/manpages/ntlm_auth.1.xml index 8bd77bd..619e713 100644 --- a/docs-xml/manpages/ntlm_auth.1.xml +++ b/docs-xml/manpages/ntlm_auth.1.xml @@ -160,111 +160,132 @@ external program to the helper are: - Username - - The username, expected to be in - Samba's . - - - Username: bob - Username:: Ym9i - + Username + The username, expected to be in + Samba's . + + + Examples: + Username: bob + Username:: Ym9i + + + - NT-Domain - The user's domain, expected to be in - Samba's . - - - NT-Domain: WORKGROUP - NT-Domain:: V09SS0dST1VQ - + NT-Domain + The user's domain, expected to be in + Samba's . + + + + Examples: + NT-Domain: WORKGROUP + NT-Domain:: V09SS0dST1VQ + + + - Full-Username - The fully qualified username, expected to be in - Samba's and qualified with the - . - - - Full-Username: WORKGROUP\bob - Full-Username:: V09SS0dST1VQYm9i - + Full-Username + The fully qualified username, expected to be + in Samba's and qualified + with the . + + Examples: + Full-Username: WORKGROUP\bob + Full-Username:: V09SS0dST1VQYm9i + + + - LANMAN-Challenge - - The 8 byte LANMAN Challenge value, - generated randomly by the server, or (in cases such as - MSCHAPv2) generated in some way by both the server and - the client. - - LANMAN-Challenge: 0102030405060708 - + LANMAN-Challenge + The 8 byte LANMAN Challenge + value, generated randomly by the server, or (in cases such + as MSCHAPv2) generated in some way by both the server and + the client. + + Examples: + LANMAN-Challenge: 0102030405060708 + + + - LANMAN-Response - - The 24 byte LANMAN Response value, - calculated from the user's password and the supplied - LANMAN Challenge. Typically, this - is provided over the network by a client wishing to authenticate. - - LANMAN-Response: 0102030405060708090A0B0C0D0E0F101112131415161718 - - + LANMAN-Response + The 24 byte LANMAN Response value, + calculated from the user's password and the supplied + LANMAN Challenge. Typically, this + is provided over the network by a client wishing to authenticate. + + + Examples: + LANMAN-Response: 0102030405060708090A0B0C0D0E0F101112131415161718 + + + - NT-Response - The >= 24 byte NT Response - calculated from the user's password and the supplied - LANMAN Challenge. Typically, this is - provided over the network by a client wishing to authenticate. - - NT-Response: 0102030405060708090A0B0C0D0E0F101112131415161718 - - + NT-Response + The >= 24 byte NT Response + calculated from the user's password and the supplied + LANMAN Challenge. Typically, this is + provided over the network by a client wishing to authenticate. + + + Examples: + NT-Response: 0102030405060708090A0B0C0D0E0F10111213141516171 + + + - Password - The user's password. This would be - provided by a network client, if the helper is being - used in a legacy situation that exposes plaintext - passwords in this way. - - Password: samba2 - Password:: c2FtYmEy - - + Password + The user's password. This would be + provided by a network client, if the helper is being + used in a legacy situation that exposes plaintext + passwords in this way. + + Examples: + Password: samba2 + Password:: c2FtYmEy + + + - Request-User-Session-Key - Upon successful authenticaiton, return - the user session key associated with the login. - - Request-User-Session-Key: Yes - - + Request-User-Session-Key + Upon successful authenticaiton, return + the user session key associated with the login. + + Examples: + Request-User-Session-Key: Yes + + + - Request-LanMan-Session-Key - Upon successful authenticaiton, return - the LANMAN session key associated with the login. - - Request-LanMan-Session-Key: Yes - - - - Implementers should take care to base64 encode - any data (such as usernames/passwords) that may contain malicous user data, such as - a newline. They may also need to decode strings from - the helper, which likewise may have been base64 encoded. - - + Request-LanMan-Session-Key + Upon successful authenticaiton, return + the LANMAN session key associated with the login. + + + Examples: + Request-LanMan-Session-Key: Yes + + + + + - - + + Implementers should take care to base64 encode + any data (such as usernames/passwords) that may contain malicous user data, such as + a newline. They may also need to decode strings from + the helper, which likewise may have been base64 encoded. + -- 1.7.12.4