svn commit: samba r9083 - in trunk/source/rpc_server: .

jra at samba.org jra at samba.org
Fri Aug 5 00:35:51 GMT 2005


Author: jra
Date: 2005-08-05 00:35:51 +0000 (Fri, 05 Aug 2005)
New Revision: 9083

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

Log:
Fix bind-nak issue in the HEAD way... code currently different from
3.0.
Jeremy.

Modified:
   trunk/source/rpc_server/srv_pipe.c


Changeset:
Modified: trunk/source/rpc_server/srv_pipe.c
===================================================================
--- trunk/source/rpc_server/srv_pipe.c	2005-08-05 00:31:06 UTC (rev 9082)
+++ trunk/source/rpc_server/srv_pipe.c	2005-08-05 00:35:51 UTC (rev 9083)
@@ -672,13 +672,12 @@
 	prs_init( &outgoing_rpc, 0, p->mem_ctx, MARSHALL);
 	prs_give_memory( &outgoing_rpc, (char *)p->out_data.current_pdu, sizeof(p->out_data.current_pdu), False);
 
-
 	/*
 	 * Initialize a bind_nak header.
 	 */
 
 	init_rpc_hdr(&nak_hdr, RPC_BINDNACK, RPC_FLG_FIRST | RPC_FLG_LAST,
-            p->hdr.call_id, RPC_HEADER_LEN + sizeof(uint16), 0);
+		p->hdr.call_id, RPC_HEADER_LEN + sizeof(uint16), 0);
 
 	/*
 	 * Marshall the header into the outgoing PDU.
@@ -696,7 +695,7 @@
 
 	if(!prs_uint16("reject code", &outgoing_rpc, 0, &zero)) {
 		prs_mem_free(&outgoing_rpc);
-        return False;
+		return False;
 	}
 
 	p->out_data.data_sent_length = 0;
@@ -1238,10 +1237,7 @@
 			prs_mem_free(&out_hdr_ba);
 			prs_mem_free(&out_auth);
 
-			if(!setup_bind_nak(p)) {
-				return False;
-			}
-			return True;
+			return setup_bind_nak(p);
                 }
 
                 for (i = 0; i < rpc_lookup_size; i++) {
@@ -1433,7 +1429,7 @@
 	prs_mem_free(&outgoing_rpc);
 	prs_mem_free(&out_hdr_ba);
 	prs_mem_free(&out_auth);
-	return False;
+	return setup_bind_nak(p);
 }
 
 /****************************************************************************



More information about the samba-cvs mailing list