diff --git a/maxscale.spec b/maxscale.spec index c3f72315e..077c48e55 100644 --- a/maxscale.spec +++ b/maxscale.spec @@ -43,7 +43,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/init.d/ mkdir -p $RPM_BUILD_ROOT%{install_path} cp -r binaries/* $RPM_BUILD_ROOT%{install_path} cp maxscale.conf $RPM_BUILD_ROOT/etc/ld.so.conf.d/ -cp -r etc/init.d/maxscale $RPM_BUILD_ROOT/etc/init.d/ +cp etc/init.d/maxscale $RPM_BUILD_ROOT/etc/init.d/ %clean @@ -51,6 +51,6 @@ cp -r etc/init.d/maxscale $RPM_BUILD_ROOT/etc/init.d/ %defattr(-,root,root) %{install_path} /etc/ld.so.conf.d/maxscale.conf -/etc/inid.d/maxscale +/etc/init.d/maxscale %changelog diff --git a/server/modules/routing/readconnroute.c b/server/modules/routing/readconnroute.c index c38d41199..5f9b5225d 100644 --- a/server/modules/routing/readconnroute.c +++ b/server/modules/routing/readconnroute.c @@ -110,13 +110,13 @@ static void clientReply( void *router_session, GWBUF *queue, DCB *backend_dcb); -static void handleError( - ROUTER *instance, - void *router_session, - GWBUF *errbuf, - DCB *backend_dcb, - int action, - bool *succp); +static void handleError( + ROUTER *instance, + void *router_session, + GWBUF *errbuf, + DCB *backend_dcb, + error_action_t action, + bool *succp); static uint8_t getCapabilities (ROUTER* inst, void* router_session); @@ -706,12 +706,12 @@ clientReply( */ static void handleError( - ROUTER *instance, - void *router_session, - GWBUF *errbuf, - DCB *backend_dcb, - int action, - bool *succp) + ROUTER *instance, + void *router_session, + GWBUF *errbuf, + DCB *backend_dcb, + error_action_t action, + bool *succp) { DCB *client = NULL; SESSION *session = backend_dcb->session;