STEP04c: HACK s4:librpc: prepare dcerpc_connection...

diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 7633090354092c2b9ef5c6d5c31ab7c54d9a4daa..6a59f238217eb9c409c2cb6ffe9a645e2655d68f 100644 (file)
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -34,6 +34,7 @@
 #include "librpc/rpc/rpc_common.h"
 #include "lib/tsocket/tsocket.h"
 #include "libcli/smb/tstream_smbXcli_np.h"
+#include "librpc/rpc/dcerpc_connection.h"
 
 
 enum rpc_request_state {
@@ -140,7 +141,21 @@ static struct dcecli_connection *dcerpc_connection_init(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
+       c->assoc = dcerpc_association_create(c, 0);
+       if (c->assoc == NULL) {
+               talloc_free(c);
+               return NULL;
+       }
+       //c->conn = dcerpc_connection_create(c, c->assoc,
        c->call_id = 1;
+//     c->security_state.sec = dcerpc_security_allocate(c, c->conn,
+//                                                      DCERPC_AUTH_TYPE_NONE,
+//                                                      DCERPC_AUTH_LEVEL_NONE,
+//                                                      NULL);
+//     if (c->security_state.sec == NULL) {
+//             talloc_free(c);
+//             return NULL;
+//     }
        c->security_state.auth_type = DCERPC_AUTH_TYPE_NONE;
        c->security_state.auth_level = DCERPC_AUTH_LEVEL_NONE;
        c->security_state.auth_context_id = 0;

diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index c3297a4b3df9d39f043af3c2cb4d242fa37e57cd..09ae9d1d646ba91bfd1834a7c7e54d064e4e57cb 100644 (file)
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -46,6 +46,7 @@ struct dcecli_connection;
 struct gensec_settings;
 struct cli_credentials;
 struct dcecli_security {
+       struct dcerpc_security *sec;
        enum dcerpc_AuthType auth_type;
        enum dcerpc_AuthLevel auth_level;
        uint32_t auth_context_id;
@@ -68,6 +69,8 @@ struct dcecli_security {
 */
 struct rpc_request;
 struct dcecli_connection {
+       struct dcerpc_association *assoc;
+       struct dcerpc_connection *conn;
        uint32_t call_id;
        uint32_t srv_max_xmit_frag;
        uint32_t srv_max_recv_frag;
@@ -121,6 +124,8 @@ struct dcecli_connection {
 struct dcerpc_pipe {
        struct dcerpc_binding_handle *binding_handle;
 
+       struct dcerpc_presentation *pres;
+
        uint32_t context_id;
 
        struct GUID object;