src/com/netscape/admin/dirserv/panel/EncryptionPanel.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f668294a80f37dad8be85348fbe582e817ef2361
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue Jan 20 12:47:37 2015 -0500
Ticket 47994 - DS Console always sets nsSSL3 to "on" when a securty setting is adjusted
Bug Description: The DS console always sets "nsSSL3: on" when a security
setting is changed. SSL3 should not be enabled.
Fix Description: Instead set "nsTLS1: on" which is what we really want.
https://fedorahosted.org/389/ticket/47994
Reviewed by: rmeggins(Thanks!)
diff --git a/src/com/netscape/admin/dirserv/panel/EncryptionPanel.java b/src/com/netscape/admin/dirserv/panel/EncryptionPanel.java
index 20d885f..6b2cbc3 100644
--- a/src/com/netscape/admin/dirserv/panel/EncryptionPanel.java
+++ b/src/com/netscape/admin/dirserv/panel/EncryptionPanel.java
@@ -898,7 +898,7 @@ class EncryptionConfigData {
attrs.add(new LDAPAttribute("nsssltoken", setup.selectedDevice));
if (setup.selectedCertificate.length() >= 1) {
- // Strip off the "<token>:" prefix for certs on extrnal tokens
+ // Strip off the "<token>:" prefix for certs on external tokens
String cert = setup.selectedCertificate;
String tokenPrefix = setup.selectedDevice + ":";
if (cert.startsWith(tokenPrefix)) {
@@ -921,7 +921,7 @@ class EncryptionConfigData {
// cn=encryption,cn=config
LDAPModificationSet modSet = new LDAPModificationSet();
String v = sslServerOn ? "on" : "off";
- modSet.add(LDAPModification.REPLACE, new LDAPAttribute("nsssl3", v));
+ modSet.add(LDAPModification.REPLACE, new LDAPAttribute("nsTLS1", v));
switch(clientAuth) {
case CLIENT_AUTH_ALLOWED:
v = "allowed";
ldap/admin/src/scripts/60upgradeconfigfiles.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 96850932c054edcc477d070cf619006344b1d443
Author: Ludwig Krispenz <lkrispen(a)redhat.com>
Date: Tue Jan 20 10:34:41 2015 +0100
Ticket 47991 - upgrade script fails if /etc and /var are on different file systems
Bug Description: the script to upgrade configfiles creates a backup dir in /var
and tries to move files fro /etc to this backup dir
using the perl rename function.
this fails if /etc and /var are different fiel systems
Fix Description: create the backup dir also in /etc
https://fedorahosted.org/389/ticket/47991
Reviewed by: Mark, Thanks
diff --git a/ldap/admin/src/scripts/60upgradeconfigfiles.pl b/ldap/admin/src/scripts/60upgradeconfigfiles.pl
index 4b37353..189eb03 100644
--- a/ldap/admin/src/scripts/60upgradeconfigfiles.pl
+++ b/ldap/admin/src/scripts/60upgradeconfigfiles.pl
@@ -16,7 +16,7 @@ sub runinst {
# make a backup directory to store the deleted config file, then
# don't really delete it, just move it to that directory
my $mode = (stat($inf->{slapd}->{config_dir}))[2];
- my $bakdir = $inf->{slapd}->{bak_dir} . ".bak";
+ my $bakdir = $inf->{slapd}->{config_dir} . "/bak" ;
if (! -d $bakdir) {
$! = 0; # clear
mkdir $bakdir, $mode;
ldap/admin/src/scripts/60upgradeconfigfiles.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4b914f299683d66bebd39a170c2c4ca10c037ed0
Author: Ludwig Krispenz <lkrispen(a)redhat.com>
Date: Tue Jan 20 10:34:41 2015 +0100
Ticket 47991 - upgrade script fails if /etc and /var are on different file systems
Bug Description: the script to upgrade configfiles creates a backup dir in /var
and tries to move files fro /etc to this backup dir
using the perl rename function.
this fails if /etc and /var are different fiel systems
Fix Description: create the backup dir also in /etc
https://fedorahosted.org/389/ticket/47991
Reviewed by: Mark, Thanks
diff --git a/ldap/admin/src/scripts/60upgradeconfigfiles.pl b/ldap/admin/src/scripts/60upgradeconfigfiles.pl
index 4b37353..189eb03 100644
--- a/ldap/admin/src/scripts/60upgradeconfigfiles.pl
+++ b/ldap/admin/src/scripts/60upgradeconfigfiles.pl
@@ -16,7 +16,7 @@ sub runinst {
# make a backup directory to store the deleted config file, then
# don't really delete it, just move it to that directory
my $mode = (stat($inf->{slapd}->{config_dir}))[2];
- my $bakdir = $inf->{slapd}->{bak_dir} . ".bak";
+ my $bakdir = $inf->{slapd}->{config_dir} . "/bak" ;
if (! -d $bakdir) {
$! = 0; # clear
mkdir $bakdir, $mode;
ldap/admin/src/scripts/60upgradeconfigfiles.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c0d233b60311e2bf65dc13eee6f12abe221be932
Author: Ludwig Krispenz <lkrispen(a)redhat.com>
Date: Tue Jan 20 10:34:41 2015 +0100
Ticket 47991 - upgrade script fails if /etc and /var are on different file systems
Bug Description: the script to upgrade configfiles creates a backup dir in /var
and tries to move files fro /etc to this backup dir
using the perl rename function.
this fails if /etc and /var are different fiel systems
Fix Description: create the backup dir also in /etc
https://fedorahosted.org/389/ticket/47991
Reviewed by: Mark, Thanks
diff --git a/ldap/admin/src/scripts/60upgradeconfigfiles.pl b/ldap/admin/src/scripts/60upgradeconfigfiles.pl
index 4b37353..189eb03 100644
--- a/ldap/admin/src/scripts/60upgradeconfigfiles.pl
+++ b/ldap/admin/src/scripts/60upgradeconfigfiles.pl
@@ -16,7 +16,7 @@ sub runinst {
# make a backup directory to store the deleted config file, then
# don't really delete it, just move it to that directory
my $mode = (stat($inf->{slapd}->{config_dir}))[2];
- my $bakdir = $inf->{slapd}->{bak_dir} . ".bak";
+ my $bakdir = $inf->{slapd}->{config_dir} . "/bak" ;
if (! -d $bakdir) {
$! = 0; # clear
mkdir $bakdir, $mode;
ldap/servers/plugins/replication/windows_connection.c | 4 ----
ldap/servers/plugins/replication/windows_protocol_util.c | 8 ++++++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a605e94c625cb46715516b7afb83fca719485f49
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Fri Jan 16 16:28:06 2015 -0800
Ticket #47989 - Windows Sync accidentally cleared raw_entry
Description: raw_entry in the private area in Windows Agreement stores
raw_entry that is un-schema processed last entry read from AD.
The pointer was cleared before it is being accessed by the Plug-ins that
call Windows Sync API, e.g., Posix Sync. The bug was introduced by
commit f6397113666f06848412bb12f754f04258cfa5fa.
This patch removed the raw_entry cleanup code in windows_search_entry_ext.
And in case the raw_entry is NULL, pass remote_entry for the AD entry.
https://fedorahosted.org/389/ticket/47989
Reviewed by mreynolds(a)redhat.com (Thank you, Mark!!)
(cherry picked from commit 3305a6b849f79a9684799bec4cc155c7147daea6)
(cherry picked from commit f6d8b2ec3dee5760826892f522c0f1e1989f9fcb)
(cherry picked from commit 19af1afa4012a66fda2bc5e2e70ac315b70444af)
(cherry picked from commit bf55d5ac6547028ebabdcf19df28cfdd4017872f)
diff --git a/ldap/servers/plugins/replication/windows_connection.c b/ldap/servers/plugins/replication/windows_connection.c
index 105c205..b0f9bb3 100644
--- a/ldap/servers/plugins/replication/windows_connection.c
+++ b/ldap/servers/plugins/replication/windows_connection.c
@@ -671,10 +671,6 @@ windows_search_entry_ext(Repl_Connection *conn, char* searchbase, char *filter,
attrs = NULL;
ldap_controls_free(serverctrls_copy);
serverctrls_copy = NULL;
-
- /* clear it here in case the search fails and
- we are left with a bogus old entry */
- windows_private_set_raw_entry(conn->agmt, NULL);
if (LDAP_SUCCESS == ldap_rc)
{
LDAPMessage *message = ldap_first_entry(conn->ld, res);
diff --git a/ldap/servers/plugins/replication/windows_protocol_util.c b/ldap/servers/plugins/replication/windows_protocol_util.c
index c95bdbb..12acf94 100644
--- a/ldap/servers/plugins/replication/windows_protocol_util.c
+++ b/ldap/servers/plugins/replication/windows_protocol_util.c
@@ -1616,7 +1616,9 @@ windows_replay_update(Private_Repl_Protocol *prp, slapi_operation_parameters *op
windows_map_mods_for_replay(prp,op->p.p_modify.modify_mods, &mapped_mods, is_user, &password);
if (is_user) {
winsync_plugin_call_pre_ad_mod_user_mods_cb(prp->agmt,
- windows_private_get_raw_entry(prp->agmt),
+ windows_private_get_raw_entry(prp->agmt)?
+ windows_private_get_raw_entry(prp->agmt):
+ remote_entry,
local_dn,
local_entry,
op->p.p_modify.modify_mods,
@@ -1624,7 +1626,9 @@ windows_replay_update(Private_Repl_Protocol *prp, slapi_operation_parameters *op
&mapped_mods);
} else if (is_group) {
winsync_plugin_call_pre_ad_mod_group_mods_cb(prp->agmt,
- windows_private_get_raw_entry(prp->agmt),
+ windows_private_get_raw_entry(prp->agmt)?
+ windows_private_get_raw_entry(prp->agmt):
+ remote_entry,
local_dn,
local_entry,
op->p.p_modify.modify_mods,
ldap/servers/plugins/replication/windows_connection.c | 4 ----
ldap/servers/plugins/replication/windows_protocol_util.c | 8 ++++++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit bf55d5ac6547028ebabdcf19df28cfdd4017872f
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Fri Jan 16 16:28:06 2015 -0800
Ticket #47989 - Windows Sync accidentally cleared raw_entry
Description: raw_entry in the private area in Windows Agreement stores
raw_entry that is un-schema processed last entry read from AD.
The pointer was cleared before it is being accessed by the Plug-ins that
call Windows Sync API, e.g., Posix Sync. The bug was introduced by
commit f6397113666f06848412bb12f754f04258cfa5fa.
This patch removed the raw_entry cleanup code in windows_search_entry_ext.
And in case the raw_entry is NULL, pass remote_entry for the AD entry.
https://fedorahosted.org/389/ticket/47989
Reviewed by mreynolds(a)redhat.com (Thank you, Mark!!)
(cherry picked from commit 3305a6b849f79a9684799bec4cc155c7147daea6)
(cherry picked from commit f6d8b2ec3dee5760826892f522c0f1e1989f9fcb)
(cherry picked from commit 19af1afa4012a66fda2bc5e2e70ac315b70444af)
Conflicts:
ldap/servers/plugins/replication/windows_connection.c
diff --git a/ldap/servers/plugins/replication/windows_connection.c b/ldap/servers/plugins/replication/windows_connection.c
index 105c205..b0f9bb3 100644
--- a/ldap/servers/plugins/replication/windows_connection.c
+++ b/ldap/servers/plugins/replication/windows_connection.c
@@ -671,10 +671,6 @@ windows_search_entry_ext(Repl_Connection *conn, char* searchbase, char *filter,
attrs = NULL;
ldap_controls_free(serverctrls_copy);
serverctrls_copy = NULL;
-
- /* clear it here in case the search fails and
- we are left with a bogus old entry */
- windows_private_set_raw_entry(conn->agmt, NULL);
if (LDAP_SUCCESS == ldap_rc)
{
LDAPMessage *message = ldap_first_entry(conn->ld, res);
diff --git a/ldap/servers/plugins/replication/windows_protocol_util.c b/ldap/servers/plugins/replication/windows_protocol_util.c
index 252694d..c08ecd9 100644
--- a/ldap/servers/plugins/replication/windows_protocol_util.c
+++ b/ldap/servers/plugins/replication/windows_protocol_util.c
@@ -1616,7 +1616,9 @@ windows_replay_update(Private_Repl_Protocol *prp, slapi_operation_parameters *op
windows_map_mods_for_replay(prp,op->p.p_modify.modify_mods, &mapped_mods, is_user, &password);
if (is_user) {
winsync_plugin_call_pre_ad_mod_user_mods_cb(prp->agmt,
- windows_private_get_raw_entry(prp->agmt),
+ windows_private_get_raw_entry(prp->agmt)?
+ windows_private_get_raw_entry(prp->agmt):
+ remote_entry,
local_dn,
local_entry,
op->p.p_modify.modify_mods,
@@ -1624,7 +1626,9 @@ windows_replay_update(Private_Repl_Protocol *prp, slapi_operation_parameters *op
&mapped_mods);
} else if (is_group) {
winsync_plugin_call_pre_ad_mod_group_mods_cb(prp->agmt,
- windows_private_get_raw_entry(prp->agmt),
+ windows_private_get_raw_entry(prp->agmt)?
+ windows_private_get_raw_entry(prp->agmt):
+ remote_entry,
local_dn,
local_entry,
op->p.p_modify.modify_mods,
ldap/servers/plugins/replication/windows_connection.c | 4 ----
ldap/servers/plugins/replication/windows_protocol_util.c | 8 ++++++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 19af1afa4012a66fda2bc5e2e70ac315b70444af
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Fri Jan 16 16:28:06 2015 -0800
Ticket #47989 - Windows Sync accidentally cleared raw_entry
Description: raw_entry in the private area in Windows Agreement stores
raw_entry that is un-schema processed last entry read from AD.
The pointer was cleared before it is being accessed by the Plug-ins that
call Windows Sync API, e.g., Posix Sync. The bug was introduced by
commit f6397113666f06848412bb12f754f04258cfa5fa.
This patch removed the raw_entry cleanup code in windows_search_entry_ext.
And in case the raw_entry is NULL, pass remote_entry for the AD entry.
https://fedorahosted.org/389/ticket/47989
Reviewed by mreynolds(a)redhat.com (Thank you, Mark!!)
(cherry picked from commit 3305a6b849f79a9684799bec4cc155c7147daea6)
(cherry picked from commit f6d8b2ec3dee5760826892f522c0f1e1989f9fcb)
diff --git a/ldap/servers/plugins/replication/windows_connection.c b/ldap/servers/plugins/replication/windows_connection.c
index e78c367..317386b 100644
--- a/ldap/servers/plugins/replication/windows_connection.c
+++ b/ldap/servers/plugins/replication/windows_connection.c
@@ -814,10 +814,6 @@ next:
slapi_ch_free_string(&filter_copy);
ldap_controls_free(serverctrls_copy);
serverctrls_copy = NULL;
-
- /* clear it here in case the search fails and
- we are left with a bogus old entry */
- windows_private_set_raw_entry(conn->agmt, NULL);
conn->last_ldap_error = ldap_rc;
if (NULL != res)
{
diff --git a/ldap/servers/plugins/replication/windows_protocol_util.c b/ldap/servers/plugins/replication/windows_protocol_util.c
index caeb388..1e31994 100644
--- a/ldap/servers/plugins/replication/windows_protocol_util.c
+++ b/ldap/servers/plugins/replication/windows_protocol_util.c
@@ -1688,7 +1688,9 @@ windows_replay_update(Private_Repl_Protocol *prp, slapi_operation_parameters *op
windows_map_mods_for_replay(prp,op->p.p_modify.modify_mods, &mapped_mods, is_user, &password);
if (is_user) {
winsync_plugin_call_pre_ad_mod_user_mods_cb(prp->agmt,
- windows_private_get_raw_entry(prp->agmt),
+ windows_private_get_raw_entry(prp->agmt)?
+ windows_private_get_raw_entry(prp->agmt):
+ remote_entry,
local_dn,
local_entry,
op->p.p_modify.modify_mods,
@@ -1696,7 +1698,9 @@ windows_replay_update(Private_Repl_Protocol *prp, slapi_operation_parameters *op
&mapped_mods);
} else if (is_group) {
winsync_plugin_call_pre_ad_mod_group_mods_cb(prp->agmt,
- windows_private_get_raw_entry(prp->agmt),
+ windows_private_get_raw_entry(prp->agmt)?
+ windows_private_get_raw_entry(prp->agmt):
+ remote_entry,
local_dn,
local_entry,
op->p.p_modify.modify_mods,
ldap/servers/plugins/replication/windows_connection.c | 4 ----
ldap/servers/plugins/replication/windows_protocol_util.c | 8 ++++++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit f6d8b2ec3dee5760826892f522c0f1e1989f9fcb
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Fri Jan 16 16:28:06 2015 -0800
Ticket #47989 - Windows Sync accidentally cleared raw_entry
Description: raw_entry in the private area in Windows Agreement stores
raw_entry that is un-schema processed last entry read from AD.
The pointer was cleared before it is being accessed by the Plug-ins that
call Windows Sync API, e.g., Posix Sync. The bug was introduced by
commit f6397113666f06848412bb12f754f04258cfa5fa.
This patch removed the raw_entry cleanup code in windows_search_entry_ext.
And in case the raw_entry is NULL, pass remote_entry for the AD entry.
https://fedorahosted.org/389/ticket/47989
Reviewed by mreynolds(a)redhat.com (Thank you, Mark!!)
(cherry picked from commit 3305a6b849f79a9684799bec4cc155c7147daea6)
diff --git a/ldap/servers/plugins/replication/windows_connection.c b/ldap/servers/plugins/replication/windows_connection.c
index e78c367..317386b 100644
--- a/ldap/servers/plugins/replication/windows_connection.c
+++ b/ldap/servers/plugins/replication/windows_connection.c
@@ -814,10 +814,6 @@ next:
slapi_ch_free_string(&filter_copy);
ldap_controls_free(serverctrls_copy);
serverctrls_copy = NULL;
-
- /* clear it here in case the search fails and
- we are left with a bogus old entry */
- windows_private_set_raw_entry(conn->agmt, NULL);
conn->last_ldap_error = ldap_rc;
if (NULL != res)
{
diff --git a/ldap/servers/plugins/replication/windows_protocol_util.c b/ldap/servers/plugins/replication/windows_protocol_util.c
index c424590..dabc936 100644
--- a/ldap/servers/plugins/replication/windows_protocol_util.c
+++ b/ldap/servers/plugins/replication/windows_protocol_util.c
@@ -1689,7 +1689,9 @@ windows_replay_update(Private_Repl_Protocol *prp, slapi_operation_parameters *op
windows_map_mods_for_replay(prp,op->p.p_modify.modify_mods, &mapped_mods, is_user, &password);
if (is_user) {
winsync_plugin_call_pre_ad_mod_user_mods_cb(prp->agmt,
- windows_private_get_raw_entry(prp->agmt),
+ windows_private_get_raw_entry(prp->agmt)?
+ windows_private_get_raw_entry(prp->agmt):
+ remote_entry,
local_dn,
local_entry,
op->p.p_modify.modify_mods,
@@ -1697,7 +1699,9 @@ windows_replay_update(Private_Repl_Protocol *prp, slapi_operation_parameters *op
&mapped_mods);
} else if (is_group) {
winsync_plugin_call_pre_ad_mod_group_mods_cb(prp->agmt,
- windows_private_get_raw_entry(prp->agmt),
+ windows_private_get_raw_entry(prp->agmt)?
+ windows_private_get_raw_entry(prp->agmt):
+ remote_entry,
local_dn,
local_entry,
op->p.p_modify.modify_mods,
ldap/servers/plugins/replication/windows_connection.c | 4 ----
ldap/servers/plugins/replication/windows_protocol_util.c | 8 ++++++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 3305a6b849f79a9684799bec4cc155c7147daea6
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Fri Jan 16 16:28:06 2015 -0800
Ticket #47989 - Windows Sync accidentally cleared raw_entry
Description: raw_entry in the private area in Windows Agreement stores
raw_entry that is un-schema processed last entry read from AD.
The pointer was cleared before it is being accessed by the Plug-ins that
call Windows Sync API, e.g., Posix Sync. The bug was introduced by
commit f6397113666f06848412bb12f754f04258cfa5fa.
This patch removed the raw_entry cleanup code in windows_search_entry_ext.
And in case the raw_entry is NULL, pass remote_entry for the AD entry.
https://fedorahosted.org/389/ticket/47989
Reviewed by mreynolds(a)redhat.com (Thank you, Mark!!)
diff --git a/ldap/servers/plugins/replication/windows_connection.c b/ldap/servers/plugins/replication/windows_connection.c
index e78c367..317386b 100644
--- a/ldap/servers/plugins/replication/windows_connection.c
+++ b/ldap/servers/plugins/replication/windows_connection.c
@@ -814,10 +814,6 @@ next:
slapi_ch_free_string(&filter_copy);
ldap_controls_free(serverctrls_copy);
serverctrls_copy = NULL;
-
- /* clear it here in case the search fails and
- we are left with a bogus old entry */
- windows_private_set_raw_entry(conn->agmt, NULL);
conn->last_ldap_error = ldap_rc;
if (NULL != res)
{
diff --git a/ldap/servers/plugins/replication/windows_protocol_util.c b/ldap/servers/plugins/replication/windows_protocol_util.c
index c424590..dabc936 100644
--- a/ldap/servers/plugins/replication/windows_protocol_util.c
+++ b/ldap/servers/plugins/replication/windows_protocol_util.c
@@ -1689,7 +1689,9 @@ windows_replay_update(Private_Repl_Protocol *prp, slapi_operation_parameters *op
windows_map_mods_for_replay(prp,op->p.p_modify.modify_mods, &mapped_mods, is_user, &password);
if (is_user) {
winsync_plugin_call_pre_ad_mod_user_mods_cb(prp->agmt,
- windows_private_get_raw_entry(prp->agmt),
+ windows_private_get_raw_entry(prp->agmt)?
+ windows_private_get_raw_entry(prp->agmt):
+ remote_entry,
local_dn,
local_entry,
op->p.p_modify.modify_mods,
@@ -1697,7 +1699,9 @@ windows_replay_update(Private_Repl_Protocol *prp, slapi_operation_parameters *op
&mapped_mods);
} else if (is_group) {
winsync_plugin_call_pre_ad_mod_group_mods_cb(prp->agmt,
- windows_private_get_raw_entry(prp->agmt),
+ windows_private_get_raw_entry(prp->agmt)?
+ windows_private_get_raw_entry(prp->agmt):
+ remote_entry,
local_dn,
local_entry,
op->p.p_modify.modify_mods,