svn commit: samba r10413 - in trunk/source/nsswitch: .

[vlendec at samba.org]

Author: vlendec
Date: 2005-09-22 06:10:01 +0000 (Thu, 22 Sep 2005)
New Revision: 10413

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

Log:
Reformat. Jeremy, you might have a better and more expensive display I have,
but on my 1.1kg laptop with 1024x768 and with my glasses a 200 character wide
xterm is not really readable :-)

Volker

Modified:
   trunk/source/nsswitch/winbindd_cm.c


Changeset:
Modified: trunk/source/nsswitch/winbindd_cm.c
===================================================================
--- trunk/source/nsswitch/winbindd_cm.c	2005-09-22 05:36:50 UTC (rev 10412)
+++ trunk/source/nsswitch/winbindd_cm.c	2005-09-22 06:10:01 UTC (rev 10413)
@@ -1042,32 +1042,41 @@
 
 	if (conn->samr_pipe == NULL) {
 		/*
-		 * No SAMR pipe yet. Attempt to get an NTLMSSP SPNEGO authenticated
-		 * sign and sealed pipe using the machine account password by
-		 * preference. If we can't - try schannel, if that fails, try anonymous.
+		 * No SAMR pipe yet. Attempt to get an NTLMSSP SPNEGO
+		 * authenticated sign and sealed pipe using the machine
+		 * account password by preference. If we can't - try schannel,
+		 * if that fails, try anonymous.
 		 */
 
 		fstring conn_pwd;
 		pwd_get_cleartext(&conn->cli->pwd, conn_pwd);
-		if (conn->cli->user_name[0] && conn->cli->domain[0] && conn_pwd[0]) {
+		if (conn->cli->user_name[0] && conn->cli->domain[0] &&
+		    conn_pwd[0]) {
 			/* We have an authenticated connection. Use
 			   a NTLMSSP SPNEGO authenticated SAMR pipe with
 			   sign & seal. */
-			conn->samr_pipe = cli_rpc_pipe_open_spnego_ntlmssp(conn->cli,
-								PI_SAMR,
-								PIPE_AUTH_LEVEL_PRIVACY,
-								conn->cli->domain,
-								conn->cli->user_name,
-								conn_pwd,
-								&result);
+			conn->samr_pipe =
+				cli_rpc_pipe_open_spnego_ntlmssp(conn->cli,
+								 PI_SAMR,
+								 PIPE_AUTH_LEVEL_PRIVACY,
+								 conn->cli->domain,
+								 conn->cli->user_name,
+								 conn_pwd,
+								 &result);
 			if (conn->samr_pipe == NULL) {
-				DEBUG(10,("cm_connect_sam: failed to connect to SAMR pipe for domain %s "
-					"using NTLMSSP authenticated pipe: user %s\\%s. Error was %s\n",
-					domain->name, conn->cli->domain, conn->cli->user_name, nt_errstr(result) ));
+				DEBUG(10,("cm_connect_sam: failed to connect "
+					  "to SAMR pipe for domain %s using "
+					  "NTLMSSP authenticated pipe: user "
+					  "%s\\%s. Error was %s\n",
+					  domain->name, conn->cli->domain,
+					  conn->cli->user_name,
+					  nt_errstr(result)));
 			} else {
-				DEBUG(10,("cm_connect_sam: connected to SAMR pipe for domain %s "
-					"using NTLMSSP authenticated pipe: user %s\\%s\n",
-					domain->name, conn->cli->domain, conn->cli->user_name ));
+				DEBUG(10,("cm_connect_sam: connected to SAMR "
+					  "pipe for domain %s using NTLMSSP "
+					  "authenticated pipe: user %s\\%s\n",
+					  domain->name, conn->cli->domain,
+					  conn->cli->user_name ));
 			}
 		}
 
@@ -1077,28 +1086,32 @@
 			struct dcinfo *p_dcinfo;
 
 			if (cm_get_schannel_dcinfo(domain, &p_dcinfo)) {
-				conn->samr_pipe = cli_rpc_pipe_open_schannel_with_key(conn->cli,
-									PI_SAMR,
-									PIPE_AUTH_LEVEL_PRIVACY,
-									domain->name,
-									p_dcinfo,
-									&result);
+				conn->samr_pipe =
+					cli_rpc_pipe_open_schannel_with_key(conn->cli,
+									    PI_SAMR,
+									    PIPE_AUTH_LEVEL_PRIVACY,
+									    domain->name,
+									    p_dcinfo,
+									    &result);
 			}
 			if (conn->samr_pipe == NULL) {
-				DEBUG(10,("cm_connect_sam: failed to connect to SAMR pipe for domain %s "
-					"using schannel authenticated. Error was %s\n",
-					domain->name, nt_errstr(result) ));
+				DEBUG(10,("cm_connect_sam: failed to connect "
+					  "to SAMR pipe for domain %s using "
+					  "schannel authenticated. Error "
+					  "was %s\n", domain->name,
+					  nt_errstr(result) ));
 			} else {
-				DEBUG(10,("cm_connect_sam: connected to SAMR pipe for domain %s "
-					"using schannel.\n",
-					domain->name ));
+				DEBUG(10,("cm_connect_sam: connected to SAMR "
+					  "pipe for domain %s using schannel.\n",
+					  domain->name ));
 			}
 		}
 #endif	/* DISABLE_SCHANNEL_WIN2K3_SP1 */
 
 		/* Finally fall back to anonymous. */
 		if (conn->samr_pipe == NULL) {
-			conn->samr_pipe = cli_rpc_pipe_open_noauth(conn->cli, PI_SAMR, &result);
+			conn->samr_pipe =
+				cli_rpc_pipe_open_noauth(conn->cli, PI_SAMR, &result);
 		}
 
 		if (conn->samr_pipe == NULL) {
@@ -1110,9 +1123,9 @@
 					     SEC_RIGHTS_MAXIMUM_ALLOWED,
 					     &conn->sam_connect_handle);
 		if (!NT_STATUS_IS_OK(result)) {
-			DEBUG(10,("cm_connect_sam: rpccli_samr_connect failed for domain %s "
-				"Error was %s\n",
-				domain->name, nt_errstr(result) ));
+			DEBUG(10,("cm_connect_sam: rpccli_samr_connect failed "
+				  "for domain %s Error was %s\n",
+				  domain->name, nt_errstr(result) ));
 			goto done;
 		}
 
@@ -1153,12 +1166,13 @@
 		struct dcinfo *p_dcinfo;
 
 		if (cm_get_schannel_dcinfo(domain, &p_dcinfo)) {
-			conn->lsa_pipe = cli_rpc_pipe_open_schannel_with_key(conn->cli,
-								PI_LSARPC,
-								PIPE_AUTH_LEVEL_PRIVACY,
-								domain->name,
-								p_dcinfo,
-								&result);
+			conn->lsa_pipe =
+				cli_rpc_pipe_open_schannel_with_key(conn->cli,
+								    PI_LSARPC,
+								    PIPE_AUTH_LEVEL_PRIVACY,
+								    domain->name,
+								    p_dcinfo,
+								    &result);
 		} else
 #endif	/* DISABLE_SCHANNEL_WIN2K3_SP1 */
 			conn->lsa_pipe = cli_rpc_pipe_open_noauth(conn->cli,