Author: mcalmer Date: Mon Aug 11 14:45:15 2008 New Revision: 49943 URL: http://svn.opensuse.org/viewcvs/yast?rev=49943&view=rev Log: apply patch for ldap agent changes Modified: trunk/ca-management/package/yast2-ca-management.changes trunk/ca-management/src/YaPI/CaManagement.pm trunk/ca-management/testsuite/CaTest.pm Modified: trunk/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-management.changes?rev=49943&r1=49942&r2=49943&view=diff ============================================================================== --- trunk/ca-management/package/yast2-ca-management.changes (original) +++ trunk/ca-management/package/yast2-ca-management.changes Mon Aug 11 14:45:15 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Aug 11 14:44:58 CEST 2008 - mc@suse.de + +- apply patch for ldap agent changes + +------------------------------------------------------------------- Wed Jul 2 10:40:03 CEST 2008 - mc@suse.de - version 2.17.1 Modified: trunk/ca-management/src/YaPI/CaManagement.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/YaPI/CaManagement.pm?rev=49943&r1=49942&r2=49943&view=diff ============================================================================== --- trunk/ca-management/src/YaPI/CaManagement.pm (original) +++ trunk/ca-management/src/YaPI/CaManagement.pm Mon Aug 11 14:45:15 2008 @@ -4552,7 +4552,7 @@ * ldapPasswd (required) B<destinationDN> is the DN to the entry where to store -the CA. The following objectclasses are used: +the CA. The following objectClasses are used: * cRLDistributionPoint @@ -4721,7 +4721,7 @@ my $dnList = SCR->Read(".ldap.search", { "base_dn" => $container, - "filter" => 'objectclass=*', + "filter" => 'objectClass=*', "scope" => 0, "dn_only" => 1 }); @@ -4735,7 +4735,7 @@ $dnList = SCR->Read(".ldap.search", { "base_dn" => $data->{'destinationDN'}, - "filter" => 'objectclass=*', + "filter" => 'objectClass=*', "scope" => 0, "dn_only" => 1 }); @@ -4808,7 +4808,7 @@ * ldapPasswd (required) B<destinationDN> is the DN to the entry where to store -the CA. The following objectclasses are used: +the CA. The following objectClasses are used: * cRLDistributionPoint @@ -4976,7 +4976,7 @@ my $dnList = SCR->Read(".ldap.search", { "base_dn" => $container, - "filter" => 'objectclass=*', + "filter" => 'objectClass=*', "scope" => 0, "dn_only" => 1 }); @@ -4990,7 +4990,7 @@ $dnList = SCR->Read(".ldap.search", { "base_dn" => $data->{'destinationDN'}, - "filter" => 'objectclass=*', + "filter" => 'objectClass=*', "scope" => 0, "dn_only" => 1 }); @@ -5011,7 +5011,7 @@ my $attr = SCR->Read(".ldap.search", { "base_dn" => $data->{'destinationDN'}, - "filter" => 'objectclass=cRLDistributionPoint', + "filter" => 'objectClass=cRLDistributionPoint', "scope" => 0, "attrs" => [ "certificateRevocationList" ], }); @@ -5313,7 +5313,7 @@ if(defined $caName && $caName ne "") { $ldapret = SCR->Read(".ldap.search", { "base_dn" => $ldapMap->{'base_config_dn'}, - "filter" => "(& (objectclass=suseCaConfiguration) (cn=$caName))", + "filter" => "(& (objectClass=suseCaConfiguration) (cn=$caName))", "scope" => 2, "not_found_ok" => 1, "attrs" => [ 'suseDefaultBase' ] @@ -5325,14 +5325,14 @@ code => "LDAP_SEARCH_FAILED"); } if(@$ldapret > 0) { - $retMap->{'destinationDN'} = $ldapret->[0]->{susedefaultbase}; + $retMap->{'destinationDN'} = $ldapret->[0]->{suseDefaultBase}; } } if(!exists $retMap->{'destinationDN'} || $retMap->{'destinationDN'} eq "") { $ldapret = SCR->Read(".ldap.search", { "base_dn" => $ldapMap->{'base_config_dn'}, - "filter" => '(& (objectclass=suseCaConfiguration) (cn=defaultCA))', + "filter" => '(& (objectClass=suseCaConfiguration) (cn=defaultCA))', "scope" => 2, "not_found_ok" => 1 }); @@ -5343,7 +5343,7 @@ code => "LDAP_SEARCH_FAILED"); } if(@$ldapret > 0) { - $retMap->{'destinationDN'} = $ldapret->[0]->{susedefaultbase}; + $retMap->{'destinationDN'} = $ldapret->[0]->{suseDefaultBase}; } } @@ -5364,14 +5364,14 @@ if(defined $emailAddresses[0]) { - $filter = "(& (objectclass=inetOrgPerson) (| (cn=$commonName) "; + $filter = "(& (objectClass=inetOrgPerson) (| (cn=$commonName) "; foreach my $em (@emailAddresses) { $filter .= "(mail=$em) "; } $filter .= "))"; } else { - $filter = "(& (objectclass=inetOrgPerson) (cn=$commonName))"; + $filter = "(& (objectClass=inetOrgPerson) (cn=$commonName))"; } $ldapret = SCR->Read(".ldap.search", { @@ -5477,7 +5477,7 @@ $ldapret = SCR->Read(".ldap.search", { "base_dn" => $ldapMap->{'base_config_dn'}, - "filter" => 'objectclass=*', + "filter" => 'objectClass=*', "scope" => 0, "dn_only" => 1 }); @@ -5507,7 +5507,7 @@ $ldapret = SCR->Read(".ldap.search", { "base_dn" => $ldapMap->{'base_config_dn'}, - "filter" => '(& (objectclass=suseCaConfiguration) (cn=defaultCA))', + "filter" => '(& (objectClass=suseCaConfiguration) (cn=defaultCA))', "scope" => 2, "not_found_ok" => 1 }); @@ -5523,7 +5523,7 @@ # search for the default CA container $ldapret = SCR->Read(".ldap.search", { "base_dn" => $defaultCAcontainer, - "filter" => 'objectclass=*', + "filter" => 'objectClass=*', "scope" => 0, "dn_only" => 1 }); @@ -5577,7 +5577,7 @@ Export a Certificate in a LDAP Directory. This function is designed for exporting user certificates. The destination -entry must have the objectclass 'inetOrgPerson'. +entry must have the objectClass 'inetOrgPerson'. In I<$valueMap> you can define the following keys: @@ -5765,7 +5765,7 @@ my $dnList = SCR->Read(".ldap.search", { "base_dn" => $data->{'destinationDN'}, - "filter" => 'objectclass=inetOrgPerson', + "filter" => 'objectClass=inetOrgPerson', "scope" => 0, "dn_only" => 1 }); Modified: trunk/ca-management/testsuite/CaTest.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/testsuite/CaTest.pm?rev=49943&r1=49942&r2=49943&view=diff ============================================================================== --- trunk/ca-management/testsuite/CaTest.pm (original) +++ trunk/ca-management/testsuite/CaTest.pm Mon Aug 11 14:45:15 2008 @@ -905,7 +905,7 @@ my $ldapret = SCR->Read(".ldap.search", { "base_dn" => "dc=suse,dc=de", - "filter" => "(& (objectclass=inetOrgPerson) (cn=x*))", + "filter" => "(& (objectClass=inetOrgPerson) (cn=x*))", "scope" => 2, "not_found_ok" => 1, "dn_only" => 1 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org