diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-09 20:06:54 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-09 20:06:54 +0100 |
| commit | ec106a14216ee034b7e04c177c89703e63dfd107 (patch) | |
| tree | 59c56cd663ee3dc03d0ce63bf4405ee87c14834a /source4/rpc_server | |
| parent | 4075a2ba982ea56ff925e0a33839f0760fd71911 (diff) | |
| parent | 1a2544a24c064e9eecb973439ccd0e7126e06e77 (diff) | |
| download | samba-ec106a14216ee034b7e04c177c89703e63dfd107.tar.gz samba-ec106a14216ee034b7e04c177c89703e63dfd107.tar.bz2 samba-ec106a14216ee034b7e04c177c89703e63dfd107.zip | |
Merge branch 'v4-0-trivial' into v4-0-python
(This used to be commit b874f07175ae38a041f53f0e4ac6a4050dcefeae)
Diffstat (limited to 'source4/rpc_server')
| -rw-r--r-- | source4/rpc_server/netlogon/dcerpc_netlogon.c | 16 | ||||
| -rw-r--r-- | source4/rpc_server/service_rpc.c | 14 |
2 files changed, 9 insertions, 21 deletions
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index 3d9262b995..4d38dc069e 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -797,11 +797,11 @@ static WERROR dcesrv_netr_NETRLOGONSETSERVICEBITS(struct dcesrv_call_state *dce_ } -/* - netr_NETRLOGONGETTRUSTRID +/* + netr_LogonGetTrustRid */ -static WERROR dcesrv_netr_NETRLOGONGETTRUSTRID(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, - struct netr_NETRLOGONGETTRUSTRID *r) +static WERROR dcesrv_netr_LogonGetTrustRid(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, + struct netr_LogonGetTrustRid *r) { DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); } @@ -1212,11 +1212,11 @@ static WERROR dcesrv_netr_DsrEnumerateDomainTrusts(struct dcesrv_call_state *dce } -/* - netr_DSRDEREGISTERDNSHOSTRECORDS +/* + netr_DsrDeregisterDNSHostRecords */ -static WERROR dcesrv_netr_DSRDEREGISTERDNSHOSTRECORDS(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, - struct netr_DSRDEREGISTERDNSHOSTRECORDS *r) +static WERROR dcesrv_netr_DsrDeregisterDNSHostRecords(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, + struct netr_DsrDeregisterDNSHostRecords *r) { DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); } diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c index 46916135f9..ddcf1c2a99 100644 --- a/source4/rpc_server/service_rpc.c +++ b/source4/rpc_server/service_rpc.c @@ -457,18 +457,6 @@ failed: task_server_terminate(task, "Failed to startup dcerpc server task"); } -/* - called on startup of the smb server service It's job is to start - listening on all configured sockets -*/ -static NTSTATUS dcesrv_init(struct event_context *event_context, - struct loadparm_context *lp_ctx, - const struct model_ops *model_ops) -{ - return task_server_startup(event_context, lp_ctx, - model_ops, dcesrv_task_init); -} - NTSTATUS server_service_rpc_init(void) { init_module_fn static_init[] = { STATIC_dcerpc_server_MODULES }; @@ -479,5 +467,5 @@ NTSTATUS server_service_rpc_init(void) talloc_free(shared_init); - return register_server_service("rpc", dcesrv_init); + return register_server_service("rpc", dcesrv_task_init); } |