directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-core git commit: FC-133 - Change audit flags
Date Sat, 02 Jan 2016 05:19:20 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master d26b551f7 -> 53cd9b22f


 FC-133 - Change audit flags


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/53cd9b22
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/53cd9b22
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/53cd9b22

Branch: refs/heads/master
Commit: 53cd9b22fee6417fb79bf6780bd49e2718449c37
Parents: d26b551
Author: Shawn McKinney <smckinney@apache.org>
Authored: Fri Jan 1 23:19:17 2016 -0600
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Fri Jan 1 23:19:17 2016 -0600

----------------------------------------------------------------------
 build.properties.example                                           | 2 +-
 src/main/java/org/apache/directory/fortress/core/GlobalIds.java    | 2 +-
 src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java | 2 +-
 src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/53cd9b22/build.properties.example
----------------------------------------------------------------------
diff --git a/build.properties.example b/build.properties.example
index 8acd9e3..0812a3e 100644
--- a/build.properties.example
+++ b/build.properties.example
@@ -97,7 +97,7 @@ admin.max.conn=10
 user.min.conn=1
 user.max.conn=10
 
-# Only disable audit IF ldap.server.type=openldap ABND the slapo access log overlay is NOT
enabled.  This will save roundtrip w/ server for ldapcompare:
+# Only disable audit IF ldap.server.type=openldap AND the slapo access log overlay is NOT
enabled.  This will save roundtrip w/ server for ldapcompare:
 #disable.audit=true
 
 # Used for searching openldap slapo access log:

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/53cd9b22/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
index 1bb06d8..8b0e0a3 100755
--- a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
@@ -50,7 +50,7 @@ public final class GlobalIds
     public static final String TENANT = "tenant";
     private static final String DISABLE_AUDIT = "disable.audit";
     // This constant is true unless the disable.audit flag is true.
-    public static final boolean IS_AUDIT = ( ( Config.getProperty( DISABLE_AUDIT ) != null
) && ( ! Config
+    public static final boolean IS_AUDIT_DISABLED = ( ( Config.getProperty( DISABLE_AUDIT
) != null ) && ( Config
         .getProperty( DISABLE_AUDIT ).equalsIgnoreCase( "true" ) ) );
     private static final String ENABLE_REST = "enable.mgr.impl.rest";
     public static final boolean IS_REST = ( ( Config.getProperty( ENABLE_REST ) != null )
&& ( Config

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/53cd9b22/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
index 74c025d..167662d 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
@@ -918,7 +918,7 @@ final class PermDAO extends ApacheDsDataProvider
         throws FinderException
     {
         // Audit can be turned off here with fortress config param: 'enable.audit=false'
-        if ( GlobalIds.IS_AUDIT && GlobalIds.IS_OPENLDAP )
+        if ( GlobalIds.IS_AUDIT_DISABLED && GlobalIds.IS_OPENLDAP )
         {
             try
             {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/53cd9b22/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
index 2c1b423..464cd09 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
@@ -1701,7 +1701,7 @@ final class UserDAO extends ApacheDsDataProvider
             modify( ld, userDn, mods );
 
             // The 2nd modify is to update audit attributes on the User entry:
-            if ( GlobalIds.IS_AUDIT && ( entity.getAdminSession() != null ) )
+            if ( !GlobalIds.IS_AUDIT_DISABLED && ( entity.getAdminSession() != null
) )
             {
                 // Because the user modified their own password, set their userId here:
                 //(entity.getAdminSession()).setInternalUserId(entity.getUserId());


Mime
View raw message