diff options
| author | Simo Sorce <idra@samba.org> | 2011-08-10 15:23:20 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2011-08-21 09:05:03 -0400 |
| commit | 23e7e1c15862070b2296b9f24eb5b7e70f2058c4 (patch) | |
| tree | 9795aa869770bb7698ff380dd3baabf57bf51867 /source3/smbd | |
| parent | 11cbe24ac8415bdddef6d2c67cacc578cea850ad (diff) | |
| download | samba-23e7e1c15862070b2296b9f24eb5b7e70f2058c4.tar.gz samba-23e7e1c15862070b2296b9f24eb5b7e70f2058c4.tar.bz2 samba-23e7e1c15862070b2296b9f24eb5b7e70f2058c4.zip | |
s3-rpc_server: Replace RPC_SERVICE_MODE_DAEMON checks
Use rpc_daemon_type() macros where appropriate instead.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/server.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c index f6d2657289..cc53f69626 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -33,6 +33,7 @@ #include "ctdbd_conn.h" #include "printing/queue_process.h" #include "rpc_server/rpc_service_setup.h" +#include "rpc_server/rpc_config.h" #include "serverid.h" #include "passdb.h" #include "auth.h" @@ -1210,9 +1211,7 @@ extern void build_options(bool screen); } if (is_daemon && !interactive) { - enum rpc_service_mode_e epm_mode = rpc_epmapper_mode(); - - if (epm_mode == RPC_SERVICE_MODE_DAEMON) { + if (rpc_epmapper_daemon() == RPC_DAEMON_FORK) { start_epmd(ev_ctx, msg_ctx); } } @@ -1225,20 +1224,21 @@ extern void build_options(bool screen); * -- bad things will happen if smbd is launched via inetd * and we fork a copy of ourselves here */ if (is_daemon && !interactive) { - enum rpc_service_mode_e lsarpc_mode = rpc_lsarpc_mode(); - if (lsarpc_mode == RPC_SERVICE_MODE_DAEMON) { + if (rpc_lsasd_daemon() == RPC_DAEMON_FORK) { start_lsasd(ev_ctx, msg_ctx); } - if (!_lp_disable_spoolss()) { + if (!_lp_disable_spoolss() && + (rpc_spoolss_daemon() != RPC_DAEMON_DISABLED)) { bool bgq = lp_parm_bool(-1, "smbd", "backgroundqueue", true); if (!printing_subsystem_init(ev_ctx, msg_ctx, true, bgq)) { exit(1); } } - } else if (!_lp_disable_spoolss()) { + } else if (!_lp_disable_spoolss() && + (rpc_spoolss_daemon() != RPC_DAEMON_DISABLED)) { if (!printing_subsystem_init(ev_ctx, msg_ctx, false, false)) { exit(1); } |