Fix svcctl callers.

Guenther
(This used to be commit 91bf2ac1af66acd8bcc831e758b3765fc94b2485)

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 9c8eb326184bbbaa6c0b8d74b46274f3d3dfe606..97dcf2c526634cfd85a41906435f5a42830c687e 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -4921,7 +4921,7 @@ static NTSTATUS rpc_file_close_internals(const DOM_SID *domain_sid,
 {
        return rpccli_srvsvc_NetFileClose(pipe_hnd, mem_ctx, 
                                            pipe_hnd->cli->desthost, 
-                                           atoi(argv[0]));
+                                           atoi(argv[0]), NULL);
 }
 
 /** 

diff --git a/source3/utils/net_rpc_service.c b/source3/utils/net_rpc_service.c
index 0938cec74daddb99d67b38b5eca244e8c569dc59..a70ecf3c722087361fa9b8bb60870f34d09a665f 100644 (file)
--- a/source3/utils/net_rpc_service.c
+++ b/source3/utils/net_rpc_service.c
@@ -48,7 +48,7 @@ static WERROR query_service_state(struct rpc_pipe_client *pipe_hnd,
                *state = service_status.state;
        }
        
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hService);
+       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hService, NULL);
        
        return result;
 }
@@ -130,7 +130,7 @@ static WERROR control_service(struct rpc_pipe_client *pipe_hnd,
        d_printf("%s service is %s.\n", service, svc_status_string(state));
 
 done:  
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hService);
+       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hService, NULL);
                
        return result;
 }      
@@ -184,7 +184,7 @@ static NTSTATUS rpc_service_list_internal(const DOM_SID *domain_sid,
        }
 
 done:  
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM);
+       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM, NULL);
                
        return werror_to_ntstatus(result);
 }      
@@ -285,8 +285,8 @@ static NTSTATUS rpc_service_status_internal(const DOM_SID *domain_sid,
        }
 
 done:  
-        rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hService);
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM);
+        rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hService, NULL);
+       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM, NULL);
 
        return werror_to_ntstatus(result);
 }      
@@ -324,7 +324,7 @@ static NTSTATUS rpc_service_stop_internal(const DOM_SID *domain_sid,
        result = control_service(pipe_hnd, mem_ctx, &hSCM, servicename, 
                SVCCTL_CONTROL_STOP, SVCCTL_STOPPED );
                
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM);
+       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM, NULL);
                
        return werror_to_ntstatus(result);
 }      
@@ -362,7 +362,7 @@ static NTSTATUS rpc_service_pause_internal(const DOM_SID *domain_sid,
        result = control_service(pipe_hnd, mem_ctx, &hSCM, servicename, 
                SVCCTL_CONTROL_PAUSE, SVCCTL_PAUSED );
                
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM);
+       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM, NULL);
                
        return werror_to_ntstatus(result);
 }      
@@ -400,7 +400,7 @@ static NTSTATUS rpc_service_resume_internal(const DOM_SID *domain_sid,
        result = control_service(pipe_hnd, mem_ctx, &hSCM, servicename, 
                SVCCTL_CONTROL_CONTINUE, SVCCTL_RUNNING );
                
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM);
+       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM, NULL);
                
        return werror_to_ntstatus(result);
 }      
@@ -462,8 +462,8 @@ static NTSTATUS rpc_service_start_internal(const DOM_SID *domain_sid,
                d_fprintf(stderr, "Failed to start service: %s [%s]\n", servicename, dos_errstr(result) );
        
 done:  
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hService);
-       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM);
+       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hService, NULL);
+       rpccli_svcctl_CloseServiceHandle(pipe_hnd, mem_ctx, &hSCM, NULL);
 
        return werror_to_ntstatus(result);
 }