r24051: more monitor function calls and monitor msg names

[bbaumbach/samba-autobuild/.git] / source4 / libnet / libnet_rpc.c

diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c
index 7f4ab0021a6d1d438171c70483a086d3c8840ea4..02d7cf0c00cd96467fa0266dbe713717c2fbe462 100644 (file)
--- a/source4/libnet/libnet_rpc.c
+++ b/source4/libnet/libnet_rpc.c
@@ -148,7 +148,7 @@ static void continue_pipe_connect(struct composite_context *ctx)
                data.transport   = binding->transport;
                data.domain_name = binding->target_hostname;
                
-               msg.type      = net_rpc_connect;
+               msg.type      = mon_NetRpcConnect;
                msg.data      = (void*)&data;
                msg.data_size = sizeof(data);
                s->monitor_fn(&msg);
@@ -307,7 +307,7 @@ static void continue_lookup_dc(struct composite_context *ctx)
                data.hostname    = s->f.out.dcs[0].name;
                data.address     = s->f.out.dcs[0].address;
                
-               msg.type         = net_lookup_dc;
+               msg.type         = mon_NetLookupDc;
                msg.data         = &data;
                msg.data_size    = sizeof(data);
                s->monitor_fn(&msg);
@@ -360,7 +360,7 @@ static void continue_rpc_connect(struct composite_context *ctx)
                data.transport   = binding->transport;
                data.domain_name = binding->target_hostname;
                
-               msg.type      = net_rpc_connect;
+               msg.type      = mon_NetRpcConnect;
                msg.data      = (void*)&data;
                msg.data_size = sizeof(data);
                s->monitor_fn(&msg);
@@ -528,7 +528,7 @@ static void continue_dci_rpc_connect(struct composite_context *ctx)
                data.transport   = binding->transport;
                data.domain_name = binding->target_hostname;
 
-               msg.type      = net_rpc_connect;
+               msg.type      = mon_NetRpcConnect;
                msg.data      = (void*)&data;
                msg.data_size = sizeof(data);
                s->monitor_fn(&msg);
@@ -596,7 +596,7 @@ static void continue_lsa_policy(struct rpc_request *req)
        if (s->monitor_fn) {
                struct monitor_msg msg;
 
-               msg.type      = rpc_open_policy;
+               msg.type      = mon_LsaOpenPolicy;
                msg.data      = NULL;
                msg.data_size = 0;
                s->monitor_fn(&msg);
@@ -669,7 +669,7 @@ static void continue_lsa_query_info2(struct rpc_request *req)
        if (s->monitor_fn) {
                struct monitor_msg msg;
                
-               msg.type      = rpc_query_policy;
+               msg.type      = mon_LsaQueryPolicy;
                msg.data      = NULL;
                msg.data_size = 0;
                s->monitor_fn(&msg);
@@ -710,7 +710,7 @@ static void continue_lsa_query_info(struct rpc_request *req)
        if (s->monitor_fn) {
                struct monitor_msg msg;
                
-               msg.type      = rpc_query_policy;
+               msg.type      = mon_LsaQueryPolicy;
                msg.data      = NULL;
                msg.data_size = 0;
                s->monitor_fn(&msg);
@@ -816,7 +816,7 @@ static void continue_secondary_conn(struct composite_context *ctx)
                data.transport   = binding->transport;
                data.domain_name = binding->target_hostname;
                
-               msg.type      = net_rpc_connect;
+               msg.type      = mon_NetRpcConnect;
                msg.data      = (void*)&data;
                msg.data_size = sizeof(data);
                s->monitor_fn(&msg);