From b9ea3fcbdb9ab07153873aeea7d3e1bd69e0d065 Mon Sep 17 00:00:00 2001 From: Florence Blanc-Renaud Date: Jan 10 2023 09:11:45 +0000 Subject: pylint: fix duplicate-value Related: https://pagure.io/freeipa/issue/9278 Signed-off-by: Florence Blanc-Renaud Reviewed-By: Stanislav Levin --- diff --git a/ipaserver/plugins/automount.py b/ipaserver/plugins/automount.py index 03f994c..ebb0c32 100644 --- a/ipaserver/plugins/automount.py +++ b/ipaserver/plugins/automount.py @@ -233,7 +233,7 @@ class automountlocation(LDAPObject): 'ipapermdefaultattr': { 'cn', 'objectclass', 'automountinformation', 'automountkey', 'description', - 'automountmapname', 'description', + 'automountmapname', }, }, 'System: Add Automount Locations': { diff --git a/ipaserver/plugins/cert.py b/ipaserver/plugins/cert.py index 62e12bb..1ab8859 100644 --- a/ipaserver/plugins/cert.py +++ b/ipaserver/plugins/cert.py @@ -568,13 +568,13 @@ class certreq(BaseCertObject): 'request_type', default=u'pkcs10', autofill=True, - flags={'no_option', 'no_update', 'no_update', 'no_search'}, + flags={'no_option', 'no_update', 'no_search'}, ), Str( 'profile_id?', validate_profile_id, label=_("Profile ID"), doc=_("Certificate Profile to use"), - flags={'no_update', 'no_update', 'no_search'}, + flags={'no_update', 'no_search'}, ), Str( 'cert_request_status', diff --git a/ipaserver/plugins/host.py b/ipaserver/plugins/host.py index 2470ec4..83d670e 100644 --- a/ipaserver/plugins/host.py +++ b/ipaserver/plugins/host.py @@ -332,7 +332,7 @@ class host(LDAPObject): 'nshostlocation', 'nsosversion', 'objectclass', 'serverhostname', 'usercertificate', 'userclass', 'enrolledby', 'managedby', 'ipaassignedidview', - 'krbprincipalname', 'krbcanonicalname', 'krbprincipalaliases', + 'krbcanonicalname', 'krbprincipalaliases', 'krbprincipalexpiration', 'krbpasswordexpiration', 'krblastpwdchange', 'krbprincipalauthind', }, diff --git a/ipaserver/plugins/sudorule.py b/ipaserver/plugins/sudorule.py index 7b90ca8..fe6d3aa 100644 --- a/ipaserver/plugins/sudorule.py +++ b/ipaserver/plugins/sudorule.py @@ -223,8 +223,8 @@ class sudorule(LDAPObject): 'ipasudorunasextuser', 'ipasudorunasextgroup', 'memberdenycmd', 'memberallowcmd', 'memberuser', 'memberhost', 'externalhost', 'sudonotafter', 'hostmask', 'sudoorder', 'sudonotbefore', - 'ipasudorunas', 'externalhost', 'ipasudorunasgroup', - 'ipasudoopt', 'memberhost', + 'ipasudorunas', 'ipasudorunasgroup', + 'ipasudoopt', }, 'replaces': [ '(targetattr = "description || ipaenabledflag || usercategory || hostcategory || cmdcategory || ipasudorunasusercategory || ipasudorunasgroupcategory || externaluser || ipasudorunasextuser || ipasudorunasextgroup || memberdenycmd || memberallowcmd || memberuser")(target = "ldap:///ipauniqueid=*,cn=sudorules,cn=sudo,$SUFFIX")(version 3.0;acl "permission:Modify Sudo rule";allow (write) groupdn = "ldap:///cn=Modify Sudo rule,cn=permissions,cn=pbac,$SUFFIX";)', diff --git a/ipatests/test_xmlrpc/tracker/caacl_plugin.py b/ipatests/test_xmlrpc/tracker/caacl_plugin.py index 7b55b04..e724953 100644 --- a/ipatests/test_xmlrpc/tracker/caacl_plugin.py +++ b/ipatests/test_xmlrpc/tracker/caacl_plugin.py @@ -39,7 +39,7 @@ class CAACLTracker(Tracker): u'ipamemberca_ca'} category_keys = { u'ipacacategory', u'ipacertprofilecategory', u'usercategory', - u'hostcategory', u'servicecategory', u'ipacacategory'} + u'hostcategory', u'servicecategory'} retrieve_keys = { u'dn', u'cn', u'description', u'ipaenabledflag', u'ipamemberca', u'ipamembercertprofile', u'memberuser',