s3-smbd provide struct smbd_server_connection * to conn_snum_used

[nivanova/samba-autobuild/.git] / source3 / smbd / server.c

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 29acf8d2219790e203fb4554bfbd45f68b308958..10edb5ef4521e7593daae4f5799b26a222107a23 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1033,7 +1033,7 @@ extern void build_options(bool screen);
         * Reloading of the printers will not work here as we don't have a
         * server info and rpc services set up. It will be called later.
         */
-       if (!reload_services(smbd_messaging_context(), -1, False)) {
+       if (!reload_services(NULL, -1, False)) {
                exit(1);
        }
 
@@ -1202,7 +1202,7 @@ extern void build_options(bool screen);
                rpcsrv_type = lp_parm_const_string(GLOBAL_SECTION_SNUM,
                                                   "rpc_server", "epmapper",
                                                   "none");
-               if (StrCaseCmp(rpcsrv_type, "daemon") == 0) {
+               if (strcasecmp_m(rpcsrv_type, "daemon") == 0) {
                        start_epmd(smbd_event_context(),
                                   smbd_server_conn->msg_ctx);
                }
@@ -1235,7 +1235,7 @@ extern void build_options(bool screen);
                rpcsrv_type = lp_parm_const_string(GLOBAL_SECTION_SNUM,
                                                   "rpc_server", "spoolss",
                                                   "embedded");
-               if (StrCaseCmp(rpcsrv_type, "daemon") == 0) {
+               if (strcasecmp_m(rpcsrv_type, "daemon") == 0) {
                        start_spoolssd(smbd_event_context(),
                                       smbd_messaging_context());
                }