← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/firebird2.1/oneiric

« back to all changes in this revision

Viewing changes to src/jrd/svc.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Damyan Ivanov
  • Date: 2011-04-22 18:59:44 UTC
  • mfrom: (2.1.24 sid)
  • Revision ID: james.westby@ubuntu.com-20110422185944-egwy9r5xynjddku5
Tags: 2.1.4.18393-0.ds2-2
* apply patch from upstream SVN fixing ICU collations
* remove lintian overrides about manpages shipped in dependency package
* claim compliancy with Policy 3.9.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/jrd/svc.cpp
1068
1068
                        *info++ = item;
1069
1069
                        if (service->svc_user_flag & SVC_user_dba) {
1070
1070
                                service->svc_do_shutdown = false;
1071
 
                                WHY_set_shutdown(FALSE);
 
1071
                                WHY_set_shutdown(SHUTDOWN_NONE);
1072
1072
                        }
1073
1073
                        else
1074
1074
                                need_admin_privs(&status, "isc_info_svc_svr_online");
1078
1078
                        *info++ = item;
1079
1079
                        if (service->svc_user_flag & SVC_user_dba) {
1080
1080
                                service->svc_do_shutdown = true;
1081
 
                                WHY_set_shutdown(TRUE);
 
1081
                                WHY_set_shutdown(SHUTDOWN_ATTACH);
1082
1082
                        }
1083
1083
                        else
1084
1084
                                need_admin_privs(&status, "isc_info_svc_svr_offline");
1507
1507
                        *info++ = item;
1508
1508
                        if (service->svc_user_flag & SVC_user_dba) {
1509
1509
                                service->svc_do_shutdown = false;
1510
 
                                WHY_set_shutdown(FALSE);
 
1510
                                WHY_set_shutdown(SHUTDOWN_NONE);
1511
1511
                                *info++ = 0;    /* Success */
1512
1512
                        }
1513
1513
                        else
1518
1518
                        *info++ = item;
1519
1519
                        if (service->svc_user_flag & SVC_user_dba) {
1520
1520
                                service->svc_do_shutdown = true;
1521
 
                                WHY_set_shutdown(TRUE);
 
1521
                                WHY_set_shutdown(SHUTDOWN_ATTACH);
1522
1522
                                *info++ = 0;    /* Success */
1523
1523
                        }
1524
1524
                        else
1984
1984
        }
1985
1985
 
1986
1986
        if (serv->serv_thd) {
 
1987
                // reset stdout buffer - fix for CORE-3220
 
1988
                service->svc_stdout_head = 1;
 
1989
                service->svc_stdout_tail = SVC_STDOUT_BUFFER_SIZE;
 
1990
 
1987
1991
                service->svc_flags &= ~SVC_evnt_fired;
1988
1992
                THREAD_EXIT();
1989
1993