svn commit: samba r6450 - in branches/SAMBA_3_0/source: nsswitch sam utils

[jerry at samba.org]

Author: jerry
Date: 2005-04-25 02:30:12 +0000 (Mon, 25 Apr 2005)
New Revision: 6450

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6450

Log:
* 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



Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
   branches/SAMBA_3_0/source/sam/idmap_rid.c
   branches/SAMBA_3_0/source/utils/ntlm_auth.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2005-04-24 07:33:50 UTC (rev 6449)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2005-04-25 02:30:12 UTC (rev 6450)
@@ -543,14 +543,12 @@
 	/* 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;
 	}
 	

Modified: branches/SAMBA_3_0/source/sam/idmap_rid.c
===================================================================
--- branches/SAMBA_3_0/source/sam/idmap_rid.c	2005-04-24 07:33:50 UTC (rev 6449)
+++ branches/SAMBA_3_0/source/sam/idmap_rid.c	2005-04-25 02:30:12 UTC (rev 6450)
@@ -549,5 +549,6 @@
 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);
 }
 

Modified: branches/SAMBA_3_0/source/utils/ntlm_auth.c
===================================================================
--- branches/SAMBA_3_0/source/utils/ntlm_auth.c	2005-04-24 07:33:50 UTC (rev 6449)
+++ branches/SAMBA_3_0/source/utils/ntlm_auth.c	2005-04-25 02:30:12 UTC (rev 6450)
@@ -1738,8 +1738,8 @@
 		{ "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