You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2022/03/10 18:47:29 UTC
[commons-daemon] branch master updated (f3c7e3a -> 5e68d66)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git.
from f3c7e3a Fix DAEMON-437. Grant service user access to log directory.
new cbcf5d3 Correct function name
new 5e68d66 Trace needs to be included in the log levels exposed by the GUI
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/changes/changes.xml | 4 ++++
src/native/windows/apps/prunmgr/prunmgr.c | 6 +++++-
src/native/windows/include/security.h | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
[commons-daemon] 02/02: Trace needs to be included in the log levels exposed by the GUI
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
commit 5e68d667c68c0c31580e0d08815d9c81285af238
Author: Administrator <Ad...@win-2022-dev.homeinbox.net>
AuthorDate: Thu Mar 10 18:47:23 2022 +0000
Trace needs to be included in the log levels exposed by the GUI
---
src/changes/changes.xml | 4 ++++
src/native/windows/apps/prunmgr/prunmgr.c | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f4b7bfb..7e85426 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -71,6 +71,10 @@
Procrun. Ensure that the user configured to run the service is also
granted access to the log file directory.
</action>
+ <action type="fix" dev="markt">
+ Procrun. Ensure Trace is included in the logging levels exposed in the
+ GUI.
+ </action>
<!-- ADD -->
<action type="add" dev="ggregory" due-to="John Patrick">
Enable Dependabot #20.
diff --git a/src/native/windows/apps/prunmgr/prunmgr.c b/src/native/windows/apps/prunmgr/prunmgr.c
index 0851639..0c5e85d 100644
--- a/src/native/windows/apps/prunmgr/prunmgr.c
+++ b/src/native/windows/apps/prunmgr/prunmgr.c
@@ -24,6 +24,7 @@
/* Force the JNI vprintf functions */
#define _DEBUG_JNI 1
#include "apxwin.h"
+#include "security.h"
#include "prunmgr.h"
LPAPXGUISTORE _gui_store = NULL;
@@ -985,6 +986,7 @@ INT_PTR CALLBACK __loggingProperty(HWND hDlg,
ComboBox_AddStringW(GetDlgItem(hDlg, IDC_PPLGLEVEL), LOGL_WARN);
ComboBox_AddStringW(GetDlgItem(hDlg, IDC_PPLGLEVEL), LOGL_INFO);
ComboBox_AddStringW(GetDlgItem(hDlg, IDC_PPLGLEVEL), LOGL_DEBUG);
+ ComboBox_AddStringW(GetDlgItem(hDlg, IDC_PPLGLEVEL), LOGL_TRACE);
if ((b = apxRegistryGetStringW(hRegserv, APXREG_PARAMSOFTWARE,
_s_log, L"Level")) != NULL) {
if (!lstrcmpiW(b, LOGL_ERROR))
@@ -993,8 +995,10 @@ INT_PTR CALLBACK __loggingProperty(HWND hDlg,
ComboBox_SetCurSel(GetDlgItem(hDlg, IDC_PPLGLEVEL), 1);
else if (!lstrcmpiW(b, LOGL_INFO))
ComboBox_SetCurSel(GetDlgItem(hDlg, IDC_PPLGLEVEL), 2);
- else
+ else if (!lstrcmpiW(b, LOGL_DEBUG))
ComboBox_SetCurSel(GetDlgItem(hDlg, IDC_PPLGLEVEL), 3);
+ else
+ ComboBox_SetCurSel(GetDlgItem(hDlg, IDC_PPLGLEVEL), 4);
apxFree(b);
}
else
[commons-daemon] 01/02: Correct function name
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
commit cbcf5d35cb5f32cf5c9eeb82a7ad1e6f1d537a1b
Author: Administrator <Ad...@win-2022-dev.homeinbox.net>
AuthorDate: Thu Mar 10 17:48:13 2022 +0000
Correct function name
---
src/native/windows/include/security.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/native/windows/include/security.h b/src/native/windows/include/security.h
index 02c7d81..b1b91bd 100644
--- a/src/native/windows/include/security.h
+++ b/src/native/windows/include/security.h
@@ -28,7 +28,7 @@ __APXBEGIN_DECLS
#define STAT_SYSTEM_WITH_DOMAIN L"NT AUTHORITY\\System"
DWORD
-apxLogGrantFileAccessToUser(
+apxSecurityGrantFileAccessToUser(
LPCWSTR szPath,
LPCWSTR szUser);