access rights for event log and syslog separated
authorVictor Kirhenshtein <victor@netxms.org>
Thu, 20 Nov 2014 18:56:33 +0000 (20:56 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Thu, 20 Nov 2014 18:56:33 +0000 (20:56 +0200)
ChangeLog
include/nxclapi.h
src/java/client/netxms-client-api/src/main/java/org/netxms/api/client/constants/UserAccessRights.java
src/java/netxms-eclipse/UserManager/src/org/netxms/ui/eclipse/usermanager/propertypages/SystemRights.java
src/server/core/logs.cpp
webui/webapp/UserManager/src/org/netxms/ui/eclipse/usermanager/propertypages/SystemRights.java

index 179b876..07f1285 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,7 +12,7 @@
 - Management console:
     - New dashboard element "DCI summary table"
     - Cluster objects shown on status maps
-- Fixed issues: #634, #667, #673, #674, #675, #678, #684
+- Fixed issues: #634, #667, #673, #674, #675, #678, #684, #688
 
 
 *
index 0a0f7fe..31d9a8c 100644 (file)
@@ -632,8 +632,9 @@ enum
 #define SYSTEM_ACCESS_XMPP_COMMANDS       _ULL(0x04000000)
 #define SYSTEM_ACCESS_MANAGE_IMAGE_LIB    _ULL(0x08000000)
 #define SYSTEM_ACCESS_UNLINK_ISSUES       _ULL(0x10000000)
+#define SYSTEM_ACCESS_VIEW_SYSLOG         _ULL(0x20000000)
 
-#define SYSTEM_ACCESS_FULL                _ULL(0x1FFFFFFF)
+#define SYSTEM_ACCESS_FULL                _ULL(0x3FFFFFFF)
 
 #endif /* LIBNXCL_CUSTOM_USER_RIGHTS */
 
index de1a802..e74db3a 100644 (file)
@@ -39,6 +39,7 @@ public class UserAccessRights
    public static final long SYSTEM_ACCESS_XMPP_COMMANDS       = 0x04000000;
    public static final long SYSTEM_ACCESS_MANAGE_IMAGE_LIB    = 0x08000000;
    public static final long SYSTEM_ACCESS_UNLINK_ISSUES       = 0x10000000;
+   public static final long SYSTEM_ACCESS_VIEW_SYSLOG         = 0x20000000;
        
        public static final int OBJECT_ACCESS_READ          = 0x00000001;
        public static final int OBJECT_ACCESS_MODIFY        = 0x00000002;
index 3229b22..831e2c3 100644 (file)
@@ -1,6 +1,6 @@
 /**
  * NetXMS - open source network management system
- * Copyright (C) 2003-2011 Victor Kirhenshtein
+ * Copyright (C) 2003-2014 Victor Kirhenshtein
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -77,6 +77,7 @@ public class SystemRights extends PropertyPage
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_EVENT_LOG, Messages.get().SystemRights_ViewEventLog);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_AUDIT_LOG, Messages.get().SystemRights_ViewAuditLog);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_TRAP_LOG, Messages.get().SystemRights_ViewTrapLog);
+      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_SYSLOG, "View syslog");
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_MANAGE_MAPPING_TBLS, Messages.get().SystemRights_ManageMappingTables);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_SERVER_CONFIG, Messages.get().SystemRights_EditServerConfig);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_READ_FILES, Messages.get().SystemRights_ReadFiles);
index 2dde5a9..f9ac64c 100644 (file)
@@ -79,7 +79,7 @@ static NXCORE_LOG s_logs[] =
                        { NULL, NULL, 0 }
                }
        },
-       { _T("syslog"), _T("syslog"), _T("msg_id"), _T("source_object_id"), SYSTEM_ACCESS_VIEW_EVENT_LOG,
+       { _T("syslog"), _T("syslog"), _T("msg_id"), _T("source_object_id"), SYSTEM_ACCESS_VIEW_SYSLOG,
                {
                        { _T("msg_timestamp"), _T("Time"), LC_TIMESTAMP },
                        { _T("source_object_id"), _T("Source"), LC_OBJECT_ID },
index 3229b22..831e2c3 100644 (file)
@@ -1,6 +1,6 @@
 /**
  * NetXMS - open source network management system
- * Copyright (C) 2003-2011 Victor Kirhenshtein
+ * Copyright (C) 2003-2014 Victor Kirhenshtein
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -77,6 +77,7 @@ public class SystemRights extends PropertyPage
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_EVENT_LOG, Messages.get().SystemRights_ViewEventLog);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_AUDIT_LOG, Messages.get().SystemRights_ViewAuditLog);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_TRAP_LOG, Messages.get().SystemRights_ViewTrapLog);
+      addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_VIEW_SYSLOG, "View syslog");
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_MANAGE_MAPPING_TBLS, Messages.get().SystemRights_ManageMappingTables);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_SERVER_CONFIG, Messages.get().SystemRights_EditServerConfig);
                addCheckbox(dialogArea, UserAccessRights.SYSTEM_ACCESS_READ_FILES, Messages.get().SystemRights_ReadFiles);