|
 |
dc8c34 |
From 099becdc1261561631ae3eb1ba6c0663bc919da2 Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Rich Megginson <rmeggins@redhat.com>
|
|
|
dc8c34 |
Date: Wed, 31 Jul 2013 09:53:03 -0600
|
|
|
dc8c34 |
Subject: [PATCH 72/99] Fix compiler warnings for Ticket 47395 and 47397
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Ticket 47395 47397 v2 correct behaviour of account policy if only stateattr
|
|
|
dc8c34 |
is configured or no alternate attr is configured
|
|
|
dc8c34 |
(cherry picked from commit ce4e813f3f446bdd746ec288f33d1effcb3bf919)
|
|
|
dc8c34 |
(cherry picked from commit 2bd9ced46f395513e0aaded8f8eea5962337bffc)
|
|
|
dc8c34 |
(cherry picked from commit 12d47a25879456f8527505ded5a001f68302a877)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/plugins/acctpolicy/acct_util.c | 4 ++++
|
|
|
dc8c34 |
ldap/servers/plugins/acctpolicy/acctpolicy.h | 4 ----
|
|
|
dc8c34 |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/plugins/acctpolicy/acct_util.c b/ldap/servers/plugins/acctpolicy/acct_util.c
|
|
|
dc8c34 |
index a02382f..850cc42 100644
|
|
|
dc8c34 |
--- a/ldap/servers/plugins/acctpolicy/acct_util.c
|
|
|
dc8c34 |
+++ b/ldap/servers/plugins/acctpolicy/acct_util.c
|
|
|
dc8c34 |
@@ -29,6 +29,10 @@ Hewlett-Packard Development Company, L.P.
|
|
|
dc8c34 |
/* Globals */
|
|
|
dc8c34 |
static void* plugin_id = NULL;
|
|
|
dc8c34 |
|
|
|
dc8c34 |
+/* attributes that no clients are allowed to add or modify */
|
|
|
dc8c34 |
+static char *protected_attrs_login_recording [] = { "createTimestamp",
|
|
|
dc8c34 |
+ NULL };
|
|
|
dc8c34 |
+
|
|
|
dc8c34 |
/*
|
|
|
dc8c34 |
Checks whether an entry has a particular attribute type, and optionally
|
|
|
dc8c34 |
returns the value. Only for use with single-valued attributes - it returns
|
|
|
dc8c34 |
diff --git a/ldap/servers/plugins/acctpolicy/acctpolicy.h b/ldap/servers/plugins/acctpolicy/acctpolicy.h
|
|
|
dc8c34 |
index 78412cd..5c202d3 100644
|
|
|
dc8c34 |
--- a/ldap/servers/plugins/acctpolicy/acctpolicy.h
|
|
|
dc8c34 |
+++ b/ldap/servers/plugins/acctpolicy/acctpolicy.h
|
|
|
dc8c34 |
@@ -35,10 +35,6 @@ Hewlett-Packard Development Company, L.P.
|
|
|
dc8c34 |
#define DEFAULT_INACT_LIMIT_ATTR "accountInactivityLimit"
|
|
|
dc8c34 |
#define DEFAULT_RECORD_LOGIN 1
|
|
|
dc8c34 |
|
|
|
dc8c34 |
-/* attributes that no clients are allowed to add or modify */
|
|
|
dc8c34 |
-static char *protected_attrs_login_recording [] = { "createTimestamp",
|
|
|
dc8c34 |
- NULL };
|
|
|
dc8c34 |
-
|
|
|
dc8c34 |
#define PLUGIN_VENDOR "Hewlett-Packard Company"
|
|
|
dc8c34 |
#define PLUGIN_VERSION "1.0"
|
|
|
dc8c34 |
#define PLUGIN_CONFIG_DN "cn=config,cn=Account Policy Plugin,cn=plugins,cn=config"
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.8.1.4
|
|
|
dc8c34 |
|