svn commit: samba r12511 - in branches/SAMBA_4_0/source/librpc/rpc: .

[jelmer at samba.org]

Author: jelmer
Date: 2005-12-27 14:42:29 +0000 (Tue, 27 Dec 2005)
New Revision: 12511

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

Log:
Remove authservice from binding string

Modified:
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h	2005-12-27 14:28:01 UTC (rev 12510)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h	2005-12-27 14:42:29 UTC (rev 12511)
@@ -189,7 +189,6 @@
 	uint16_t object_version;
 	const char *host;
 	const char *endpoint;
-	const char *authservice;
 	const char **options;
 	uint32_t flags;
 };

Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c	2005-12-27 14:28:01 UTC (rev 12510)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c	2005-12-27 14:42:29 UTC (rev 12511)
@@ -359,8 +359,6 @@
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	b->authservice = NULL;
-
 	p = strchr(s, '@');
 
 	if (p && PTR_DIFF(p, s) == 36) { /* 36 is the length of a UUID */
@@ -844,8 +842,6 @@
 	if (table) {
 		struct dcerpc_binding *default_binding;
 
-		binding->authservice = talloc_strdup(binding, table->authservices->names[0]);
-
 		/* Find one of the default pipes for this interface */
 		for (i = 0; i < table->endpoints->count; i++) {
 			status = dcerpc_parse_binding(mem_ctx, table->endpoints->names[i], &default_binding);
@@ -873,7 +869,6 @@
 	epmapper_binding->options = NULL;
 	epmapper_binding->flags = 0;
 	epmapper_binding->endpoint = NULL;
-	epmapper_binding->authservice = NULL;
 	
 	status = dcerpc_pipe_connect_b(mem_ctx, 
 				       &p,
@@ -997,8 +992,7 @@
 		}
 
 		status = dcerpc_bind_auth(p, table,
-					  credentials, auth_type,
-					  binding->authservice);
+					  credentials, auth_type, table->authservices->names[0]);
 	} else {
 		status = dcerpc_bind_auth_none(p, table);
 	}