svn commit: samba r4081 - in branches/SAMBA_4_0/source: librpc/idl librpc/rpc rpc_server

[metze at samba.org]

Author: metze
Date: 2004-12-06 17:44:33 +0000 (Mon, 06 Dec 2004)
New Revision: 4081

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

Log:
use clearer names

metze

Modified:
   branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c
   branches/SAMBA_4_0/source/rpc_server/dcesrv_auth.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl	2004-12-06 15:45:48 UTC (rev 4080)
+++ branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl	2004-12-06 17:44:33 UTC (rev 4081)
@@ -175,7 +175,7 @@
 		[case(DCERPC_PKT_ALTER)]     dcerpc_bind     alter;
 		[case(DCERPC_PKT_ALTER_ACK)] dcerpc_bind_ack alter_ack;
 		[case(DCERPC_PKT_FAULT)]     dcerpc_fault    fault;
-		[case(DCERPC_PKT_AUTH3)]     dcerpc_auth3    auth;
+		[case(DCERPC_PKT_AUTH3)]     dcerpc_auth3    auth3;
 		[case(DCERPC_PKT_BIND_NAK)]  dcerpc_bind_nak bind_nak;
 	} dcerpc_payload;
 

Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c	2004-12-06 15:45:48 UTC (rev 4080)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c	2004-12-06 17:44:33 UTC (rev 4081)
@@ -681,8 +681,8 @@
 	pkt.pfc_flags = DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST;
 	pkt.call_id = next_call_id(p);
 	pkt.auth_length = 0;
-	pkt.u.auth._pad = 0;
-	pkt.u.auth.auth_info = data_blob(NULL, 0);
+	pkt.u.auth3._pad = 0;
+	pkt.u.auth3.auth_info = data_blob(NULL, 0);
 
 	/* construct the NDR form of the packet */
 	status = dcerpc_push_auth(&blob, mem_ctx, &pkt, p->security_state.auth_info);

Modified: branches/SAMBA_4_0/source/rpc_server/dcesrv_auth.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/dcesrv_auth.c	2004-12-06 15:45:48 UTC (rev 4080)
+++ branches/SAMBA_4_0/source/rpc_server/dcesrv_auth.c	2004-12-06 17:44:33 UTC (rev 4081)
@@ -157,11 +157,11 @@
 	/* We can't work without an existing gensec state, and an new blob to feed it */
 	if (!dce_conn->auth_state.auth_info ||
 	    !dce_conn->auth_state.gensec_security ||
-	    pkt->u.auth.auth_info.length == 0) {
+	    pkt->u.auth3.auth_info.length == 0) {
 		return False;
 	}
 
-	status = ndr_pull_struct_blob(&pkt->u.auth.auth_info,
+	status = ndr_pull_struct_blob(&pkt->u.auth3.auth_info,
 				      call,
 				      dce_conn->auth_state.auth_info,
 				      (ndr_pull_flags_fn_t)ndr_pull_dcerpc_auth);