From 941bb9bb6dfd1c2dfd01696b2169e0782158ad6d Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Wed, 28 Nov 2012 12:46:31 +0100 Subject: [PATCH] docs: Rename man ntlm_auth. Rename man ntlm_auth to ntlm_auth4. Karolin Reviewed-by: Andreas Schneider Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Wed Nov 28 20:41:48 CET 2012 on sn-devel-104 --- .../man/{ntlm_auth.1.xml => ntlm_auth4.1.xml} | 74 +++++++++++----------- source4/utils/wscript_build | 2 +- 2 files changed, 38 insertions(+), 38 deletions(-) rename source4/utils/man/{ntlm_auth.1.xml => ntlm_auth4.1.xml} (80%) diff --git a/source4/utils/man/ntlm_auth.1.xml b/source4/utils/man/ntlm_auth4.1.xml similarity index 80% rename from source4/utils/man/ntlm_auth.1.xml rename to source4/utils/man/ntlm_auth4.1.xml index 09a8961a91a..da187d720ef 100644 --- a/source4/utils/man/ntlm_auth.1.xml +++ b/source4/utils/man/ntlm_auth4.1.xml @@ -3,19 +3,19 @@ - ntlm_auth + ntlm_auth4 1 - ntlm_auth + ntlm_auth4 tool to allow external access to Winbind's NTLM authentication function - ntlm_auth + ntlm_auth4 -d debuglevel -l logdir -s <smb config file> @@ -28,10 +28,10 @@ This tool is part of the samba 7 suite. - ntlm_auth is a helper utility that authenticates + ntlm_auth4 is a helper utility that authenticates users using NT/LM authentication. It returns 0 if the users is authenticated - successfully and 1 if access was denied. ntlm_auth uses winbind to access - the user and authentication data for a domain. This utility + successfully and 1 if access was denied. ntlm_auth4 uses winbind to access + the user and authentication data for a domain. This utility is only indended to be used by other programs (currently squid). @@ -44,7 +44,7 @@ 8 daemon must be operational for many of these commands to function. - Some of these commands also require access to the directory + Some of these commands also require access to the directory winbindd_privileged in $LOCKDIR. This should be done either by running this command as root or providing group access @@ -62,7 +62,7 @@ --helper-protocol=PROTO Operate as a stdio-based helper. Valid helper protocols are: - + squid-2.4-basic @@ -81,9 +81,9 @@ squid-2.5-ntlmssp - Server-side helper for use with Squid 2.5's NTLMSSP + Server-side helper for use with Squid 2.5's NTLMSSP authentication. - Requires access to the directory + Requires access to the directory winbindd_privileged in $LOCKDIR. The protocol used is described here: ntlmssp-client-1 Cleint-side helper for use with arbitary external - programs that may wish to use Samba's NTLMSSP + programs that may wish to use Samba's NTLMSSP authentication knowlege. This helper is a client, and as such may be run by any user. The protocol used is @@ -113,13 +113,13 @@ subtle differences that are undocumented outside the source at this stage. - Requires access to the directory + Requires access to the directory winbindd_privileged in - $LOCKDIR. + $LOCKDIR. - + gss-spnego-client @@ -132,15 +132,15 @@ - + --username=USERNAME Specify username of user to authenticate - + - + --domain=DOMAIN @@ -173,7 +173,7 @@ --password=PASSWORD - User's plaintext passwordIf + User's plaintext passwordIf not specified on the command line, this is prompted for when required. @@ -195,10 +195,10 @@ or prompts for one. - + --require-membership-of={SID|Name} - Require that a user be a member of specified + Require that a user be a member of specified group (either name or SID) for authentication to succeed. @@ -209,36 +209,36 @@ EXAMPLE SETUP - To setup ntlm_auth for use by squid 2.5, with both basic and + To setup ntlm_auth4 for use by squid 2.5, with both basic and NTLMSSP authentication, the following should be placed in the squid.conf file. -auth_param ntlm program ntlm_auth --helper-protocol=squid-2.5-ntlmssp -auth_param basic program ntlm_auth --helper-protocol=squid-2.5-basic +auth_param ntlm program ntlm_auth4 --helper-protocol=squid-2.5-ntlmssp +auth_param basic program ntlm_auth4 --helper-protocol=squid-2.5-basic auth_param basic children 5 auth_param basic realm Squid proxy-caching web server auth_param basic credentialsttl 2 hours -This example assumes that ntlm_auth has been installed into your +This example assumes that ntlm_auth4 has been installed into your path, and that the group permissions on winbindd_privileged are as described above. - To setup ntlm_auth for use by squid 2.5 with group limitation in addition to the above + To setup ntlm_auth4 for use by squid 2.5 with group limitation in addition to the above example, the following should be added to the squid.conf file. -auth_param ntlm program ntlm_auth --helper-protocol=squid-2.5-ntlmssp --require-membership-of='WORKGROUP\Domain Users' -auth_param basic program ntlm_auth --helper-protocol=squid-2.5-basic --require-membership-of='WORKGROUP\Domain Users' +auth_param ntlm program ntlm_auth4 --helper-protocol=squid-2.5-ntlmssp --require-membership-of='WORKGROUP\Domain Users' +auth_param basic program ntlm_auth4 --helper-protocol=squid-2.5-basic --require-membership-of='WORKGROUP\Domain Users' - + TROUBLESHOOTING - + If you're experiencing problems with authenticating Internet Explorer running - under MS Windows 9X or Millenium Edition against ntlm_auth's NTLMSSP authentication - helper (--helper-protocol=squid-2.5-ntlmssp), then please read + under MS Windows 9X or Millenium Edition against ntlm_auth4's NTLMSSP authentication + helper (--helper-protocol=squid-2.5-ntlmssp), then please read the Microsoft Knowledge Base article #239869 and follow instructions described there. @@ -247,19 +247,19 @@ auth_param basic program ntlm_auth --helper-protocol=squid-2.5-basic --require-m VERSION - This man page is correct for version 3.0 of the Samba + This man page is correct for version 3.0 of the Samba suite. AUTHOR - - The original Samba software and related utilities + + The original Samba software and related utilities were created by Andrew Tridgell. Samba is now developed - by the Samba Team as an Open Source project similar + by the Samba Team as an Open Source project similar to the way the Linux kernel is developed. - - The ntlm_auth manpage was written by Jelmer Vernooij and + + The ntlm_auth4 manpage was written by Jelmer Vernooij and Andrew Bartlett. diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build index 3b21eda9009..a5217b3c619 100644 --- a/source4/utils/wscript_build +++ b/source4/utils/wscript_build @@ -2,7 +2,7 @@ bld.SAMBA_BINARY('ntlm_auth4', source='ntlm_auth.c', - manpages='man/ntlm_auth.1', + manpages='man/ntlm_auth4.1', deps='''samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth4 NTLMSSP_COMMON MESSAGING events service''', -- 2.11.4.GIT