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

diff --git a/source/nsswitch/winbindd_util.c b/source/nsswitch/winbindd_util.c
index 68560c040e4aed3b8c1952ec171eaf387ef53787..efd84bbf73026e7c05ab66664d9b0d2265e6295e 100644 (file)
--- a/source/nsswitch/winbindd_util.c
+++ b/source/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/source/sam/idmap_rid.c b/source/sam/idmap_rid.c
index 4f28f9e1af10bd15f7a3488d84d81edf947ec689..a23da3e5789633215fa61a6f9491b1b175de826b 100644 (file)
--- a/source/sam/idmap_rid.c
+++ b/source/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/source/utils/ntlm_auth.c b/source/utils/ntlm_auth.c
index 0468b671afa0839f667007cc1a72d12f22934659..fcaad18ef606a7d748b6fd72eb153e955bc9c935 100644 (file)
--- a/source/utils/ntlm_auth.c
+++ b/source/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