Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start using -H instead of deprecated -h and -p. Fixes #49 #59

Merged
merged 4 commits into from
Jun 14, 2024
Merged

Start using -H instead of deprecated -h and -p. Fixes #49 #59

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
411f76d
Start using -H instead of deprecated -h and -p. Fixes #49
gwarf Jun 10, 2024
a1c135d
just use -H, if a port is available in the URI it should be used. If …
gwarf Jun 10, 2024
0e0d95f
Fix parameter
gwarf Jun 11, 2024
1756a2a
Ensure scheme is provided
gwarf Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions bin/bdii-update
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ def read_ldif(source):
# Open pipe to LDIF
if source[:7] == 'ldap://':
url = source.split('/')
command = "ldapsearch -LLL -x -h %s -b %s 2>/dev/null" % (
command = "ldapsearch -LLL -x -H %s -b %s 2>/dev/null" % (
url[2], url[3])
pipe = os.popen(command)
elif source[:7] == 'file://':
Expand Down Expand Up @@ -701,7 +701,7 @@ def main(config, log):
if "o=shadow" in config['BDII_PASSWD']:
if root == "o=grid":
bind = "o=shadow"
input_fh = os.popen(("ldapadd -d 256 -x -c -h %s -p %s"
input_fh = os.popen(("ldapadd -d 256 -x -c -H ldap://%s:%s"
" -D %s -y %s >/dev/null 2>%s") % (
config['BDII_HOSTNAME'],
config['BDII_PORT'],
Expand Down Expand Up @@ -741,7 +741,7 @@ def main(config, log):
if "o=shadow" in config['BDII_PASSWD']:
if root == "o=grid":
bind = "o=shadow"
input_fh = os.popen(("ldapmodify -d 256 -x -c -h %s -p %s -D"
input_fh = os.popen(("ldapmodify -d 256 -x -c -H ldap://%s:%s -D"
" %s -y %s >/dev/null 2>%s") % (
config['BDII_HOSTNAME'],
config['BDII_PORT'],
Expand Down Expand Up @@ -841,7 +841,7 @@ def main(config, log):
if "o=shadow" in config['BDII_PASSWD']:
if root == "o=grid":
bind = "o=shadow"
input_fh = os.popen(("ldapdelete -d 256 -x -c -h %s -p %s"
input_fh = os.popen(("ldapdelete -d 256 -x -c -H ldap://%s:%s"
" -D %s -y %s >/dev/null 2>%s") % (
config['BDII_HOSTNAME'],
config['BDII_PORT'],
Expand Down Expand Up @@ -869,15 +869,15 @@ def main(config, log):
for root in roots.keys():
# Stop flapping due to o=shadow
if root == "o=shadow":
command = ("ldapsearch -LLL -x -h %s -p %s -b %s -s base"
command = ("ldapsearch -LLL -x -H ldap://%s:%s -b %s -s base"
" >> %s/old.ldif 2>> %s/old.err") % (
config['BDII_HOSTNAME'],
config['BDII_PORT'],
root,
config['BDII_VAR_DIR'],
config['BDII_VAR_DIR'])
else:
command = ("ldapsearch -LLL -x -h %s -p %s -b %s"
command = ("ldapsearch -LLL -x -H ldap://%s:%s -b %s"
" >> %s/old.ldif 2>> %s/old.err") % (
config['BDII_HOSTNAME'],
config['BDII_PORT'],
Expand Down Expand Up @@ -917,7 +917,7 @@ def main(config, log):
infosys_output += "replace: Data\n"
infosys_output += "Data: file://%s\n\n" % out_file
try:
output_fh = os.popen(("%s -x -c -h %s -p %s -D o=infosys -y %s"
output_fh = os.popen(("%s -x -c -H ldap://%s:%s -D o=infosys -y %s"
" >/dev/null") % (
command,
config['BDII_HOSTNAME'],
Expand Down Expand Up @@ -989,7 +989,7 @@ def main(config, log):
infosys_output += "-\n"
infosys_output += "\n"
try:
output_fh = os.popen(("%s -x -c -h %s -p %s -D o=infosys -y %s"
output_fh = os.popen(("%s -x -c -H ldap://%s:%s -D o=infosys -y %s"
" >/dev/null") % (
command,
config['BDII_HOSTNAME'],
Expand Down
Loading