svn commit: samba r19555 - in branches/SAMBA_4_0/source/utils: .

jelmer at samba.org jelmer at samba.org
Sat Nov 4 19:38:09 GMT 2006


Author: jelmer
Date: 2006-11-04 19:38:08 +0000 (Sat, 04 Nov 2006)
New Revision: 19555

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

Log:
Silently ignore --use-cached-creds for compatibility with Samba3's ntlm_auth. 
Patch by Kai Blin.

Modified:
   branches/SAMBA_4_0/source/utils/ntlm_auth.c


Changeset:
Modified: branches/SAMBA_4_0/source/utils/ntlm_auth.c
===================================================================
--- branches/SAMBA_4_0/source/utils/ntlm_auth.c	2006-11-04 17:06:38 UTC (rev 19554)
+++ branches/SAMBA_4_0/source/utils/ntlm_auth.c	2006-11-04 19:38:08 UTC (rev 19555)
@@ -94,6 +94,7 @@
 static const char *opt_workstation;
 static const char *opt_password;
 static int opt_multiplex;
+static int use_cached_creds;
 
 
 static void mux_printf(unsigned int mux_id, const char *format, ...) PRINTF_ATTRIBUTE(2, 3);
@@ -978,6 +979,7 @@
 	OPT_DIAGNOSTICS,
 	OPT_REQUIRE_MEMBERSHIP,
 	OPT_MULTIPLEX,
+	OPT_USE_CACHED_CREDS,
 };
 
 int main(int argc, const char **argv)
@@ -1003,6 +1005,7 @@
 		{ "username", 0, POPT_ARG_STRING, &opt_username, OPT_PASSWORD, "Username"},		
 		{ "password", 0, POPT_ARG_STRING, &opt_password, OPT_PASSWORD, "User's plaintext password"},		
 		{ "multiplex", 0, POPT_ARG_NONE, &opt_multiplex, OPT_MULTIPLEX, "Multiplex Mode"},
+		{ "use-cached-creds", 0, POPT_ARG_NONE, &use_cached_creds, OPT_USE_CACHED_CREDS, "silently ignored for compatibility reasons"},
 		POPT_COMMON_SAMBA
 		POPT_COMMON_VERSION
 		{ NULL }



More information about the samba-cvs mailing list