[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  a833aaf s3:rpc_transport_tstream: call tstream_cli_np_use_trans() before tstream_writev_queue_send()
       via  98cc4c8 pidl:NDR/Server: use interface->{UUID} and {NAME} instead of the raw {PROPERTIES}
       via  e7a7a24 pidl:NDR/Parser: use interface->{UUID} and {NAME} instead of the raw {PROPERTIES}
       via  7ae14ed pidl:NDR/Parser: use '0' instead of 'NULL' for an uint32_t value
      from  2d23dff s4-upgradeprovision: try to fix the detection of @provision record

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a833aaf52c4c846f623441a2a0cff054e2de11af
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jul 28 12:54:31 2011 +0200

    s3:rpc_transport_tstream: call tstream_cli_np_use_trans() before tstream_writev_queue_send()
    
    This will be needed when tstream_writev_queue_send() changes it's behavior and
    avoids using an immediate event when the queue is empty.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Aug  1 14:55:00 CEST 2011 on sn-devel-104

commit 98cc4c8419121246b46f5a5492dd9e4e45cf5aad
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Aug 1 11:32:48 2011 +0200

    pidl:NDR/Server: use interface->{UUID} and {NAME} instead of the raw {PROPERTIES}
    
    metze

commit e7a7a2451fc4821a265ec3d1495085ea142a4554
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Aug 1 11:32:48 2011 +0200

    pidl:NDR/Parser: use interface->{UUID} and {NAME} instead of the raw {PROPERTIES}
    
    metze

commit 7ae14ed6662d4d8fb0034931dcac34d3c032d5dd
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Aug 1 13:00:30 2011 +0200

    pidl:NDR/Parser: use '0' instead of 'NULL' for an uint32_t value
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm   |    7 +++----
 pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm   |    4 ++--
 source3/rpc_client/rpc_transport_tstream.c |   13 +++++++++----
 3 files changed, 14 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index e2c9012..406fc02 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1215,7 +1215,7 @@ sub ParsePtrPull($$$$$)
 	} elsif ($l->{POINTER_TYPE} eq "ignore") {
                 #We want to consume the pointer bytes, but ignore the pointer value
 	        $self->pidl("NDR_CHECK(ndr_pull_uint3264(ndr, NDR_SCALARS, &_ptr_$e->{NAME}));");
-		$self->pidl("_ptr_$e->{NAME} = NULL;");
+		$self->pidl("_ptr_$e->{NAME} = 0;");
 	} else {
 		die("Unhandled pointer type $l->{POINTER_TYPE}");
 	}
@@ -2666,10 +2666,9 @@ sub HeaderInterface($$$)
 	if (defined $interface->{PROPERTIES}->{uuid}) {
 		my $name = uc $interface->{NAME};
 		$self->pidl_hdr("#define NDR_$name\_UUID " . 
-		Parse::Pidl::Util::make_str(lc($interface->{PROPERTIES}->{uuid})));
+		Parse::Pidl::Util::make_str(lc($interface->{UUID})));
 
-		if(!defined $interface->{PROPERTIES}->{version}) { $interface->{PROPERTIES}->{version} = "0.0"; }
-		$self->pidl_hdr("#define NDR_$name\_VERSION $interface->{PROPERTIES}->{version}");
+		$self->pidl_hdr("#define NDR_$name\_VERSION $interface->{VERSION}");
 
 		$self->pidl_hdr("#define NDR_$name\_NAME \"$interface->{NAME}\"");
 
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
index 30ad7a4..1d51fa1 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
@@ -77,8 +77,8 @@ sub Boilerplate_Iface($)
 	my($interface) = shift;
 	my $name = $interface->{NAME}; 
 	my $uname = uc $name;
-	my $uuid = lc($interface->{PROPERTIES}->{uuid});
-	my $if_version = $interface->{PROPERTIES}->{version};
+	my $uuid = lc($interface->{UUID});
+	my $if_version = $interface->{VERSION};
 
 	pidl "
 static NTSTATUS $name\__op_bind(struct dcesrv_call_state *dce_call, const struct dcesrv_interface *iface, uint32_t if_version)
diff --git a/source3/rpc_client/rpc_transport_tstream.c b/source3/rpc_client/rpc_transport_tstream.c
index 488c093..8a860f9 100644
--- a/source3/rpc_client/rpc_transport_tstream.c
+++ b/source3/rpc_client/rpc_transport_tstream.c
@@ -357,6 +357,7 @@ static struct tevent_req *rpc_tstream_trans_send(TALLOC_CTX *mem_ctx,
 	struct tevent_req *req, *subreq;
 	struct rpc_tstream_trans_state *state;
 	struct timeval endtime;
+	bool use_trans = false;
 
 	req = tevent_req_create(mem_ctx, &state,
 				struct rpc_tstream_trans_state);
@@ -376,6 +377,14 @@ static struct tevent_req *rpc_tstream_trans_send(TALLOC_CTX *mem_ctx,
 
 	endtime = timeval_current_ofs_msec(transp->timeout);
 
+	if (tstream_is_cli_np(transp->stream)) {
+		use_trans = true;
+	}
+
+	if (use_trans) {
+		tstream_cli_np_use_trans(transp->stream);
+	}
+
 	subreq = tstream_writev_queue_send(state, ev,
 					   transp->stream,
 					   transp->write_queue,
@@ -388,10 +397,6 @@ static struct tevent_req *rpc_tstream_trans_send(TALLOC_CTX *mem_ctx,
 	}
 	tevent_req_set_callback(subreq, rpc_tstream_trans_writev, req);
 
-	if (tstream_is_cli_np(transp->stream)) {
-		tstream_cli_np_use_trans(transp->stream);
-	}
-
 	subreq = tstream_readv_pdu_queue_send(state, ev,
 					      transp->stream,
 					      transp->read_queue,


-- 
Samba Shared Repository