You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2011/06/23 17:38:29 UTC
svn commit: r1138939 - in /commons/proper/daemon/trunk: RELEASE-NOTES.txt
src/native/windows/apps/prunmgr/prunmgr.c src/native/windows/src/service.c
Author: mturk
Date: Thu Jun 23 15:38:29 2011
New Revision: 1138939
URL: http://svn.apache.org/viewvc?rev=1138939&view=rev
Log:
Revert DAEMON-210. This should be handled by the installer
Modified:
commons/proper/daemon/trunk/RELEASE-NOTES.txt
commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c
commons/proper/daemon/trunk/src/native/windows/src/service.c
Modified: commons/proper/daemon/trunk/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/RELEASE-NOTES.txt?rev=1138939&r1=1138938&r2=1138939&view=diff
==============================================================================
--- commons/proper/daemon/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/trunk/RELEASE-NOTES.txt Thu Jun 23 15:38:29 2011
@@ -79,7 +79,7 @@ NEW FEATURES:
BUG FIXES:
1.0.6: DAEMON-186, DAEMON-193, DAEMON-194, DAEMON-206, DAEMON-185, DAEMON-200
- DAEMON-192, DAEMON-210
+ DAEMON-192
1.0.5: DAEMON-158, DAEMON-184, DAEMON-187, DAEMON-188, DAEMON-190
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c?rev=1138939&r1=1138938&r2=1138939&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.c Thu Jun 23 15:38:29 2011
@@ -1642,8 +1642,6 @@ int WINAPI WinMain(HINSTANCE hInstance,
bEnableTry = TRUE;
hService = apxCreateService(hPool, SC_MANAGER_CONNECT, FALSE);
if (IS_INVALID_HANDLE(hService)) {
- if (GetLastError() == ERROR_ACCESS_DENIED)
- quiet = TRUE;
if (!quiet)
apxDisplayError(TRUE, NULL, 0, "Unable to open the Service Manager");
goto cleanup;
@@ -1658,8 +1656,6 @@ int WINAPI WinMain(HINSTANCE hInstance,
SERVICE_ALL_ACCESS)) {
if (!apxServiceOpen(hService, lpCmdline->szApplication,
GENERIC_READ | GENERIC_EXECUTE)) {
- if (GetLastError() == ERROR_ACCESS_DENIED)
- quiet = TRUE;
if (!quiet)
apxDisplayError(TRUE, NULL, 0, "Unable to open the service '%S'",
lpCmdline->szApplication);
Modified: commons/proper/daemon/trunk/src/native/windows/src/service.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/service.c?rev=1138939&r1=1138938&r2=1138939&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/service.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/service.c Thu Jun 23 15:38:29 2011
@@ -135,8 +135,7 @@ apxServiceOpen(APXHANDLE hService, LPCWS
dwOptions);
if (IS_INVALID_HANDLE(lpService->hService)) {
- if (GetLastError() != ERROR_ACCESS_DENIED)
- apxLogWrite(APXLOG_MARK_SYSERR);
+ apxLogWrite(APXLOG_MARK_SYSERR);
return FALSE;
}
lstrlcpyW(lpService->stServiceEntry.szServiceName, SIZ_RESLEN, szServiceName);