diff options
| author | Gerald Carter <jerry@samba.org> | 2005-04-25 02:30:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:41 -0500 |
| commit | 2d6e5ad90fe358e0d1b94798819713316723125f (patch) | |
| tree | 906365512452a89a1b281d69084725fcf3c5c8e6 | |
| parent | d7173b35e918292694b9cf27ecbcad3c9cc86da6 (diff) | |
| download | samba-2d6e5ad90fe358e0d1b94798819713316723125f.tar.gz samba-2d6e5ad90fe358e0d1b94798819713316723125f.tar.bz2 samba-2d6e5ad90fe358e0d1b94798819713316723125f.zip | |
r6450: * fix typo in htlm_auth help message
* add synonym for idmap_rid in better lining with
other idmap backend names
* remove old debug messages when idmap {uid|gid} options
are not defined
(This used to be commit 03ebf3ebfe83897d8c18e57ed378154d1377874b)
| -rw-r--r-- | source3/nsswitch/winbindd_util.c | 6 | ||||
| -rw-r--r-- | source3/sam/idmap_rid.c | 1 | ||||
| -rw-r--r-- | source3/utils/ntlm_auth.c | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index 68560c040e..efd84bbf73 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -543,14 +543,12 @@ BOOL winbindd_param_init(void) /* Parse winbind uid and winbind_gid parameters */ if (!lp_idmap_uid(&server_state.uid_low, &server_state.uid_high)) { - DEBUG(0, ("winbindd: idmap uid range missing or invalid\n")); - DEBUG(0, ("winbindd: cannot continue, exiting.\n")); + DEBUG(2, ("winbindd: idmap uid range missing or invalid\n")); return False; } if (!lp_idmap_gid(&server_state.gid_low, &server_state.gid_high)) { - DEBUG(0, ("winbindd: idmap gid range missing or invalid\n")); - DEBUG(0, ("winbindd: cannot continue, exiting.\n")); + DEBUG(2, ("winbindd: idmap gid range missing or invalid\n")); return False; } diff --git a/source3/sam/idmap_rid.c b/source3/sam/idmap_rid.c index 4f28f9e1af..a23da3e578 100644 --- a/source3/sam/idmap_rid.c +++ b/source3/sam/idmap_rid.c @@ -549,5 +549,6 @@ static struct idmap_methods rid_methods = { NTSTATUS init_module(void) { return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "idmap_rid", &rid_methods); + return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "rid", &rid_methods); } diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index 0468b671af..fcaad18ef6 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -1738,8 +1738,8 @@ enum { { "lm-response", 0, POPT_ARG_STRING, &hex_lm_response, OPT_LM, "LM Response to the challenge (HEX encoded)"}, { "nt-response", 0, POPT_ARG_STRING, &hex_nt_response, OPT_NT, "NT or NTLMv2 Response to the challenge (HEX encoded)"}, { "password", 0, POPT_ARG_STRING, &opt_password, OPT_PASSWORD, "User's plaintext password"}, - { "request-lm-key", 0, POPT_ARG_NONE, &request_lm_key, OPT_LM_KEY, "Retreive LM session key"}, - { "request-nt-key", 0, POPT_ARG_NONE, &request_user_session_key, OPT_USER_SESSION_KEY, "Retreive User (NT) session key"}, + { "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"}, { "diagnostics", 0, POPT_ARG_NONE, &diagnostics, OPT_DIAGNOSTICS, "Perform diagnostics on the authentictaion 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" }, POPT_COMMON_SAMBA |