r12511: Remove authservice from binding string

(This used to be commit 2188168209f07bd87d90d7ff94e8b542ced68249)

diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index 263121eaefcc86385cb89e7bd2ecbe4933eaf432..5f13ba3081da44c9670b76eb01de869818e5303b 100644 (file)
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -189,7 +189,6 @@ struct dcerpc_binding {
        uint16_t object_version;
        const char *host;
        const char *endpoint;
-       const char *authservice;
        const char **options;
        uint32_t flags;
 };

diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 039c3a6a453cf929fddcb6cee7b0177c5cb18dec..080f5dee6b88f76845d29d9164a2f6690c86a341 100644 (file)
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -359,8 +359,6 @@ NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_
                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 @@ NTSTATUS dcerpc_epm_map_binding(TALLOC_CTX *mem_ctx, struct dcerpc_binding *bind
        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 @@ NTSTATUS dcerpc_epm_map_binding(TALLOC_CTX *mem_ctx, struct dcerpc_binding *bind
        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 @@ NTSTATUS dcerpc_pipe_auth(struct dcerpc_pipe *p,
                }
 
                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);
        }