Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
List overview
Download
389-commits
August 2014
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
389-commits@lists.fedoraproject.org
5 participants
69 discussions
Start a n
N
ew thread
Branch '389-ds-base-1.2.11' - ldap/admin
by Mark Reynolds
07 Aug '14
07 Aug '14
ldap/admin/src/scripts/repl-monitor.pl.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit 1970a559bfd4e7484acea1b5dcef4e846d4a7b53 Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Thu Aug 7 12:18:57 2014 -0400 Ticket 47862 - repl-monitor fails to convert "*" to default values Bug Description: When specifying the "connection" parameters, you are allowed to use asterisks to signify default values. This was not properly checked in the script, and the the default values were not applied. Fix Description: Properly check for "*" for the bind dn, bind password, and certdir.
https://fedorahosted.org/389/ticket/47862
Reviewed by: nhosoi(Thanks!) (cherry picked from commit a498525a76aaafc7d2979f577d4e7a93a3158d0b) Conflicts: ldap/admin/src/scripts/repl-monitor.pl.in (cherry picked from commit 44c4221d5f6ec3c7e8ca5d3452b24870f7cccf62) diff --git a/ldap/admin/src/scripts/repl-monitor.pl.in b/ldap/admin/src/scripts/repl-monitor.pl.in index 9107c2d..4cb0bef 100755 --- a/ldap/admin/src/scripts/repl-monitor.pl.in +++ b/ldap/admin/src/scripts/repl-monitor.pl.in @@ -1008,7 +1008,10 @@ sub add_server $hostnode = $1 if $host =~ /^(.+?)\./; # new host:port - if (!$binddn || $binddn eq "" || !$bindpwd || $bindpwd eq "" || !$bindcert || $bindcert eq "") { + if (!$binddn || $binddn eq "" || $binddn eq "*" || + !$bindpwd || $bindpwd eq "" || $bindpwd eq "*" || + !$bindcert || $bindcert eq "" || $bindcert eq "*" ) + { # # Look up connection parameter in the order of # host:port @@ -1043,8 +1046,8 @@ sub add_server $binddn = $d; } } - if($prompt eq "yes" && ($w eq "" || (!$bindpwd || $bindpwd eq ""))){ - $bindpwd = passwdPrompt($h, $p); + if($prompt eq "yes" && ($w eq "" || (!$bindpwd || $bindpwd eq "" || $bindpwd eq "*"))){ + $bindpwd = passwdPrompt($h, $p); } elsif ($passwd ne ""){ $bindpwd = $passwd; } else {
1
0
0
0
Branch '389-ds-base-1.3.1' - ldap/admin
by Mark Reynolds
07 Aug '14
07 Aug '14
ldap/admin/src/scripts/repl-monitor.pl.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit 353ede5050cc32cbcffdfb5058726aa989e96d4f Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Thu Aug 7 12:18:57 2014 -0400 Ticket 47862 - repl-monitor fails to convert "*" to default values Bug Description: When specifying the "connection" parameters, you are allowed to use asterisks to signify default values. This was not properly checked in the script, and the the default values were not applied. Fix Description: Properly check for "*" for the bind dn, bind password, and certdir.
https://fedorahosted.org/389/ticket/47862
Reviewed by: nhosoi(Thanks!) (cherry picked from commit a498525a76aaafc7d2979f577d4e7a93a3158d0b) Conflicts: ldap/admin/src/scripts/repl-monitor.pl.in (cherry picked from commit 44c4221d5f6ec3c7e8ca5d3452b24870f7cccf62) diff --git a/ldap/admin/src/scripts/repl-monitor.pl.in b/ldap/admin/src/scripts/repl-monitor.pl.in index 9107c2d..4cb0bef 100755 --- a/ldap/admin/src/scripts/repl-monitor.pl.in +++ b/ldap/admin/src/scripts/repl-monitor.pl.in @@ -1008,7 +1008,10 @@ sub add_server $hostnode = $1 if $host =~ /^(.+?)\./; # new host:port - if (!$binddn || $binddn eq "" || !$bindpwd || $bindpwd eq "" || !$bindcert || $bindcert eq "") { + if (!$binddn || $binddn eq "" || $binddn eq "*" || + !$bindpwd || $bindpwd eq "" || $bindpwd eq "*" || + !$bindcert || $bindcert eq "" || $bindcert eq "*" ) + { # # Look up connection parameter in the order of # host:port @@ -1043,8 +1046,8 @@ sub add_server $binddn = $d; } } - if($prompt eq "yes" && ($w eq "" || (!$bindpwd || $bindpwd eq ""))){ - $bindpwd = passwdPrompt($h, $p); + if($prompt eq "yes" && ($w eq "" || (!$bindpwd || $bindpwd eq "" || $bindpwd eq "*"))){ + $bindpwd = passwdPrompt($h, $p); } elsif ($passwd ne ""){ $bindpwd = $passwd; } else {
1
0
0
0
Branch '389-ds-base-1.3.2' - ldap/admin
by Mark Reynolds
07 Aug '14
07 Aug '14
ldap/admin/src/scripts/repl-monitor.pl.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit 44c4221d5f6ec3c7e8ca5d3452b24870f7cccf62 Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Thu Aug 7 12:18:57 2014 -0400 Ticket 47862 - repl-monitor fails to convert "*" to default values Bug Description: When specifying the "connection" parameters, you are allowed to use asterisks to signify default values. This was not properly checked in the script, and the the default values were not applied. Fix Description: Properly check for "*" for the bind dn, bind password, and certdir.
https://fedorahosted.org/389/ticket/47862
Reviewed by: nhosoi(Thanks!) (cherry picked from commit a498525a76aaafc7d2979f577d4e7a93a3158d0b) Conflicts: ldap/admin/src/scripts/repl-monitor.pl.in diff --git a/ldap/admin/src/scripts/repl-monitor.pl.in b/ldap/admin/src/scripts/repl-monitor.pl.in index 9107c2d..4cb0bef 100755 --- a/ldap/admin/src/scripts/repl-monitor.pl.in +++ b/ldap/admin/src/scripts/repl-monitor.pl.in @@ -1008,7 +1008,10 @@ sub add_server $hostnode = $1 if $host =~ /^(.+?)\./; # new host:port - if (!$binddn || $binddn eq "" || !$bindpwd || $bindpwd eq "" || !$bindcert || $bindcert eq "") { + if (!$binddn || $binddn eq "" || $binddn eq "*" || + !$bindpwd || $bindpwd eq "" || $bindpwd eq "*" || + !$bindcert || $bindcert eq "" || $bindcert eq "*" ) + { # # Look up connection parameter in the order of # host:port @@ -1043,8 +1046,8 @@ sub add_server $binddn = $d; } } - if($prompt eq "yes" && ($w eq "" || (!$bindpwd || $bindpwd eq ""))){ - $bindpwd = passwdPrompt($h, $p); + if($prompt eq "yes" && ($w eq "" || (!$bindpwd || $bindpwd eq "" || $bindpwd eq "*"))){ + $bindpwd = passwdPrompt($h, $p); } elsif ($passwd ne ""){ $bindpwd = $passwd; } else {
1
0
0
0
ldap/admin
by Mark Reynolds
07 Aug '14
07 Aug '14
ldap/admin/src/scripts/repl-monitor.pl.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit a498525a76aaafc7d2979f577d4e7a93a3158d0b Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Thu Aug 7 12:18:57 2014 -0400 Ticket 47862 - repl-monitor fails to convert "*" to default values Bug Description: When specifying the "connection" parameters, you are allowed to use asterisks to signify default values. This was not properly checked in the script, and the the default values were not applied. Fix Description: Properly check for "*" for the bind dn, bind password, and certdir.
https://fedorahosted.org/389/ticket/47862
Reviewed by: nhosoi(Thanks!) diff --git a/ldap/admin/src/scripts/repl-monitor.pl.in b/ldap/admin/src/scripts/repl-monitor.pl.in index 0ded096..3b1cf30 100755 --- a/ldap/admin/src/scripts/repl-monitor.pl.in +++ b/ldap/admin/src/scripts/repl-monitor.pl.in @@ -1086,7 +1086,10 @@ sub add_server $hostnode = $1 if $host =~ /^(.+?)\./; # new host:port - if (!$binddn || $binddn eq "" || !$bindpwd || $bindpwd eq "" || !$bindcert || $bindcert eq "") { + if (!$binddn || $binddn eq "" || $binddn eq "*" || + !$bindpwd || $bindpwd eq "" || $bindpwd eq "*" || + !$bindcert || $bindcert eq "" || $bindcert eq "*" ) + { # # Look up connection parameter in the order of # host:port @@ -1120,7 +1123,7 @@ sub add_server $binddn = $d; } } - if($prompt eq "yes" && ($w eq "" || (!$bindpwd || $bindpwd eq ""))){ + if($prompt eq "yes" && ($w eq "" || (!$bindpwd || $bindpwd eq "" || $bindpwd eq "*"))){ $bindpwd = passwdPrompt($h, $p); } elsif ($passwd ne ""){ $bindpwd = $passwd;
1
0
0
0
Branch '389-ds-base-1.2.11' - ldap/servers
by Noriko Hosoi
06 Aug '14
06 Aug '14
ldap/servers/slapd/opshared.c | 17 ++++++++++------- ldap/servers/slapd/pagedresults.c | 5 +++++ 2 files changed, 15 insertions(+), 7 deletions(-) New commits: commit 96741952eff493cca968914346bab898a064a986 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Tue Jul 8 17:40:00 2014 -0700 Ticket #47824 - paged results control is not working in some cases when we have a subsuffix. Bug Description: When a simple paged result search is run against multiple backends, subsuffix backends were not correctly set to the next loop when crossing the backend boundary. Fix Description: This patch changes the logic to detect the page search finished and set the next backend correctly to the paged- results handle. Also, when reusing the paged result handle in pagedresults_parse_control_value, increment the refcnt.
https://fedorahosted.org/389/ticket/47824
Reviewed by mreynolds(a)redhat.com (Thank you, Mark!!) (cherry picked from commit b116d7e2a7a8e7443be93ecb84efee1364b6ba86) (cherry picked from commit 0bc9016541b7033916bc9ca6636f447a95d33c36) diff --git a/ldap/servers/slapd/opshared.c b/ldap/servers/slapd/opshared.c index 1689283..65fcea6 100644 --- a/ldap/servers/slapd/opshared.c +++ b/ldap/servers/slapd/opshared.c @@ -510,7 +510,6 @@ op_shared_search (Slapi_PBlock *pb, int send_result) err_code = slapi_mapping_tree_select_all(pb, be_list, referral_list, errorbuf); if (((err_code != LDAP_SUCCESS) && (err_code != LDAP_OPERATIONS_ERROR) && (err_code != LDAP_REFERRAL)) || ((err_code == LDAP_OPERATIONS_ERROR) && (be_list[0] == NULL))) - { send_ldap_result(pb, err_code, NULL, errorbuf, 0, NULL); rc = -1; @@ -713,10 +712,6 @@ op_shared_search (Slapi_PBlock *pb, int send_result) curr_search_count = -1; } else { curr_search_count = pnentries; - /* no more entries, but at least another backend */ - if (pagedresults_set_current_be(pb->pb_conn, next_be, pr_idx) < 0) { - goto free_and_return; - } } estimate = 0; } else { @@ -731,12 +726,20 @@ op_shared_search (Slapi_PBlock *pb, int send_result) pagedresults_set_search_result_set_size_estimate(pb->pb_conn, operation, estimate, pr_idx); - next_be = NULL; /* to break the loop */ - if (curr_search_count == -1) { + if (PAGEDRESULTS_SEARCH_END == pr_stat) { pagedresults_lock(pb->pb_conn, pr_idx); slapi_pblock_set(pb, SLAPI_SEARCH_RESULT_SET, NULL); pagedresults_free_one(pb->pb_conn, operation, pr_idx); pagedresults_unlock(pb->pb_conn, pr_idx); + if (next_be) { + /* no more entries, but at least another backend */ + if (pagedresults_set_current_be(pb->pb_conn, next_be, pr_idx) < 0) { + goto free_and_return; + } + } + next_be = NULL; /* to break the loop */ + } else if (PAGEDRESULTS_PAGE_END == pr_stat) { + next_be = NULL; /* to break the loop */ } } else { /* be_suffix null means that we are searching the default backend diff --git a/ldap/servers/slapd/pagedresults.c b/ldap/servers/slapd/pagedresults.c index edd76c6..d589708 100644 --- a/ldap/servers/slapd/pagedresults.c +++ b/ldap/servers/slapd/pagedresults.c @@ -136,6 +136,7 @@ pagedresults_parse_control_value( Slapi_PBlock *pb, } conn->c_pagedresults.prl_count++; } else { + PagedResults *prp = NULL; /* Repeated paged results request. * PagedResults is already allocated. */ char *ptr = slapi_ch_malloc(cookie.bv_len + 1); @@ -143,6 +144,10 @@ pagedresults_parse_control_value( Slapi_PBlock *pb, *(ptr+cookie.bv_len) = '\0'; *index = strtol(ptr, NULL, 10); slapi_ch_free_string(&ptr); + prp = conn->c_pagedresults.prl_list + *index; + if (!(prp->pr_search_result_set)) { /* freed and reused for the next backend. */ + conn->c_pagedresults.prl_count++; + } } /* reset sizelimit */ op->o_pagedresults_sizelimit = -1;
1
0
0
0
Branch '389-ds-base-1.3.2' - ldap/servers
by Noriko Hosoi
06 Aug '14
06 Aug '14
ldap/servers/slapd/opshared.c | 17 ++++++++++------- ldap/servers/slapd/pagedresults.c | 5 +++++ 2 files changed, 15 insertions(+), 7 deletions(-) New commits: commit 0bc9016541b7033916bc9ca6636f447a95d33c36 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Tue Jul 8 17:40:00 2014 -0700 Ticket #47824 - paged results control is not working in some cases when we have a subsuffix. Bug Description: When a simple paged result search is run against multiple backends, subsuffix backends were not correctly set to the next loop when crossing the backend boundary. Fix Description: This patch changes the logic to detect the page search finished and set the next backend correctly to the paged- results handle. Also, when reusing the paged result handle in pagedresults_parse_control_value, increment the refcnt.
https://fedorahosted.org/389/ticket/47824
Reviewed by mreynolds(a)redhat.com (Thank you, Mark!!) (cherry picked from commit b116d7e2a7a8e7443be93ecb84efee1364b6ba86) diff --git a/ldap/servers/slapd/opshared.c b/ldap/servers/slapd/opshared.c index 3fb23fa..e222b05 100644 --- a/ldap/servers/slapd/opshared.c +++ b/ldap/servers/slapd/opshared.c @@ -510,7 +510,6 @@ op_shared_search (Slapi_PBlock *pb, int send_result) err_code = slapi_mapping_tree_select_all(pb, be_list, referral_list, errorbuf); if (((err_code != LDAP_SUCCESS) && (err_code != LDAP_OPERATIONS_ERROR) && (err_code != LDAP_REFERRAL)) || ((err_code == LDAP_OPERATIONS_ERROR) && (be_list[0] == NULL))) - { send_ldap_result(pb, err_code, NULL, errorbuf, 0, NULL); rc = -1; @@ -713,10 +712,6 @@ op_shared_search (Slapi_PBlock *pb, int send_result) curr_search_count = -1; } else { curr_search_count = pnentries; - /* no more entries, but at least another backend */ - if (pagedresults_set_current_be(pb->pb_conn, next_be, pr_idx) < 0) { - goto free_and_return; - } } estimate = 0; } else { @@ -731,12 +726,20 @@ op_shared_search (Slapi_PBlock *pb, int send_result) pagedresults_set_search_result_set_size_estimate(pb->pb_conn, operation, estimate, pr_idx); - next_be = NULL; /* to break the loop */ - if (curr_search_count == -1) { + if (PAGEDRESULTS_SEARCH_END == pr_stat) { pagedresults_lock(pb->pb_conn, pr_idx); slapi_pblock_set(pb, SLAPI_SEARCH_RESULT_SET, NULL); pagedresults_free_one(pb->pb_conn, operation, pr_idx); pagedresults_unlock(pb->pb_conn, pr_idx); + if (next_be) { + /* no more entries, but at least another backend */ + if (pagedresults_set_current_be(pb->pb_conn, next_be, pr_idx) < 0) { + goto free_and_return; + } + } + next_be = NULL; /* to break the loop */ + } else if (PAGEDRESULTS_PAGE_END == pr_stat) { + next_be = NULL; /* to break the loop */ } } else { /* be_suffix null means that we are searching the default backend diff --git a/ldap/servers/slapd/pagedresults.c b/ldap/servers/slapd/pagedresults.c index edd76c6..d589708 100644 --- a/ldap/servers/slapd/pagedresults.c +++ b/ldap/servers/slapd/pagedresults.c @@ -136,6 +136,7 @@ pagedresults_parse_control_value( Slapi_PBlock *pb, } conn->c_pagedresults.prl_count++; } else { + PagedResults *prp = NULL; /* Repeated paged results request. * PagedResults is already allocated. */ char *ptr = slapi_ch_malloc(cookie.bv_len + 1); @@ -143,6 +144,10 @@ pagedresults_parse_control_value( Slapi_PBlock *pb, *(ptr+cookie.bv_len) = '\0'; *index = strtol(ptr, NULL, 10); slapi_ch_free_string(&ptr); + prp = conn->c_pagedresults.prl_list + *index; + if (!(prp->pr_search_result_set)) { /* freed and reused for the next backend. */ + conn->c_pagedresults.prl_count++; + } } /* reset sizelimit */ op->o_pagedresults_sizelimit = -1;
1
0
0
0
Branch '389-ds-base-1.2.11' - ldap/admin
by Mark Reynolds
05 Aug '14
05 Aug '14
ldap/admin/src/scripts/repl-monitor.pl.in | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) New commits: commit c6ad00b236e748470345726dfc18dc5e240159f8 Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Tue Aug 5 10:53:03 2014 -0400 Ticket 47862 - Repl-monitor.pl ignores the provided connection parameters Bug Description: The orignal fix for ticket 47538 was not correctly ported to earlier branches (1.3.2. and down) Fix Description: Added the missing "set_server_params" function.
https://fedorahosted.org/389/ticket/47862
Reviewed by: nhosoi(Thanks!) (cherry picked from commit 7c5d8f2d31d804d516f0ff1cc85d381303582a2d) diff --git a/ldap/admin/src/scripts/repl-monitor.pl.in b/ldap/admin/src/scripts/repl-monitor.pl.in index 45d58a1..9107c2d 100755 --- a/ldap/admin/src/scripts/repl-monitor.pl.in +++ b/ldap/admin/src/scripts/repl-monitor.pl.in @@ -281,6 +281,7 @@ $prompt = ""; # Start with the given host and port # The index names in %ld are defined in Mozilla::LDAP::Utils::ldapArgs() + &set_server_params(); &add_server ("$ld{host}:$ld{port}:$ld{bind}:$ld{pswd}:$ld{cert}"); $serveridx = 0; @@ -325,6 +326,32 @@ sub validateArgs return $rc; } +sub set_server_params +{ + my ($host, $port, $binddn, $bindpwd, $bindcert); + + ($host, $port, $binddn, $bindpwd, $bindcert) = split (/:/, $allconnections[0]); + if($opt_p && $opt_p ne ""){ + $ld{port} = $opt_p + } elsif(!$port || $port eq ""){ + $ld{port} = "389"; + } else { + $ld{port} = $port; + } + if($host && $host ne ""){ + $ld{host} = $host; + } + if($binddn){ + $ld{bind} = $binddn; + } + if($bindpwd){ + $ld{pswd} = $bindpwd; + } + if($bindcert){ + $ld{cert} = $bindcert; + } +} + sub read_cfg_file { ($fn) = @_;
1
0
0
0
Branch '389-ds-base-1.3.1' - ldap/admin
by Mark Reynolds
05 Aug '14
05 Aug '14
ldap/admin/src/scripts/repl-monitor.pl.in | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) New commits: commit 0d7830106755a44255d135aeaf42ad62fb505fc3 Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Tue Aug 5 10:53:03 2014 -0400 Ticket 47862 - Repl-monitor.pl ignores the provided connection parameters Bug Description: The orignal fix for ticket 47538 was not correctly ported to earlier branches (1.3.2. and down) Fix Description: Added the missing "set_server_params" function.
https://fedorahosted.org/389/ticket/47862
Reviewed by: nhosoi(Thanks!) (cherry picked from commit 7c5d8f2d31d804d516f0ff1cc85d381303582a2d) diff --git a/ldap/admin/src/scripts/repl-monitor.pl.in b/ldap/admin/src/scripts/repl-monitor.pl.in index 45d58a1..9107c2d 100755 --- a/ldap/admin/src/scripts/repl-monitor.pl.in +++ b/ldap/admin/src/scripts/repl-monitor.pl.in @@ -281,6 +281,7 @@ $prompt = ""; # Start with the given host and port # The index names in %ld are defined in Mozilla::LDAP::Utils::ldapArgs() + &set_server_params(); &add_server ("$ld{host}:$ld{port}:$ld{bind}:$ld{pswd}:$ld{cert}"); $serveridx = 0; @@ -325,6 +326,32 @@ sub validateArgs return $rc; } +sub set_server_params +{ + my ($host, $port, $binddn, $bindpwd, $bindcert); + + ($host, $port, $binddn, $bindpwd, $bindcert) = split (/:/, $allconnections[0]); + if($opt_p && $opt_p ne ""){ + $ld{port} = $opt_p + } elsif(!$port || $port eq ""){ + $ld{port} = "389"; + } else { + $ld{port} = $port; + } + if($host && $host ne ""){ + $ld{host} = $host; + } + if($binddn){ + $ld{bind} = $binddn; + } + if($bindpwd){ + $ld{pswd} = $bindpwd; + } + if($bindcert){ + $ld{cert} = $bindcert; + } +} + sub read_cfg_file { ($fn) = @_;
1
0
0
0
Branch '389-ds-base-1.3.2' - ldap/admin
by Mark Reynolds
05 Aug '14
05 Aug '14
ldap/admin/src/scripts/repl-monitor.pl.in | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) New commits: commit 7c5d8f2d31d804d516f0ff1cc85d381303582a2d Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Tue Aug 5 10:53:03 2014 -0400 Ticket 47862 - Repl-monitor.pl ignores the provided connection parameters Bug Description: The orignal fix for ticket 47538 was not correctly ported to earlier branches (1.3.2. and down) Fix Description: Added the missing "set_server_params" function.
https://fedorahosted.org/389/ticket/47862
Reviewed by: nhosoi(Thanks!) diff --git a/ldap/admin/src/scripts/repl-monitor.pl.in b/ldap/admin/src/scripts/repl-monitor.pl.in index 45d58a1..9107c2d 100755 --- a/ldap/admin/src/scripts/repl-monitor.pl.in +++ b/ldap/admin/src/scripts/repl-monitor.pl.in @@ -281,6 +281,7 @@ $prompt = ""; # Start with the given host and port # The index names in %ld are defined in Mozilla::LDAP::Utils::ldapArgs() + &set_server_params(); &add_server ("$ld{host}:$ld{port}:$ld{bind}:$ld{pswd}:$ld{cert}"); $serveridx = 0; @@ -325,6 +326,32 @@ sub validateArgs return $rc; } +sub set_server_params +{ + my ($host, $port, $binddn, $bindpwd, $bindcert); + + ($host, $port, $binddn, $bindpwd, $bindcert) = split (/:/, $allconnections[0]); + if($opt_p && $opt_p ne ""){ + $ld{port} = $opt_p + } elsif(!$port || $port eq ""){ + $ld{port} = "389"; + } else { + $ld{port} = $port; + } + if($host && $host ne ""){ + $ld{host} = $host; + } + if($binddn){ + $ld{bind} = $binddn; + } + if($bindpwd){ + $ld{pswd} = $bindpwd; + } + if($bindcert){ + $ld{cert} = $bindcert; + } +} + sub read_cfg_file { ($fn) = @_;
1
0
0
0
← Newer
1
2
3
4
5
6
7
Older →
Jump to page:
1
2
3
4
5
6
7
Results per page:
10
25
50
100
200