The branch, v3-6-test has been updated
via 3670a24 s3: Fix a typo (authentictaion->authentication)
from c96bf39 s3: Do not directly log off after a pam_logon
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 3670a248eb3a3b20a91b6b38f70676f3ab7fb119
Author: Volker Lendecke <v...@samba.org>
Date: Mon Sep 13 11:44:19 2010 +0200
s3: Fix a typo (authentictaion->authentication)
-----------------------------------------------------------------------
Summary of changes:
source3/utils/ntlm_auth.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 6fd9fa3..b14c2b7 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -2441,7 +2441,9 @@ enum {
{ "request-lm-key", 0, POPT_ARG_NONE, &request_lm_key,
OPT_LM_KEY, "Retrieve LM session key"},
{ "request-nt-key", 0, POPT_ARG_NONE,
&request_user_session_key, OPT_USER_SESSION_KEY, "Retrieve User (NT) session
key"},
{ "use-cached-creds", 0, POPT_ARG_NONE, &use_cached_creds,
OPT_USE_CACHED_CREDS, "Use cached credentials if no password is given"},
- { "diagnostics", 0, POPT_ARG_NONE, &diagnostics,
OPT_DIAGNOSTICS, "Perform diagnostics on the authentictaion chain"},
+ { "diagnostics", 0, POPT_ARG_NONE, &diagnostics,
+ OPT_DIAGNOSTICS,
+ "Perform diagnostics on the authentication chain"},
{ "require-membership-of", 0, POPT_ARG_STRING,
&require_membership_of, OPT_REQUIRE_MEMBERSHIP, "Require that a user be a
member of this group (either name or SID) for authentication to succeed" },
{ "pam-winbind-conf", 0, POPT_ARG_STRING,
&opt_pam_winbind_conf, OPT_PAM_WINBIND_CONF, "Require that request must set
WBFLAG_PAM_CONTACT_TRUSTDOM when krb5 auth is required" },
POPT_COMMON_CONFIGFILE
--
Samba Shared Repository
