IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use byte literals where appropriate

Browse Source 
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
This commit is contained in:
Jan Cholasta
2015-09-01 13:22:04 +02:00
parent ba5201979d
commit 33aba6f35e
7 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ipaserver/install/plugins/upload_cacrt.py
View File

@@ -87,7 +87,7 @@ class update_upload_cacrt(Updater):
entry.single_value['cACertificate;binary'] = ca_cert
ldap.add_entry(entry)
else:
if '' in entry['cACertificate;binary']:
if b'' in entry['cACertificate;binary']:
entry.single_value['cACertificate;binary'] = ca_cert
ldap.update_entry(entry)

12
ipaserver/install/replication.py
View File

@@ -1260,7 +1260,7 @@ class ReplicationManager(object):
sub = {'suffix': self.suffix, 'fqdn': replica}
try:
entry.raw['aci'].remove(
'(target = "ldap:///cn=*,cn=ca_renewal,cn=ipa,cn=etc,'
b'(target = "ldap:///cn=*,cn=ca_renewal,cn=ipa,cn=etc,'
'%(suffix)s")(version 3.0; acl "Add CA Certificates for '
'renewals"; allow(add) userdn = "ldap:///fqdn=%(fqdn)s,'
'cn=computers,cn=accounts,%(suffix)s";)' % sub)
@@ -1268,7 +1268,7 @@ class ReplicationManager(object):
pass
try:
entry.raw['aci'].remove(
'(target = "ldap:///cn=*,cn=ca_renewal,cn=ipa,cn=etc,'
b'(target = "ldap:///cn=*,cn=ca_renewal,cn=ipa,cn=etc,'
'%(suffix)s")(targetattr = "userCertificate")'
'(version 3.0; acl "Modify CA Certificates for renewals"; '
'allow(write) userdn = "ldap:///fqdn=%(fqdn)s,'
@@ -1277,7 +1277,7 @@ class ReplicationManager(object):
pass
try:
entry.raw['aci'].remove(
'(target = "ldap:///cn=CAcert,cn=ipa,cn=etc,%(suffix)s")'
b'(target = "ldap:///cn=CAcert,cn=ipa,cn=etc,%(suffix)s")'
'(targetattr = cACertificate)(version 3.0; acl "Modify CA '
'Certificate"; allow (write) userdn = "ldap:///fqdn='
'%(fqdn)s,cn=computers,cn=accounts,%(suffix)s";)' % sub)
@@ -1305,7 +1305,7 @@ class ReplicationManager(object):
sub = {'suffix': self.suffix, 'fqdn': replica}
try:
entry.raw['aci'].remove(
'(targetfilter = "(objectClass=nsContainer)")'
b'(targetfilter = "(objectClass=nsContainer)")'
'(targetattr = "cn || objectClass || ipaConfigString")'
'(version 3.0; acl "Read IPA Masters"; allow (read, '
'search, compare) userdn = "ldap:///fqdn=%(fqdn)s,'
@@ -1314,7 +1314,7 @@ class ReplicationManager(object):
pass
try:
entry.raw['aci'].remove(
'(targetfilter = "(objectClass=nsContainer)")'
b'(targetfilter = "(objectClass=nsContainer)")'
'(targetattr = "ipaConfigString")(version 3.0; acl '
'"Modify IPA Masters"; allow (write) userdn = '
'"ldap:///fqdn=%(fqdn)s,cn=computers,cn=accounts,'
@@ -1343,7 +1343,7 @@ class ReplicationManager(object):
sub = {'suffix': self.suffix, 'fqdn': replica}
try:
entry.raw['aci'].remove(
'(targetfilter = "(&(objectClass=ipaCertificate)'
b'(targetfilter = "(&(objectClass=ipaCertificate)'
'(ipaConfigString=ipaCA))")(targetattr = '
'"ipaCertIssuerSerial || cACertificate")(version 3.0; acl '
'"Modify CA Certificate Store Entry"; allow (write) '