svn commit: samba r23446 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch

[vlendec at samba.org]

Author: vlendec
Date: 2007-06-12 19:19:35 +0000 (Tue, 12 Jun 2007)
New Revision: 23446

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

Log:
Restore Jeremy's original formatting, just fix the comment.

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c
   branches/SAMBA_3_0_26/source/nsswitch/winbindd_dual.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c	2007-06-12 18:14:16 UTC (rev 23445)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c	2007-06-12 19:19:35 UTC (rev 23446)
@@ -192,7 +192,7 @@
 
 static void async_request_sent(void *private_data_data, BOOL success)
 {
-	uint32_t timeout;
+	uint32_t timeout = 30;
 	struct winbindd_async_request *state =
 		talloc_get_type_abort(private_data_data, struct winbindd_async_request);
 
@@ -212,35 +212,31 @@
 			 sizeof(state->response->result),
 			 async_reply_recv, state);
 
-	timeout = 30;
+	/* 
+	 * Normal timeouts are 30s, but auth requests may take a long
+	 * time to timeout.
+	 */
 
-	if (state->request->cmd == WINBINDD_PAM_AUTH
-	    || state->request->cmd == WINBINDD_PAM_AUTH_CRAP ) {
+	if (state->request->cmd == WINBINDD_PAM_AUTH ||
+			state->request->cmd == WINBINDD_PAM_AUTH_CRAP ) {
 
-		/* 
-		 * Normal timeouts are 30s, but auth requests may take a long
-		 * time to timeout.
-		 */
-
 		timeout = 300;
 	}
 
 	/* 
-	 * Set up a timeout of for the response. If we don't get it close the
-	 * child socket and report failure.
+	 * Set up a timeout of 30 seconds for the response.
+	 * If we don't get it close the child socket and
+	 * report failure.
 	 */
 
-	state->reply_timeout_event = event_add_timed(
-		winbind_event_context(),
-		NULL,
-		timeval_current_ofs(timeout,0),
-		"async_request_timeout",
-		async_request_timeout_handler,
-		state);
-
+	state->reply_timeout_event = event_add_timed(winbind_event_context(),
+							NULL,
+							timeval_current_ofs(timeout,0),
+							"async_request_timeout",
+							async_request_timeout_handler,
+							state);
 	if (!state->reply_timeout_event) {
-		smb_panic("async_request_sent: failed to add timeout "
-			  "handler.\n");
+		smb_panic("async_request_sent: failed to add timeout handler.\n");
 	}
 }
 

Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_dual.c
===================================================================
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_dual.c	2007-06-12 18:14:16 UTC (rev 23445)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_dual.c	2007-06-12 19:19:35 UTC (rev 23446)
@@ -192,7 +192,7 @@
 
 static void async_request_sent(void *private_data_data, BOOL success)
 {
-	uint32_t timeout;
+	uint32_t timeout = 30;
 	struct winbindd_async_request *state =
 		talloc_get_type_abort(private_data_data, struct winbindd_async_request);
 
@@ -212,35 +212,31 @@
 			 sizeof(state->response->result),
 			 async_reply_recv, state);
 
-	timeout = 30;
+	/* 
+	 * Normal timeouts are 30s, but auth requests may take a long
+	 * time to timeout.
+	 */
 
-	if (state->request->cmd == WINBINDD_PAM_AUTH
-	    || state->request->cmd == WINBINDD_PAM_AUTH_CRAP ) {
+	if (state->request->cmd == WINBINDD_PAM_AUTH ||
+			state->request->cmd == WINBINDD_PAM_AUTH_CRAP ) {
 
-		/* 
-		 * Normal timeouts are 30s, but auth requests may take a long
-		 * time to timeout.
-		 */
-
 		timeout = 300;
 	}
 
 	/* 
-	 * Set up a timeout of for the response. If we don't get it close the
-	 * child socket and report failure.
+	 * Set up a timeout of 30 seconds for the response.
+	 * If we don't get it close the child socket and
+	 * report failure.
 	 */
 
-	state->reply_timeout_event = event_add_timed(
-		winbind_event_context(),
-		NULL,
-		timeval_current_ofs(timeout,0),
-		"async_request_timeout",
-		async_request_timeout_handler,
-		state);
-
+	state->reply_timeout_event = event_add_timed(winbind_event_context(),
+							NULL,
+							timeval_current_ofs(timeout,0),
+							"async_request_timeout",
+							async_request_timeout_handler,
+							state);
 	if (!state->reply_timeout_event) {
-		smb_panic("async_request_sent: failed to add timeout "
-			  "handler.\n");
+		smb_panic("async_request_sent: failed to add timeout handler.\n");
 	}
 }