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

[abartlet at samba.org]

Author: abartlet
Date: 2004-09-25 02:54:56 +0000 (Sat, 25 Sep 2004)
New Revision: 2611

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/utils&rev=2611&nolog=1

Log:
Try to make Samba4's ntlm_auth more consistant with Samba 3.0.

Andrew Bartlett

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	2004-09-24 23:56:22 UTC (rev 2610)
+++ branches/SAMBA_4_0/source/utils/ntlm_auth.c	2004-09-25 02:54:56 UTC (rev 2611)
@@ -68,7 +68,7 @@
 	{ SQUID_2_5_BASIC, "squid-2.5-basic", manage_squid_basic_request},
 	{ SQUID_2_5_NTLMSSP, "squid-2.5-ntlmssp", manage_gensec_request},
 	{ GSS_SPNEGO_CLIENT, "gss-spnego-client", manage_gensec_request},
-	{ GSS_SPNEGO_SERVER, "gss-spnego-server", manage_gensec_request},
+	{ GSS_SPNEGO_SERVER, "gss-spnego", manage_gensec_request},
 	{ NTLMSSP_CLIENT_1, "ntlmssp-client-1", manage_gensec_request},
 	{ NTLM_SERVER_1, "ntlm-server-1", manage_ntlm_server_1_request},
 	{ NUM_HELPER_MODES, NULL, NULL}
@@ -444,13 +444,10 @@
 
 	switch (stdio_helper_mode) {
 	case GSS_SPNEGO_SERVER:
-		if (out_base64) {
-			x_fprintf(x_stdout, "%s %s %s\n", reply_code, out_base64, reply_arg);
-		} else if (reply_arg) {
-			x_fprintf(x_stdout, "%s %s\n", reply_code, reply_arg);
-		} else {
-			x_fprintf(x_stdout, "%s\n", reply_code);
-		}
+		x_fprintf(x_stdout, "%s %s %s\n", reply_code, 
+			  out_base64 ? out_base64 : "*", 
+			  reply_arg ? reply_arg : "*");
+
 	default:
 		if (out_base64) {
 			x_fprintf(x_stdout, "%s %s\n", reply_code, out_base64);