January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60359 - in /branches/SuSE-Code-11-SP1-Branch/packager: VERSION package/yast2-packager.changes src/modules/Packages.ycp
by lslezak＠svn.opensuse.org 14 Jan '10

14 Jan '10

Author: lslezak Date: Thu Jan 14 14:44:01 2010 New Revision: 60359 URL: http://svn.opensuse.org/viewcvs/yast?rev=60359&view=rev Log: - install also xorg-x11-fonts package when remote X or VNC installation is used (bnc#570363) - 2.17.68 Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/modules/Packages.ycp Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Thu Jan 14 14:44:01 2010 @@ -1 +1 @@ -2.17.67 +2.17.68 Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Thu Jan 14 14:44:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 14 13:40:25 UTC 2010 - lslezak(a)suse.cz + +- install also xorg-x11-fonts package when remote X or VNC + installation is used (bnc#570363) +- 2.17.68 + +------------------------------------------------------------------- Mon Jan 11 13:57:26 CET 2010 - locilka(a)suse.cz - Fixed switching license language in ProductLicense. Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/Packages.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/Packages.ycp Thu Jan 14 14:44:01 2010 @@ -718,6 +718,7 @@ packages = add (packages, "tightvnc"); packages = add (packages, "yast2-qt"); packages = add (packages, "xorg-x11"); + packages = add (packages, "xorg-x11-fonts"); packages = add (packages, "icewm"); packages = add (packages, "sax2-tools"); packages = add (packages, "xinetd"); @@ -728,6 +729,7 @@ { packages = add (packages, "yast2-qt"); packages = add (packages, "xorg-x11"); + packages = add (packages, "xorg-x11-fonts"); packages = add (packages, "icewm"); packages = add (packages, "sax2-tools"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60358 - in /trunk/ca-management/src: YaPI/CaManagement.pm new_cert_read_write.ycp util.ycp
by mcalmer＠svn.opensuse.org 14 Jan '10

14 Jan '10

Author: mcalmer Date: Thu Jan 14 12:53:46 2010 New Revision: 60358 URL: http://svn.opensuse.org/viewcvs/yast?rev=60358&view=rev Log: implement export certificate key to file (fate#305490) Modified: trunk/ca-management/src/YaPI/CaManagement.pm trunk/ca-management/src/new_cert_read_write.ycp trunk/ca-management/src/util.ycp Modified: trunk/ca-management/src/YaPI/CaManagement.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/YaPI/CaManagem… ============================================================================== --- trunk/ca-management/src/YaPI/CaManagement.pm (original) +++ trunk/ca-management/src/YaPI/CaManagement.pm Thu Jan 14 12:53:46 2010 @@ -14,21 +14,21 @@ # my $comp = new LIMAL::StringArray(); # $comp->push_back("*"); - + # my $cat = new LIMAL::StringArray(); # $cat->push_back("FATAL"); # $cat->push_back("ERROR"); # $cat->push_back("INFO"); - + # my $logref = LIMAL::Logger::createFileLogger("YaPI::CaManagement", $comp, $cat, - # "[%d] %p %c %l - %m", + # "[%d] %p %c %l - %m", # "/var/log/YaST2/limal-ca-mgm.log", # 2048, 2); # LIMAL::Logger::setDefaultLogger($logref); #}; # ignore errors here; If we run as none root this happens - + } @@ -78,7 +78,7 @@ $name = AddRequest($valueMap) create a request for a special CA and returns the name - + $name = IssueCertificate($valueMap) issue a certificate and returns the name of the new certificate @@ -98,7 +98,7 @@ $cert = ReadCertificate($valueMap) returns a certificate as plain text or parsed map - + $bool = RevokeCertificate($valueMap) revoke a certificate @@ -204,7 +204,7 @@ =head1 COMMON PARAMETER -Here is a list of common parameter which are often +Here is a list of common parameter which are often used in I<$valueMap> =over 2 @@ -223,12 +223,12 @@ newCaName <directory Name> =item * -request => <filename> +request => <filename> (without suffix) =item * -certificate => <filename> +certificate => <filename> (without suffix) @@ -239,7 +239,7 @@ caPasswd => <string> =item * -commonName => <String> +commonName => <String> (ascii) @@ -278,9 +278,9 @@ =item * crlReason => <value> - allowed values are: + allowed values are: - unspecified, keyCompromise, CACompromise, affiliationChanged, + unspecified, keyCompromise, CACompromise, affiliationChanged, superseded, cessationOfOperation, certificateHold =back @@ -310,7 +310,7 @@ allowed values are: - digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment, + digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment, keyAgreement, keyCertSign, cRLSign, encipherOnly, decipherOnly =item * @@ -332,7 +332,7 @@ allowed values are: - email:<email-address>, URI:<URL>, DNS:<domain_name>, + email:<email-address>, URI:<URL>, DNS:<domain_name>, RID:<object_identifier>, IP:<ip_address>, email:copy =item * @@ -340,7 +340,7 @@ allowed values are: - email:<email-address>, URI:<URL>, DNS:<domain_name>, + email:<email-address>, URI:<URL>, DNS:<domain_name>, RID:<object_identifier>, IP:<ip_address>, issuer:copy =item * @@ -366,8 +366,8 @@ allowed values are: - serverAuth, clientAuth, codeSigning, emailProtection, timeStamping, - msCodeInd, msCodeCom, msCTLSign, msSGC, msEFS, nsSGC, + serverAuth, clientAuth, codeSigning, emailProtection, timeStamping, + msCodeInd, msCodeCom, msCTLSign, msSGC, msEFS, nsSGC, <object_identifier> a list of explanation: @@ -389,7 +389,7 @@ accessOID can be: OCSP, caIssuers or a <object_identifier> - location can be: email:<email-address>, URI:<URL>, DNS:<domain_name>, + location can be: email:<email-address>, URI:<URL>, DNS:<domain_name>, RID:<object_identifier>, IP:<ip_address> =item * @@ -465,7 +465,7 @@ if(defined $repository) { $list = LIMAL::CaMgm::CA::getCAList($repository); - + } else { $list = LIMAL::CaMgm::CA::getCAList(); @@ -478,7 +478,7 @@ } }; if($@) { - return $self->SetError( summary => __("Cannot read CA list."), + return $self->SetError( summary => __("Cannot read CA list."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); } @@ -488,12 +488,12 @@ =item * C<$caList = ReadCATree()> -Returns a list of lists of the available CAs +Returns a list of lists of the available CAs containing the issuer caName. * $caList->[$x]->[0] is the caName -* $caList->[$x]->[1] is the issuer caName +* $caList->[$x]->[1] is the issuer caName If the issuer caName is empty caName is a root CA. The list is sorted by the first element. @@ -521,9 +521,9 @@ my $tree = undef; if(defined $repository) { - + $tree = LIMAL::CaMgm::CA::getCATree($repository); - + } else { $tree = LIMAL::CaMgm::CA::getCATree(); @@ -539,7 +539,7 @@ } }; if($@) { - return $self->SetError( summary => __("Cannot read CA tree."), + return $self->SetError( summary => __("Cannot read CA tree."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); } @@ -615,7 +615,7 @@ * crlDistributionPoints -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. EXAMPLE: @@ -634,7 +634,7 @@ my $res = YaPI::CaManagement->AddRootCA($data); if( not defined $res ) { - # error + # error } else { print "OK\n"; } @@ -687,21 +687,21 @@ } my $rgd = undef; eval { - + if( defined $data->{'repository'}) { - + $rgd = LIMAL::CaMgm::CA::getRootCARequestDefaults($data->{'repository'}); - + } else { - + $rgd = LIMAL::CaMgm::CA::getRootCARequestDefaults(); - + } my $dnl = $rgd->getSubjectDN()->getDN(); my @DN_Values = ('countryName', 'stateOrProvinceName', 'localityName', 'organizationName', 'organizationalUnitName', 'commonName', 'emailAddress'); - + for(my $dnit = $dnl->begin(); !$dnl->iterator_equal($dnit, $dnl->end()); $dnl->iterator_incr($dnit)) @@ -711,7 +711,7 @@ if($dnl->iterator_value($dnit)->getType() =~ /^$v$/i) { if(defined $data->{$v}) { - + $dnl->iterator_value($dnit)->setRDNValue($data->{$v}); } else { @@ -749,7 +749,7 @@ my $exts = $rgd->getExtensions(); - my $e = YaST::caUtils->transformBasicConstaints($exts, + my $e = YaST::caUtils->transformBasicConstaints($exts, $data->{'basicConstraints'}); if(!defined $e) { return undef; @@ -759,24 +759,24 @@ }; if($@) { - + return $self->SetError( summary => __("Modifying RequestGenerationData failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); } - - + + my $cid = undef; eval { if( defined $data->{'repository'}) { - + $cid = LIMAL::CaMgm::CA::getRootCAIssueDefaults($data->{'repository'}); - + } else { - + $cid = LIMAL::CaMgm::CA::getRootCAIssueDefaults(); - + } my $start = time(); @@ -785,56 +785,56 @@ $cid->setCertifyPeriode($start, $end); my $exts = $cid->getExtensions(); - - my $e = YaST::caUtils->transformBasicConstaints($exts, + + my $e = YaST::caUtils->transformBasicConstaints($exts, $data->{'basicConstraints'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsComment", $data->{'nsComment'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsBaseUrl", $data->{'nsBaseUrl'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsRevocationUrl", $data->{'nsRevocationUrl'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsCaRevocationUrl", $data->{'nsCaRevocationUrl'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsRenewalUrl", $data->{'nsRenewalUrl'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsSslServerName", $data->{'nsSslServerName'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsCaPolicyUrl", $data->{'nsCaPolicyUrl'}); if(!defined $e) { @@ -908,10 +908,10 @@ eval { if( defined $data->{'repository'}) { - + LIMAL::CaMgm::CA::createRootCA($data->{'caName'}, $data->{'keyPasswd'}, - $rgd, $cid, + $rgd, $cid, $data->{'repository'}); } else { @@ -987,11 +987,11 @@ * DN -I<DN> is a hash which contains some values of the +I<DN> is a hash which contains some values of the subject of the CA Certificate (if caName is defined) -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. EXAMPLE: @@ -1002,7 +1002,7 @@ 'caName' => 'My_CA', 'certType' => 'client' } - $certValueMap = YaPI::CaManagement->ReadCertificateDefaults($data) + $certValueMap = YaPI::CaManagement->ReadCertificateDefaults($data) if( not defined $certValueMap ) { # error } else { @@ -1012,7 +1012,7 @@ =cut BEGIN { $TYPEINFO{ReadCertificateDefaults} = [ - "function", + "function", ["map", "string", "any"], ["map", "string", "any"] ]; } @@ -1029,7 +1029,7 @@ if (defined $data->{"caName"}) { $caName = $data->{"caName"}; - } + } if (defined $data->{"certType"}) { $certType = $data->{"certType"}; } else { @@ -1057,11 +1057,11 @@ 'authorityInfoAccess' => undef, 'crlDistributionPoints' => undef }; - + my $ca = undef; my $rgd = undef; my $cid = undef; - + my $rType = 0; my $cType = 0; @@ -1079,16 +1079,16 @@ } if(defined $data->{'caName'} && $data->{'caName'} ne "") { - + if(defined $data->{'repository'}) { - - $ca = new LIMAL::CaMgm::CA($data->{'caName'}, + + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}, $data->{'repository'}); } else { - + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}); - + } $rgd = $ca->getRequestDefaults($rType); @@ -1097,15 +1097,15 @@ } else { if( defined $data->{'repository'}) { - + $rgd = LIMAL::CaMgm::CA::getRootCARequestDefaults($data->{'repository'}); $cid = LIMAL::CaMgm::CA::getRootCAIssueDefaults($data->{'repository'}); - + } else { - + $rgd = LIMAL::CaMgm::CA::getRootCARequestDefaults(); $cid = LIMAL::CaMgm::CA::getRootCAIssueDefaults(); - + } } @@ -1118,19 +1118,19 @@ return undef; } - $e = YaST::caUtils->extractStringExtension($cext->getNsComment(), + $e = YaST::caUtils->extractStringExtension($cext->getNsComment(), "nsComment", $ret); if(!defined $e) { return undef; } - $e = YaST::caUtils->extractStringExtension($cext->getNsBaseUrl(), + $e = YaST::caUtils->extractStringExtension($cext->getNsBaseUrl(), "nsBaseUrl", $ret); if(!defined $e) { return undef; } - $e = YaST::caUtils->extractStringExtension($cext->getNsRevocationUrl(), + $e = YaST::caUtils->extractStringExtension($cext->getNsRevocationUrl(), "nsRevocationUrl", $ret); if(!defined $e) { return undef; @@ -1148,13 +1148,13 @@ return undef; } - $e = YaST::caUtils->extractStringExtension($cext->getNsSslServerName(), + $e = YaST::caUtils->extractStringExtension($cext->getNsSslServerName(), "nsSslServerName", $ret); if(!defined $e) { return undef; } - $e = YaST::caUtils->extractStringExtension($cext->getNsCaPolicyUrl(), + $e = YaST::caUtils->extractStringExtension($cext->getNsCaPolicyUrl(), "nsCaPolicyUrl", $ret); if(!defined $e) { return undef; @@ -1221,7 +1221,7 @@ for(my $it = $list->begin(); !$list->iterator_equal($it, $list->end()); - $list->iterator_incr($it)) + $list->iterator_incr($it)) { my $type = $list->iterator_value($it)->getType(); my $value = $list->iterator_value($it)->getValue(); @@ -1299,7 +1299,7 @@ * keyLength -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. The return value is "undef" on an error and "1" on success. @@ -1332,7 +1332,7 @@ if (not defined YaST::caUtils->checkCommonValues($data)) { return $self->SetError(%{YaST::caUtils->Error()}); } - + # checking requires if (!defined $data->{"caName"}) { # parameter check failed @@ -1340,7 +1340,7 @@ code => "CHECK_PARAM_FAILED"); } $caName = $data->{"caName"}; - + if(! defined $data->{"certType"}) { # parameter check failed return $self->SetError( summary => __("Missing value 'certType'."), @@ -1352,8 +1352,8 @@ eval { if( defined $data->{'repository'}) { - - $ca = new LIMAL::CaMgm::CA($data->{"caName"}, + + $ca = new LIMAL::CaMgm::CA($data->{"caName"}, $data->{'caPasswd'}, $data->{"repository"}); } else { @@ -1363,7 +1363,7 @@ } }; if($@) { - + return $self->SetError( summary => __("Initializing the CA failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -1394,58 +1394,58 @@ $cid->setCertifyPeriode($start, $end); } - + my $exts = $cid->getExtensions(); - - my $e = YaST::caUtils->transformBasicConstaints($exts, + + my $e = YaST::caUtils->transformBasicConstaints($exts, $data->{'basicConstraints'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsComment", $data->{'nsComment'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsBaseUrl", $data->{'nsBaseUrl'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsRevocationUrl", $data->{'nsRevocationUrl'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsCaRevocationUrl", $data->{'nsCaRevocationUrl'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsRenewalUrl", $data->{'nsRenewalUrl'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsSslServerName", $data->{'nsSslServerName'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsCaPolicyUrl", $data->{'nsCaPolicyUrl'}); if(!defined $e) { @@ -1518,7 +1518,7 @@ my $rgd = undef; eval { - + $rgd = $ca->getRequestDefaults($rtype); if( defined $data->{"keyLength"}) { @@ -1528,20 +1528,20 @@ my $exts = $rgd->getExtensions(); - my $e = YaST::caUtils->transformBasicConstaints($exts, + my $e = YaST::caUtils->transformBasicConstaints($exts, $data->{'basicConstraints'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsComment", $data->{'nsComment'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsSslServerName", $data->{'nsSslServerName'}); if(!defined $e) { @@ -1582,7 +1582,7 @@ }; if($@) { - + return $self->SetError( summary => __("Modifying RequestGenerationData failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -1613,12 +1613,12 @@ y2error($Varray->getitem($i)); } } - + return $self->SetError( summary => __("Writing the defaults failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); } - + return 1; } @@ -1679,8 +1679,8 @@ code => "PARAM_CHECK_FAILED"); } $caName = $data->{"caName"}; - - if (! defined $data->{"type"} || + + if (! defined $data->{"type"} || !grep( ( $_ eq $data->{"type"}), ("parsed", "plain", "extended"))) { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'type'."), @@ -1691,22 +1691,22 @@ my $ca = undef; eval { if(defined $data->{'repository'}) { - - $ca = new LIMAL::CaMgm::CA($data->{'caName'}, + + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}, $data->{'repository'}); - + } else { - + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}); - + } my $cert = $ca->getCA(); if ($type eq "parsed" || $type eq "extended") { - + $ret = YaST::caUtils->getParsed($cert); my $repos = "$CAM_ROOT"; if(defined $data->{repository}) { @@ -1725,10 +1725,10 @@ } else { $ret = $cert->getCertificateAsText(); } - + }; if($@) { - + return $self->SetError( summary => __("Parsing the CA failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -1783,7 +1783,7 @@ * extendedKeyUsage -The return value is "undef" on an error and the +The return value is "undef" on an error and the filename(without suffix) of the request on success. The syntax of these values are explained in the @@ -1806,7 +1806,7 @@ }; my $res = YaPI::CaManagement->AddRequest($data); if( not defined $res ) { - # error + # error } else { print "OK Name of the request is: '$res'\n"; } @@ -1854,8 +1854,8 @@ eval { if( defined $data->{'repository'}) { - - $ca = new LIMAL::CaMgm::CA($data->{"caName"}, + + $ca = new LIMAL::CaMgm::CA($data->{"caName"}, $data->{'caPasswd'}, $data->{"repository"}); } else { @@ -1865,7 +1865,7 @@ } }; if($@) { - + return $self->SetError( summary => __("Initializing the CA failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -1873,14 +1873,14 @@ my $rgd = undef; eval { - + $rgd = $ca->getRequestDefaults($LIMAL::CaMgm::E_Client_Req); - + my $dnl = $rgd->getSubjectDN()->getDN(); my @DN_Values = ('countryName', 'stateOrProvinceName', 'localityName', 'organizationName', 'organizationalUnitName', 'commonName', 'emailAddress'); - + for(my $dnit = $dnl->begin(); !$dnl->iterator_equal($dnit, $dnl->end()); $dnl->iterator_incr($dnit)) @@ -1890,7 +1890,7 @@ if($dnl->iterator_value($dnit)->getType() =~ /^$v$/i) { if(defined $data->{$v}) { - + $dnl->iterator_value($dnit)->setRDNValue($data->{$v}); } else { @@ -1928,20 +1928,20 @@ my $exts = $rgd->getExtensions(); - my $e = YaST::caUtils->transformBasicConstaints($exts, + my $e = YaST::caUtils->transformBasicConstaints($exts, $data->{'basicConstraints'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsComment", $data->{'nsComment'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsSslServerName", $data->{'nsSslServerName'}); if(!defined $e) { @@ -1982,7 +1982,7 @@ }; if($@) { - + return $self->SetError( summary => __("Modifying RequestGenerationData failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -1996,7 +1996,7 @@ }; if($@) { - + return $self->SetError( summary => __("Creating request failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -2010,7 +2010,7 @@ Issue a certificate and returns the name of the new certificate. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) @@ -2056,10 +2056,10 @@ * crlDistributionPoints -The return value is "undef" on an error and the +The return value is "undef" on an error and the filename(without suffix) of the certificate on success. -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. EXAMPLE: @@ -2134,7 +2134,7 @@ eval { if( defined $data->{'repository'}) { - + $ca = new LIMAL::CaMgm::CA($data->{"caName"}, $data->{'caPasswd'}, $data->{"repository"}); } else { @@ -2144,7 +2144,7 @@ } }; if($@) { - + return $self->SetError( summary => __("Initializing the CA failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -2170,56 +2170,56 @@ $cid->setCertifyPeriode($start, $end); my $exts = $cid->getExtensions(); - - my $e = YaST::caUtils->transformBasicConstaints($exts, + + my $e = YaST::caUtils->transformBasicConstaints($exts, $data->{'basicConstraints'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsComment", $data->{'nsComment'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsBaseUrl", $data->{'nsBaseUrl'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsRevocationUrl", $data->{'nsRevocationUrl'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsCaRevocationUrl", $data->{'nsCaRevocationUrl'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsRenewalUrl", $data->{'nsRenewalUrl'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsSslServerName", $data->{'nsSslServerName'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsCaPolicyUrl", $data->{'nsCaPolicyUrl'}); if(!defined $e) { @@ -2298,7 +2298,7 @@ }; if($@) { - + return $self->SetError( summary => __("Signing certificate failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -2312,7 +2312,7 @@ Create a new Certificate and returns the name -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) @@ -2381,10 +2381,10 @@ * notext (optional - if set to "1" do not output the text version in the PEM file) -The return value is "undef" on an error and the +The return value is "undef" on an error and the filename(without suffix) of the certificate on success. -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. EXAMPLE: @@ -2433,7 +2433,7 @@ if(defined $data->{'repository'}) { - $ca = new LIMAL::CaMgm::CA($data->{'caName'}, + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}, $data->{'repository'}); @@ -2447,12 +2447,12 @@ $ca->deleteRequest($request); }; if($@) { - + # ignore error } return undef; } - + return $certificate; } @@ -2461,19 +2461,19 @@ Returns a list of maps with all certificates of the defined CA. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) * caPasswd (required) -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. The return value is "undef" on an error. -On success it returns an array of hashes with all -certificates of this CA. @ret[0..X] can have the +On success it returns an array of hashes with all +certificates of this CA. @ret[0..X] can have the following Hash keys: * certificate (the name of the certificate) @@ -2531,7 +2531,7 @@ } if (! defined $data->{'caPasswd'} ) { - + return $self->SetError(summary => __("Missing parameter 'caPasswd'."), code => "PARAM_CHECK_FAILED"); } @@ -2540,28 +2540,28 @@ eval { if(defined $data->{'repository'}) { - - $ca = new LIMAL::CaMgm::CA($data->{'caName'}, + + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}, $data->{'repository'}); - + } else { - + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}); - + } - + my $list = $ca->getCertificateList(); - + for(my $listIT = $list->begin(); !$list->iterator_equal($listIT, $list->end()); $list->iterator_incr($listIT)) { - + my $hash = undef; my $map = $list->iterator_value($listIT); - + for(my $mapIT = $map->begin(); !$map->iterator_equal($mapIT, $map->end()); $map->iterator_incr($mapIT)) @@ -2579,7 +2579,7 @@ } }; if($@) { - + return $self->SetError( summary => __("Getting the certificate list failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -2591,9 +2591,9 @@ =item * C<$bool = UpdateDB($valueMap)> -Update the internal openssl database. +Update the internal openssl database. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) @@ -2601,7 +2601,7 @@ The return value is "undef" on an error and "1" on success. -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. EXAMPLE: @@ -2624,7 +2624,7 @@ sub UpdateDB { my $self = shift; my $data = shift; - + if (not defined YaST::caUtils->checkCommonValues($data)) { return $self->SetError(%{YaST::caUtils->Error()}); } @@ -2644,31 +2644,31 @@ my $ca = undef; eval { if(defined $data->{'repository'}) { - - $ca = new LIMAL::CaMgm::CA($data->{'caName'}, + + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}, $data->{'repository'}); - + } else { - + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}); - + } - + my $list = $ca->updateDB(); }; if($@) { - + if( (ref($@) eq "HASH" && $@->{code} == $LIMAL::CaMgm::E_INVALID_PASSWD) || - $@ =~ /invalid.*password/i) + $@ =~ /invalid.*password/i) { # error message; displayed in an popup dialog return $self->SetError( summary => __("Invalid password."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); } - else + else { # error message; displayed in an popup dialog return $self->SetError( summary => __("UpdateDB failed."), @@ -2676,7 +2676,7 @@ code => "LIMAL_CALL_FAILED"); } } - + return 1; } @@ -2685,15 +2685,15 @@ Returns a certificate as plain text or parsed map. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) * certificate (required - name without suffix) -* type (required - allowed values: "parsed", "extended" or "plain") +* type (required - allowed values: "parsed", "extended" or "plain") -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. The return value is "undef" on an error. @@ -2743,15 +2743,15 @@ code => "PARAM_CHECK_FAILED"); } $caName = $data->{"caName"}; - - if (! defined $data->{"type"} || + + if (! defined $data->{"type"} || !grep( ( $_ eq $data->{"type"}), ("parsed", "plain", "extended"))) { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'type'."), code => "PARAM_CHECK_FAILED"); } $type = $data->{"type"}; - + if (! defined $data->{"certificate"}) { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'certificate'."), @@ -2762,22 +2762,22 @@ my $ca = undef; eval { if(defined $data->{'repository'}) { - - $ca = new LIMAL::CaMgm::CA($data->{'caName'}, + + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}, $data->{'repository'}); - + } else { - + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}); - + } my $cert = $ca->getCertificate($certificate); if ($type eq "parsed" || $type eq "extended") { - + $ret = YaST::caUtils->getParsed($cert); my $repos = "$CAM_ROOT"; if(defined $data->{repository}) { @@ -2796,10 +2796,10 @@ } else { $ret = $cert->getCertificateAsText(); } - + }; if($@) { - + return $self->SetError( summary => __("Parsing the certificate failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -2810,9 +2810,9 @@ =item * C<$bool = RevokeCertificate($valueMap)> -Revoke a certificate. +Revoke a certificate. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) @@ -2822,7 +2822,7 @@ * crlReason -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. The return value is "undef" on an error and "1" on success. @@ -2863,7 +2863,7 @@ code => "CHECK_PARAM_FAILED"); } $caName = $data->{"caName"}; - + if (!defined $data->{"caPasswd"} ) { # parameter check failed return $self->SetError( summary => __("Missing value 'caPasswd'."), @@ -2880,16 +2880,16 @@ my $ca = undef; eval { if(defined $data->{'repository'}) { - - $ca = new LIMAL::CaMgm::CA($data->{'caName'}, + + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}, $data->{'repository'}); - + } else { - + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}); - + } my $reason = new LIMAL::CaMgm::CRLReason(); @@ -2897,11 +2897,11 @@ if (defined $data->{'crlReason'}) { $reason->setReason($data->{'crlReason'}); } - + $ca->revokeCertificate($certificate, $reason); }; if($@) { - + return $self->SetError( summary => __("Revoking the certificate failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -2913,9 +2913,9 @@ =item * C<$bool = AddCRL($valueMap)> -Create a new CRL. +Create a new CRL. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) @@ -2923,7 +2923,7 @@ * days (required) -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. The return value is "undef" on an error and "1" on success. @@ -2961,7 +2961,7 @@ code => "CHECK_PARAM_FAILED"); } $caName = $data->{"caName"}; - + if (!defined $data->{"caPasswd"} ) { return $self->SetError( summary => __("Missing value 'caPasswd'."), code => "CHECK_PARAM_FAILED"); @@ -2975,7 +2975,7 @@ eval { if( defined $data->{'repository'}) { - + $ca = new LIMAL::CaMgm::CA($data->{"caName"}, $data->{'caPasswd'}, $data->{"repository"}); } else { @@ -2985,7 +2985,7 @@ } }; if($@) { - + return $self->SetError( summary => __("Initializing the CA failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -3003,7 +3003,7 @@ ###### we use only the default extensions # # my $exts = $cgd->getExtensions(); - + # my $e = YaST::caUtils->transformAuthorityKeyIdentifier($exts, # $data->{'authorityKeyIdentifier'}); # if(!defined $e) { @@ -3031,7 +3031,7 @@ }; if($@) { - + return $self->SetError( summary => __("Creating the CRL failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -3044,13 +3044,13 @@ Returns a CRL as plain text or parsed map. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) * type (required - allowed values: "parsed", "extended" or "plain") -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. The return value is "undef" on an error. @@ -3098,25 +3098,25 @@ code => "PARAM_CHECK_FAILED"); } $caName = $data->{"caName"}; - - if (! defined $data->{"type"} || + + if (! defined $data->{"type"} || !grep( ($_ eq $data->{"type"}), ("parsed", "plain", "extended"))) { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'type'."), code => "PARAM_CHECK_FAILED"); } $type = $data->{"type"}; - + my $ca = undef; eval { if(defined $data->{'repository'}) { - + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}, $data->{'repository'}); - + } else { - + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}); } @@ -3142,26 +3142,26 @@ } } else { - + $ret = $crl->getCRLAsText(); - + } }; if($@) { - + if( (ref($@) eq "HASH" && $@->{code} == $LIMAL::CaMgm::E_FILE_NOT_FOUND) || $@ =~ /RuntimeException: File not found/i) { - + return $self->SetError( summary => __("No CRL available."), code => "LIMAL_CALL_FAILED"); } else { - + return $self->SetError( summary => __("Parsing the CRL failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); } } - + return $ret; } @@ -3170,7 +3170,7 @@ Export a CA to a file or returns it in different formats. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) @@ -3180,6 +3180,10 @@ PEM_CERT (export only the Certificate im PEM format) + PEM_KEY (export the Key unencrypted in PEM Format) + + PEM_ENCKEY (export the Key encrypted in PEM Format) + PEM_CERT_KEY (export the Certificate and the Key unencrypted in PEM Format) PEM_CERT_ENCKEY (export the Certificate and the Key encrypted in PEM Format) @@ -3196,7 +3200,7 @@ The return value is "undef" on an error and "1" on success if destinationFile is defined. If destinationFile is not defined, the CA is directly returned. If the exportFormat is -PEM_CERT_KEY or PEM_CERT_ENCKEY the certificate and the key are returned. +PEM_CERT_KEY or PEM_CERT_ENCKEY the certificate and the key are returned. Because of the PEM format it is easy to split them later. @@ -3266,9 +3270,9 @@ $destinationFile = $data->{'destinationFile'}; } - if (!defined $data->{"exportFormat"} || - !grep( ( $_ eq $data->{"exportFormat"}), - ("PEM_CERT", "PEM_CERT_KEY", "PEM_CERT_ENCKEY", + if (!defined $data->{"exportFormat"} || + !grep( ( $_ eq $data->{"exportFormat"}), + ("PEM_CERT", "PEM_KEY", "PEM_ENCKEY", "PEM_CERT_KEY", "PEM_CERT_ENCKEY", "DER_CERT", "PKCS12", "PKCS12_CHAIN"))) { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'exportFormat'."), @@ -3306,7 +3310,7 @@ if ($format eq "PEM_CERT") { eval { - + my $buffer = $ca->exportCACert($LIMAL::CaMgm::E_PEM); if (defined $destinationFile) { @@ -3319,33 +3323,78 @@ } }; if($@) { - + + return $self->SetError( summary => __("Export failed."), + description => YaST::caUtils->exception2String($@), + code => "LIMAL_CALL_FAILED"); + } + } elsif ($format eq "PEM_KEY") { + + eval { + + my $buffer1 = $ca->exportCAKeyAsPEM(""); + + if (defined $destinationFile) { + + LIMAL::CaMgm::LocalManagement::writeFile($buffer1, + $destinationFile); + $ret = 1; + } else { + + $ret = $buffer1->data(); + } + }; + if($@) { + + return $self->SetError( summary => __("Export failed."), + description => YaST::caUtils->exception2String($@), + code => "LIMAL_CALL_FAILED"); + } + } elsif ($format eq "PEM_ENCKEY") { + + eval { + + my $buffer1 = $ca->exportCAKeyAsPEM($data->{'caPasswd'}); + + if (defined $destinationFile) { + + LIMAL::CaMgm::LocalManagement::writeFile($buffer1, + $destinationFile); + $ret = 1; + } else { + + $ret = $buffer1->data(); + } + }; + if($@) { + return $self->SetError( summary => __("Export failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); } + } elsif ($format eq "PEM_CERT_KEY") { eval { - + my $buffer1 = $ca->exportCACert($LIMAL::CaMgm::E_PEM); my $buffer2 = $ca->exportCAKeyAsPEM(""); $buffer1->append("\n", 1); $buffer1->append($buffer2->data(), $buffer2->size()); - + if (defined $destinationFile) { LIMAL::CaMgm::LocalManagement::writeFile($buffer1, $destinationFile); $ret = 1; } else { - + $ret = $buffer1->data(); } }; if($@) { - + return $self->SetError( summary => __("Export failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -3353,10 +3402,10 @@ } elsif ($format eq "PEM_CERT_ENCKEY") { eval { - + my $buffer1 = $ca->exportCACert($LIMAL::CaMgm::E_PEM); my $buffer2 = $ca->exportCAKeyAsPEM($data->{'caPasswd'}); - + $buffer1->append("\n", 1); $buffer1->append($buffer2->data(), $buffer2->size()); @@ -3371,7 +3420,7 @@ } }; if($@) { - + return $self->SetError( summary => __("Export failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -3380,7 +3429,7 @@ } elsif ($format eq "DER_CERT") { eval { - + my $buffer = $ca->exportCACert($LIMAL::CaMgm::E_DER); if (defined $destinationFile) { @@ -3393,7 +3442,7 @@ } }; if($@) { - + return $self->SetError( summary => __("Export failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -3407,7 +3456,7 @@ } eval { - + my $buffer = $ca->exportCAasPKCS12($data->{'P12Password'}, 0); @@ -3421,7 +3470,7 @@ } }; if($@) { - + return $self->SetError( summary => __("Export failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -3437,7 +3486,7 @@ eval { - + my $buffer = $ca->exportCAasPKCS12($data->{'P12Password'}, 1); @@ -3451,7 +3500,7 @@ } }; if($@) { - + return $self->SetError( summary => __("Export failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -3465,7 +3514,7 @@ Export a certificate to a file or returns it in different formats. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) @@ -3479,6 +3528,10 @@ PEM_CERT (export only the Certificate im PEM format) + PEM_KEY (export the Key unencrypted in PEM Format) + + PEM_ENCKEY (export the Key encrypted in PEM Format) + PEM_CERT_KEY (export the Certificate and the Key unencrypted in PEM Format) PEM_CERT_ENCKEY (export the Certificate and the Key encrypted in PEM Format) @@ -3495,7 +3548,7 @@ The return value is "undef" on an error and "1" on success if destinationFile is defined. If destinationFile is not defined, the certificate is directly returned. If the exportFormat is -PEM_CERT_KEY or PEM_CERT_ENCKEY the certificate and the key are returned. +PEM_CERT_KEY or PEM_CERT_ENCKEY the certificate and the key are returned. Because of the PEM format it is easy to split them later. @@ -3553,7 +3606,7 @@ return $self->SetError(summary => __("Invalid value for parameter 'caPasswd'."), code => "PARAM_CHECK_FAILED"); } - + if (! defined $data->{'certificate'}) { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'certificate'."), @@ -3579,9 +3632,9 @@ $destinationFile = $data->{'destinationFile'}; } - if (! defined $data->{"exportFormat"} || + if (! defined $data->{"exportFormat"} || !grep( ( $_ eq $data->{"exportFormat"}), - ("PEM_CERT", "PEM_CERT_KEY", "PEM_CERT_ENCKEY", + ("PEM_CERT", "PEM_KEY", "PEM_ENCKEY", "PEM_CERT_KEY", "PEM_CERT_ENCKEY", "DER_CERT", "PKCS12", "PKCS12_CHAIN"))) { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'exportFormat'."), @@ -3619,7 +3672,7 @@ if ($format eq "PEM_CERT") { eval { - + my $buffer = $ca->exportCertificate($certificate, $LIMAL::CaMgm::E_PEM); @@ -3633,21 +3686,70 @@ } }; if($@) { - + + return $self->SetError( summary => __("Export failed."), + description => YaST::caUtils->exception2String($@), + code => "LIMAL_CALL_FAILED"); + } + } elsif ($format eq "PEM_KEY") { + + eval { + + my $buffer1 = $ca->exportCertificateKeyAsPEM($certificate, + $keyPasswd, + ""); + + if (defined $destinationFile) { + + LIMAL::CaMgm::LocalManagement::writeFile($buffer1, + $destinationFile); + $ret = 1; + } else { + + $ret = $buffer1->data(); + } + }; + if($@) { + + return $self->SetError( summary => __("Export failed."), + description => YaST::caUtils->exception2String($@), + code => "LIMAL_CALL_FAILED"); + } + + } elsif ($format eq "PEM_ENCKEY") { + + eval { + + my $buffer1 = $ca->exportCertificateKeyAsPEM($certificate, + $keyPasswd, + $keyPasswd); + + if (defined $destinationFile) { + + LIMAL::CaMgm::LocalManagement::writeFile($buffer1, + $destinationFile); + $ret = 1; + } else { + $ret = $buffer1->data(); + } + }; + if($@) { + return $self->SetError( summary => __("Export failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); } + } elsif ($format eq "PEM_CERT_KEY") { eval { - + my $buffer1 = $ca->exportCertificate($certificate, $LIMAL::CaMgm::E_PEM); my $buffer2 = $ca->exportCertificateKeyAsPEM($certificate, $keyPasswd, ""); - + $buffer1->append("\n", 1); $buffer1->append($buffer2->data(), $buffer2->size()); @@ -3662,7 +3764,7 @@ } }; if($@) { - + return $self->SetError( summary => __("Export failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -3671,13 +3773,13 @@ } elsif ($format eq "PEM_CERT_ENCKEY") { eval { - + my $buffer1 = $ca->exportCertificate($certificate, $LIMAL::CaMgm::E_PEM); my $buffer2 = $ca->exportCertificateKeyAsPEM($certificate, $keyPasswd, $keyPasswd); - + $buffer1->append("\n", 1); $buffer1->append($buffer2->data(), $buffer2->size()); @@ -3691,7 +3793,7 @@ } }; if($@) { - + return $self->SetError( summary => __("Export failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -3700,7 +3802,7 @@ } elsif ($format eq "DER_CERT") { eval { - + my $buffer = $ca->exportCACert($LIMAL::CaMgm::E_DER); if (defined $destinationFile) { @@ -3713,7 +3815,7 @@ } }; if($@) { - + return $self->SetError( summary => __("Export failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -3728,7 +3830,7 @@ } eval { - + my $buffer = $ca->exportCertificateAsPKCS12($certificate, $keyPasswd, $data->{'P12Password'}, @@ -3744,7 +3846,7 @@ } }; if($@) { - + return $self->SetError( summary => __("Export failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -3758,7 +3860,7 @@ } eval { - + my $buffer = $ca->exportCertificateAsPKCS12($certificate, $keyPasswd, $data->{'P12Password'}, @@ -3774,7 +3876,7 @@ } }; if($@) { - + return $self->SetError( summary => __("Export failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -3788,7 +3890,7 @@ Export a CRL to a file or returns it in different formats. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) @@ -3803,7 +3905,7 @@ * destinationFile (optional) The return value is "undef" on an error and "1" on success, -if 'destinationFile' is defined. +if 'destinationFile' is defined. If 'destinationFile' is not defined the CRL is returned. EXAMPLE: @@ -3814,7 +3916,7 @@ 'caPasswd' => 'system', 'exportFormat' => $ef, }; - + my $res = YaPI::CaManagement->ExportCRL($data); if( not defined $res ) { # error @@ -3848,14 +3950,14 @@ code => "PARAM_CHECK_FAILED"); } $caName = $data->{"caName"}; - + if (!defined $data->{'caPasswd'}) { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'caPasswd'."), code => "PARAM_CHECK_FAILED"); } - - if (!defined $data->{"exportFormat"} || + + if (!defined $data->{"exportFormat"} || !grep( ( $_ eq $data->{"exportFormat"}), ("PEM", "DER"))) { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'exportFormat'."), @@ -3906,7 +4008,7 @@ if ($format eq "PEM") { eval { - + my $buffer = $ca->exportCRL($LIMAL::CaMgm::E_PEM); if (defined $destinationFile) { @@ -3919,7 +4021,7 @@ } }; if($@) { - + return $self->SetError( summary => __("Export failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -3928,7 +4030,7 @@ } elsif ($format eq "DER") { eval { - + my $buffer = $ca->exportCRL($LIMAL::CaMgm::E_DER); if (defined $destinationFile) { @@ -3941,7 +4043,7 @@ } }; if($@) { - + return $self->SetError( summary => __("Export failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -3960,7 +4062,7 @@ Verify a certificate. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) @@ -3988,7 +4090,7 @@ * ocsphelper (OCSP helper) -The syntax of the other values are explained in the +The syntax of the other values are explained in the B<COMMON PARAMETER> section. The return value is "undef" if the verification failed. @@ -4047,7 +4149,7 @@ if( defined $data->{'repository'}) { - $ca = new LIMAL::CaMgm::CA($data->{"caName"}, + $ca = new LIMAL::CaMgm::CA($data->{"caName"}, $data->{'caPasswd'}, $data->{"repository"}); } else { @@ -4058,7 +4160,7 @@ my $purpose = "any"; if(defined $data->{'purpose'} && $data->{'purpose'} ne "") { - if(!grep( ($_ eq $data->{'purpose'}), + if(!grep( ($_ eq $data->{'purpose'}), ("sslclient", "sslserver", "nssslserver", "smimesign", "smimeencrypt", "crlsign", "any", "ocsphelper"))) { @@ -4090,7 +4192,7 @@ create a new CA signed by another CA. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * newCaName (required - the name of the new CA) @@ -4156,10 +4258,10 @@ * crlDistributionPoints -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. -The return value is "undef" on an the +The return value is "undef" on an the filename(without suffix) of the certificate on success. EXAMPLE: @@ -4182,7 +4284,7 @@ my $res = YaPI::CaManagement->AddSubCA($data); if( not defined $res ) { - # error + # error } else { print "OK '$res'\n"; } @@ -4196,7 +4298,7 @@ my @dn = (); my $caName = ""; my $newCaName = ""; - + if (not defined YaST::caUtils->checkCommonValues($data)) { return $self->SetError(%{YaST::caUtils->Error()}); } @@ -4213,7 +4315,7 @@ code => "CHECK_PARAM_FAILED"); } $newCaName = $data->{"newCaName"}; - + if (!defined $data->{"keyPasswd"}) { return $self->SetError( summary => __("Missing value 'keyPasswd'."), code => "CHECK_PARAM_FAILED"); @@ -4248,19 +4350,19 @@ eval { if( defined $data->{'repository'}) { - - $ca = new LIMAL::CaMgm::CA($data->{"caName"}, + + $ca = new LIMAL::CaMgm::CA($data->{"caName"}, $data->{"caPasswd"}, $data->{"repository"}); } else { - $ca = new LIMAL::CaMgm::CA($data->{"caName"}, + $ca = new LIMAL::CaMgm::CA($data->{"caName"}, $data->{"caPasswd"}); } }; if($@) { - + return $self->SetError( summary => __("Initializing the CA failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -4268,14 +4370,14 @@ my $rgd = undef; eval { - + $rgd = $ca->getRequestDefaults($LIMAL::CaMgm::E_CA_Req); - + my $dnl = $rgd->getSubjectDN()->getDN(); my @DN_Values = ('countryName', 'stateOrProvinceName', 'localityName', 'organizationName', 'organizationalUnitName', 'commonName', 'emailAddress'); - + for(my $dnit = $dnl->begin(); !$dnl->iterator_equal($dnit, $dnl->end()); $dnl->iterator_incr($dnit)) @@ -4285,7 +4387,7 @@ if($dnl->iterator_value($dnit)->getType() =~ /^$v$/i) { if(defined $data->{$v}) { - + $dnl->iterator_value($dnit)->setRDNValue($data->{$v}); } else { @@ -4323,20 +4425,20 @@ my $exts = $rgd->getExtensions(); - my $e = YaST::caUtils->transformBasicConstaints($exts, + my $e = YaST::caUtils->transformBasicConstaints($exts, $data->{'basicConstraints'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsComment", $data->{'nsComment'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsSslServerName", $data->{'nsSslServerName'}); if(!defined $e) { @@ -4377,7 +4479,7 @@ }; if($@) { - + return $self->SetError( summary => __("Modifying RequestGenerationData failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -4394,56 +4496,56 @@ $cid->setCertifyPeriode($start, $end); my $exts = $cid->getExtensions(); - - my $e = YaST::caUtils->transformBasicConstaints($exts, + + my $e = YaST::caUtils->transformBasicConstaints($exts, $data->{'basicConstraints'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsComment", $data->{'nsComment'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsBaseUrl", $data->{'nsBaseUrl'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsRevocationUrl", $data->{'nsRevocationUrl'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsCaRevocationUrl", $data->{'nsCaRevocationUrl'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsRenewalUrl", $data->{'nsRenewalUrl'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsSslServerName", $data->{'nsSslServerName'}); if(!defined $e) { return undef; } - $e = YaST::caUtils->transformStringExtension($exts, + $e = YaST::caUtils->transformStringExtension($exts, "nsCaPolicyUrl", $data->{'nsCaPolicyUrl'}); if(!defined $e) { @@ -4520,15 +4622,15 @@ $certName = $ca->createSubCA($newCaName, $data->{'keyPasswd'}, $rgd, $cid); - + }; if($@) { - + return $self->SetError( summary => __("Creating the SubCA failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); } - + return $certName; } @@ -4537,7 +4639,7 @@ Export a CA in a LDAP Directory. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) @@ -4551,7 +4653,7 @@ * ldapPasswd (required) -B<destinationDN> is the DN to the entry where to store +B<destinationDN> is the DN to the entry where to store the CA. The following objectClasses are used: * cRLDistributionPoint @@ -4600,10 +4702,10 @@ code => "PARAM_CHECK_FAILED"); } $caName = $data->{'caName'}; - + if (! defined $data->{'ldapHostname'} || - !(IP->Check4($data->{'ldapHostname'}) || - IP->Check6($data->{'ldapHostname'}) || + !(IP->Check4($data->{'ldapHostname'}) || + IP->Check6($data->{'ldapHostname'}) || Hostname->CheckFQ($data->{'ldapHostname'})) ) { # parameter check failed @@ -4613,7 +4715,7 @@ if (! defined $data->{'ldapPort'} || $data->{'ldapPort'} eq "") { - # setting default value + # setting default value $data->{'ldapPort'} = 389; } @@ -4624,7 +4726,7 @@ } my $object = X500::DN->ParseRFC2253($data->{'destinationDN'}); - if (! defined $data->{'destinationDN'} || + if (! defined $data->{'destinationDN'} || $data->{'destinationDN'} eq "" || ! defined $object) { # parameter check failed @@ -4641,24 +4743,24 @@ my $container = ""; for(my $i = scalar($object->getRDNs())-2; $i >= 0; $i--) { - + my @a = $object->getRDN($i)->getAttributeTypes(); - + if($container eq "") { $container = $a[0]."=".$object->getRDN($i)->getAttributeValue($a[0]); } else { $container = $container.",".$a[0]."=".$object->getRDN($i)->getAttributeValue($a[0]); - } + } } - if (! defined $data->{'BindDN'} || + if (! defined $data->{'BindDN'} || $data->{'BindDN'} eq "") { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'BindDN'."), code => "PARAM_CHECK_FAILED"); } - if (! defined $data->{'ldapPasswd'} || + if (! defined $data->{'ldapPasswd'} || $data->{'ldapPasswd'} eq "") { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'ldapPasswd'."), @@ -4689,7 +4791,7 @@ return $self->SetError(summary => __("Cannot parse the CA certificate."), code => "PARSE_ERROR"); } - + # default is try; disable only, if ldap client says no my $use_tls = "try"; @@ -4697,7 +4799,7 @@ my $ldapMap = Ldap->Export(); if(defined $ldapMap->{ldap_tls}) { if($ldapMap->{ldap_tls} == 1) { - $use_tls = "yes" + $use_tls = "yes" } else { $use_tls = "no"; } @@ -4753,7 +4855,7 @@ # entry exists => we have to modify it $action = "modify"; } - + if($action eq "add") { my $entry = { @@ -4780,11 +4882,11 @@ code => "LDAP_MODIFY_FAILED", description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); } - + } else { #this should never happen :-) } - + return 1; } @@ -4793,7 +4895,7 @@ Export a CRL in a LDAP Directory -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) @@ -4807,7 +4909,7 @@ * ldapPasswd (required) -B<destinationDN> is the DN to the entry where to store +B<destinationDN> is the DN to the entry where to store the CA. The following objectClasses are used: * cRLDistributionPoint @@ -4856,10 +4958,10 @@ code => "PARAM_CHECK_FAILED"); } $caName = $data->{'caName'}; - + if (! defined $data->{'ldapHostname'} || - !(IP->Check4($data->{'ldapHostname'}) || - IP->Check6($data->{'ldapHostname'}) || + !(IP->Check4($data->{'ldapHostname'}) || + IP->Check6($data->{'ldapHostname'}) || Hostname->CheckFQ($data->{'ldapHostname'})) ) { # parameter check failed @@ -4869,7 +4971,7 @@ if (! defined $data->{'ldapPort'} || $data->{'ldapPort'} eq "") { - # setting default value + # setting default value $data->{'ldapPort'} = 389; } @@ -4880,7 +4982,7 @@ } my $object = X500::DN->ParseRFC2253($data->{'destinationDN'}); - if (! defined $data->{'destinationDN'} || + if (! defined $data->{'destinationDN'} || $data->{'destinationDN'} eq "" || ! defined $object) { # parameter check failed @@ -4896,9 +4998,9 @@ my $container = ""; for(my $i = scalar($object->getRDNs())-2; $i >= 0; $i--) { - + my @a = $object->getRDN($i)->getAttributeTypes(); - + if($container eq "") { $container = $a[0]."=".$object->getRDN($i)->getAttributeValue($a[0]); } else { @@ -4906,14 +5008,14 @@ } } - if (! defined $data->{'BindDN'} || + if (! defined $data->{'BindDN'} || $data->{'BindDN'} eq "") { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'BindDN'."), code => "PARAM_CHECK_FAILED"); } - if (! defined $data->{'ldapPasswd'} || + if (! defined $data->{'ldapPasswd'} || $data->{'ldapPasswd'} eq "") { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'ldapPasswd'."), @@ -4952,7 +5054,7 @@ my $ldapMap = Ldap->Export(); if(defined $ldapMap->{ldap_tls} && $ldapMap->{ldap_tls} == 0) { if($ldapMap->{ldap_tls} == 1) { - $use_tls = "yes" + $use_tls = "yes" } else { $use_tls = "no"; } @@ -5022,7 +5124,7 @@ description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}, code => "LDAP_SEARCH_FAILED"); } - if (! defined $attr->[0]->{"certificateRevocationList;binary"} || + if (! defined $attr->[0]->{"certificateRevocationList;binary"} || $attr->{"certificateRevocationList;binary"} eq "") { $doCRLdp = 1; } @@ -5044,7 +5146,7 @@ description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); } - + } elsif ($action eq "modify") { my $entry = { @@ -5056,7 +5158,7 @@ code => "LDAP_MODIFY_FAILED", description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); } - + } else { #this should never happen :-) } @@ -5065,7 +5167,7 @@ if ( $doCRLdp ) { # seems to be the first export, so # check for crlDistributionPoint in config template - + my $ca = undef; eval { my $crlDP_client = ""; @@ -5081,7 +5183,7 @@ $crlDP_client = "found"; } - + my $defServer = $ca->getIssueDefaults($LIMAL::CaMgm::E_Server_Cert); if($defServer->getExtensions()->getCRLDistributionPoints()->isPresent() && @@ -5098,63 +5200,63 @@ $crlDP_ca = "found"; } - + if ( (! defined $crlDP_client || $crlDP_client eq "") && (! defined $crlDP_server || $crlDP_server eq "") && - (! defined $crlDP_ca || $crlDP_ca eq "") + (! defined $crlDP_ca || $crlDP_ca eq "") ) { # if all crlDP are not defined or empty, than we can add it automaticaly - + #my $crlDP = "URI:"; my $crlDP .= "ldap://".$data->{'ldapHostname'}.":".$data->{'ldapPort'}."/"; $crlDP .= uri_escape($data->{'destinationDN'}); - + my $list = new LIMAL::CaMgm::LiteralValueList(); $list->push_back(new LIMAL::CaMgm::LiteralValue("URI", $crlDP)); - + # client - + my $cdp = $defClient->getExtensions()->getCRLDistributionPoints(); $cdp->setCRLDistributionPoints($list); - + my $ext = $defClient->getExtensions(); $ext->setCRLDistributionPoints($cdp); - + $defClient->setExtensions($ext); - - # server - + + # server + $cdp = $defServer->getExtensions()->getCRLDistributionPoints(); $cdp->setCRLDistributionPoints($list); - + $ext = $defServer->getExtensions(); $ext->setCRLDistributionPoints($cdp); - + $defServer->setExtensions($ext); - + # ca - + $cdp = $defCA->getExtensions()->getCRLDistributionPoints(); $cdp->setCRLDistributionPoints($list); - + $ext = $defCA->getExtensions(); $ext->setCRLDistributionPoints($cdp); - + $defCA->setExtensions($ext); - + $ca->setIssueDefaults($LIMAL::CaMgm::E_Client_Cert, $defClient); - + $ca->setIssueDefaults($LIMAL::CaMgm::E_Server_Cert, $defServer); - + $ca->setIssueDefaults($LIMAL::CaMgm::E_CA_Cert, $defCA); - + } }; if($@) { - + return $self->SetError( summary => __("Checking for new CRL Distribution Point failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -5215,8 +5317,8 @@ =cut -BEGIN { $TYPEINFO{ReadLDAPExportDefaults} = ["function", - ["map", "string", "any"], +BEGIN { $TYPEINFO{ReadLDAPExportDefaults} = ["function", + ["map", "string", "any"], ["map", "string", "any"] ]; } sub ReadLDAPExportDefaults { my $self = shift; @@ -5236,7 +5338,7 @@ if (defined $data->{'caName'} ) { $caName = $data->{'caName'}; } - + if(!defined $data->{'type'} || !grep( ($_ eq $data->{'type'}), ("ca", "crl", "certificate"))) { return $self->SetError(summary => __("Invalid value for parameter 'type'."), @@ -5255,9 +5357,9 @@ if(defined $data->{'emailAddress'} && $data->{'emailAddress'} ne "") { push(@emailAddresses, $data->{'emailAddress'}); } - + # get other email addresses from subject alt name - if(defined $data->{'subjectAltName'} && + if(defined $data->{'subjectAltName'} && $data->{'subjectAltName'} =~ /email/) { my @eaddr = split(/\s*,\s*/, $data->{'subjectAltName'}); @@ -5282,10 +5384,10 @@ } else { return $self->SetError( summary => __("No LDAP server configured."), code => "HOST_NOT_FOUND"); - } + } if(defined $ldapMap->{ldap_tls} ) { if($ldapMap->{ldap_tls} == 1) { - $use_tls = "yes" + $use_tls = "yes" } else { $use_tls = "no"; } @@ -5298,7 +5400,7 @@ return $self->SetError(summary => __("LDAP initialization failed."), code => "SCR_INIT_FAILED"); } - + # anonymous bind if (! SCR->Execute(".ldap.bind", {}) ) { my $ldapERR = SCR->Read(".ldap.error"); @@ -5309,7 +5411,7 @@ if(defined $type && ($type eq "ca" || $type eq "crl")) { # Is there already a ldapconfig object? - + if(defined $caName && $caName ne "") { $ldapret = SCR->Read(".ldap.search", { "base_dn" => $ldapMap->{'base_config_dn'}, @@ -5328,7 +5430,7 @@ $retMap->{'destinationDN'} = $ldapret->[0]->{suseDefaultBase}; } } - + if(!exists $retMap->{'destinationDN'} || $retMap->{'destinationDN'} eq "") { $ldapret = SCR->Read(".ldap.search", { "base_dn" => $ldapMap->{'base_config_dn'}, @@ -5346,20 +5448,20 @@ $retMap->{'destinationDN'} = $ldapret->[0]->{suseDefaultBase}; } } - + if(!exists $retMap->{'destinationDN'} || $retMap->{'destinationDN'} eq "") { return $self->SetError(summary => __("No configuration available in LDAP."), code => "LDAP_CONFIG_NEEDED"); } - - # complete the destinationDN + + # complete the destinationDN for(my $i = 0; $i < scalar(@{$retMap->{'destinationDN'}}); $i++) { $retMap->{'destinationDN'}->[$i] = "cn=$caName,".$retMap->{'destinationDN'}->[$i]; } } else { # type is certificate - + my $filter = undef; if(defined $emailAddresses[0]) { @@ -5390,7 +5492,7 @@ if(@$ldapret > 0) { $retMap->{'destinationDN'} = $ldapret; } - + } $retMap->{'ldapHostname'} = $ldapMap->{'ldap_server'}; $retMap->{'ldapPort'} = $ldapMap->{'ldap_port'}; @@ -5404,7 +5506,7 @@ Creates the default configuration structure in LDAP -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * ldapPasswd (required) @@ -5425,7 +5527,7 @@ =cut -BEGIN { $TYPEINFO{InitLDAPcaManagement} = ["function", "boolean", +BEGIN { $TYPEINFO{InitLDAPcaManagement} = ["function", "boolean", ["map", "string", "any"] ]; } sub InitLDAPcaManagement { @@ -5453,16 +5555,16 @@ } else { return $self->SetError( summary => __("No LDAP server configured."), code => "HOST_NOT_FOUND"); - } + } } - + my $ret = Ldap->LDAPInit (); if ($ret ne "") { - + return $self->SetError(summary => __("LDAP initialization failed."), code => "SCR_INIT_FAILED"); } - + # bind if (! SCR->Execute(".ldap.bind", { bind_dn => $ldapMap->{'bind_dn'}, bind_pw => $data->{ldapPasswd} @@ -5474,7 +5576,7 @@ } # search for base_config_dn - $ldapret = SCR->Read(".ldap.search", + $ldapret = SCR->Read(".ldap.search", { "base_dn" => $ldapMap->{'base_config_dn'}, "filter" => 'objectClass=*', @@ -5488,23 +5590,23 @@ Ldap->SetGUI(YaST::YCP::Boolean(0)); Ldap->SetBindPassword($data->{ldapPasswd}); - + if(! Ldap->CheckBaseConfig($ldapMap->{'base_config_dn'})) { Ldap->SetGUI(YaST::YCP::Boolean(1)); return $self->SetError(summary => __("Cannot add base configuration entry."), code => "LDAP_ADD_FAILED"); } Ldap->SetGUI(YaST::YCP::Boolean(1)); - + } else { return $self->SetError(summary => __("LDAP search failed."), code => "LDAP_SEARCH_FAILED", description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); } } - + # search for default Config entry - $ldapret = SCR->Read(".ldap.search", + $ldapret = SCR->Read(".ldap.search", { "base_dn" => $ldapMap->{'base_config_dn'}, "filter" => '(& (objectClass=suseCaConfiguration) (cn=defaultCA))', @@ -5520,7 +5622,7 @@ if(@$ldapret <= 0) { my $defaultCAcontainer = "ou=PKI,".$ldapMap->{'ldap_domain'}; - # search for the default CA container + # search for the default CA container $ldapret = SCR->Read(".ldap.search", { "base_dn" => $defaultCAcontainer, "filter" => 'objectClass=*', @@ -5536,9 +5638,9 @@ "objectClass" => [ "organizationalUnit" ], "ou" => "PKI", }; - + $ldapret = SCR->Write(".ldap.add", { dn => $defaultCAcontainer }, $entry); - + if(! defined $ldapret) { my $ldapERR = SCR->Read(".ldap.error"); return $self->SetError(summary => __("Cannot add CA configuration entry."), @@ -5553,9 +5655,9 @@ } # create default CA config entry - $ldapret = SCR->Write(".ldap.add", + $ldapret = SCR->Write(".ldap.add", { dn => "cn=defaultCA,".$ldapMap->{'base_config_dn'}}, - { + { "objectClass" => [ "suseCaConfiguration"], "cn" => "defaultCA", "suseDefaultBase", $defaultCAcontainer @@ -5568,7 +5670,7 @@ description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); } } - return 1; + return 1; } @@ -5579,7 +5681,7 @@ is designed for exporting user certificates. The destination entry must have the objectClass 'inetOrgPerson'. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) @@ -5600,7 +5702,7 @@ * ldapPasswd (required) If the private key of the certificate is available and the -parameter 'caPasswd', 'keyPasswd' and 'p12Passwd' are defined, +parameter 'caPasswd', 'keyPasswd' and 'p12Passwd' are defined, an export in PKCS12 format is also done. The return value is "undef" on an error and "1" on success. @@ -5657,10 +5759,10 @@ if(defined $1 && $1 ne "") { $key = $1; } - + if (! defined $data->{'ldapHostname'} || - !(IP->Check4($data->{'ldapHostname'}) || - IP->Check6($data->{'ldapHostname'}) || + !(IP->Check4($data->{'ldapHostname'}) || + IP->Check6($data->{'ldapHostname'}) || Hostname->CheckFQ($data->{'ldapHostname'})) ) { # parameter check failed @@ -5670,7 +5772,7 @@ if (! defined $data->{'ldapPort'} || $data->{'ldapPort'} eq "") { - # setting default value + # setting default value $data->{'ldapPort'} = 389; } @@ -5680,21 +5782,21 @@ code => "PARAM_CHECK_FAILED"); } - if (! defined $data->{'destinationDN'} || + if (! defined $data->{'destinationDN'} || $data->{'destinationDN'} eq "") { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'destinationDN'."), code => "PARAM_CHECK_FAILED"); } - if (! defined $data->{'BindDN'} || + if (! defined $data->{'BindDN'} || $data->{'BindDN'} eq "") { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'BindDN'."), code => "PARAM_CHECK_FAILED"); } - if (! defined $data->{'ldapPasswd'} || + if (! defined $data->{'ldapPasswd'} || $data->{'ldapPasswd'} eq "") { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'ldapPasswd'."), @@ -5728,7 +5830,7 @@ code => "LIMAL_CALL_FAILED"); } my ($body) = ($crt->data() =~ /-----BEGIN[\s\w]+-----\n([\S\s\n]+)\n-----END[\s\w]+-----/); - + if (! defined $body || $body eq "") { return $self->SetError(summary => __("Cannot parse the certificate."), code => "PARSE_ERROR"); @@ -5741,13 +5843,13 @@ my $ldapMap = Ldap->Export(); if(defined $ldapMap->{ldap_tls}) { if($ldapMap->{ldap_tls} == 1) { - $use_tls = "yes" + $use_tls = "yes" } else { $use_tls = "no"; } } } - + if (! SCR->Execute(".ldap", {"hostname" => $data->{'ldapHostname'}, "port" => $data->{'ldapPort'}, "use_tls" => $use_tls })) { @@ -5776,7 +5878,7 @@ code => "LDAP_SEARCH_FAILED", description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); } - + my $entry = { 'userCertificate;binary' => YaST::YCP::Byteblock(decode_base64($body)) }; @@ -5786,7 +5888,7 @@ code => "LDAP_MODIFY_FAILED", description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); } - + if ( $exportPKCS12 ) { my $ca = undef; @@ -5804,7 +5906,7 @@ description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); } - + my $entry = { 'userPKCS12' => YaST::YCP::Byteblock($p12->data()) }; @@ -5816,9 +5918,9 @@ description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); } } - + return 1; - + } =item * @@ -5827,7 +5929,7 @@ Delete a Certificate. This function removes also the request and the private key. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) @@ -5835,7 +5937,7 @@ * caPasswd (required) -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. The return value is "undef" on an error and "1" on success. @@ -5876,14 +5978,14 @@ code => "PARAM_CHECK_FAILED"); } $caName = $data->{'caName'}; - + if (!defined $data->{'certificate'}) { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'certificate'."), code => "PARAM_CHECK_FAILED"); } $certificate = $data->{'certificate'}; - + my $ca = undef; eval { @@ -5918,7 +6020,7 @@ code => "LIMAL_CALL_FAILED"); } - return 1; + return 1; } @@ -5936,7 +6038,7 @@ The private key is copied to '/etc/ssl/servercerts/serverkey.pem' . The private key is unencrypted and only for B<root> readable. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * inFile (required) @@ -5945,7 +6047,7 @@ B<inFile> is the path to a certificate in PKCS12 format. B<passwd> is the password which is needed to decrypt the PKCS12 -certificate. A second password is not needed, because the private +certificate. A second password is not needed, because the private key will be unencrypted. The return value is "undef" on an error and "1" on success. @@ -5967,9 +6069,9 @@ =cut BEGIN { $TYPEINFO{ImportCommonServerCertificate} = [ - "function", - "boolean", - ["map", "string", "any"] + "function", + "boolean", + ["map", "string", "any"] ]; } sub ImportCommonServerCertificate { my $self = shift; @@ -6118,7 +6220,7 @@ } if($data->{datatype} eq "CERTIFICATE") { - + my $cert = LIMAL::CaMgm::LocalManagement::getCertificate($data->{inFile}, $inForm); @@ -6139,10 +6241,10 @@ } if($type eq "extended") { - + $ret = YaST::caUtils->extensionParsing($ret); } - + } else { $ret = $cert->getCertificateAsText(); } @@ -6152,7 +6254,7 @@ $inForm); if ($type eq "parsed" || $type eq "extended") { - + $ret = YaST::caUtils->getParsedCRL($crl); @@ -6168,16 +6270,16 @@ } if($type eq "extended") { - + $ret = YaST::caUtils->extensionParsing($ret); } - + } else { - + $ret = $crl->getCRLAsText(); - + } - + } elsif($data->{datatype} eq "REQUEST") { my $req = LIMAL::CaMgm::LocalManagement::getRequest($data->{inFile}, @@ -6199,17 +6301,17 @@ } if($type eq "extended") { - + $ret = YaST::caUtils->extensionParsing($ret); } - + } else { $ret = $req->getRequestAsText(); } } }; if($@) { - + return $self->SetError( summary => __("Parsing failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -6223,15 +6325,15 @@ Returns a request as plain text or parsed map. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) * request (required - name without suffix) -* type (required - allowed values: "parsed", "extended" or "plain") +* type (required - allowed values: "parsed", "extended" or "plain") -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. The return value is "undef" on an error. @@ -6281,15 +6383,15 @@ code => "PARAM_CHECK_FAILED"); } $caName = $data->{"caName"}; - - if (! defined $data->{"type"} || + + if (! defined $data->{"type"} || !grep( ( $_ eq $data->{"type"}), ("parsed", "plain", "extended"))) { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'type'."), code => "PARAM_CHECK_FAILED"); } $type = $data->{"type"}; - + if (! defined $data->{"request"}) { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'request'."), @@ -6351,17 +6453,17 @@ Returns a list of maps with all requests of the defined CA. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. The return value is "undef" on an error. -On success it returns an array of hashes with all -requests of this CA. @ret[0..X] can have the +On success it returns an array of hashes with all +requests of this CA. @ret[0..X] can have the following Hash keys: * request (the name of the certificate) @@ -6420,15 +6522,15 @@ my $ca = undef; eval { if(defined $data->{'repository'}) { - - $ca = new LIMAL::CaMgm::CA($data->{'caName'}, + + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}, $data->{'repository'}); - + } else { $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}); - + } my $list = $ca->getRequestList(); @@ -6466,18 +6568,18 @@ Import a request in a CA repository. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) -* inFile +* inFile * data * importFormat (default PEM) B<inFile> is the path to a request. -B<data> the request data directly +B<data> the request data directly One of B<inFile> or B<data> is required. @@ -6503,9 +6605,9 @@ =cut BEGIN { $TYPEINFO{ImportRequest} = [ - "function", - "string", - ["map", "string", "any"] + "function", + "string", + ["map", "string", "any"] ]; } sub ImportRequest { my $self = shift; @@ -6531,7 +6633,7 @@ $data->{inFile}), code => "FILE_DOES_NOT_EXIST"); } - + $data->{data} = SCR->Read(".target.string",$data->{inFile}); if(! defined $data->{data}) { return $self->SetError(summary => __("Cannot read the request."), @@ -6565,20 +6667,20 @@ description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); } - + eval { my $byteBuffer = new LIMAL::ByteBuffer($data->{data}, length($data->{data})); - + if(defined $data->{importFormat} && $data->{importFormat} eq "DER") { - - $ret = $ca->importRequestData($byteBuffer, + + $ret = $ca->importRequestData($byteBuffer, $LIMAL::CaMgm::E_DER); - + } else { - - $ret = $ca->importRequestData($byteBuffer, + + $ret = $ca->importRequestData($byteBuffer, $LIMAL::CaMgm::E_PEM); - + } }; if($@) { @@ -6587,7 +6689,7 @@ description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); } - + return $ret; } @@ -6598,7 +6700,7 @@ Delete a Request. This function removes also the private key if one is available. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required) @@ -6606,7 +6708,7 @@ * request (required) -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. The return value is "undef" on an error and "1" on success. @@ -6647,14 +6749,14 @@ code => "PARAM_CHECK_FAILED"); } $caName = $data->{'caName'}; - + if (!defined $data->{'request'}) { # parameter check failed return $self->SetError(summary => __("Invalid value for parameter 'request'."), code => "PARAM_CHECK_FAILED"); } $req = $data->{'request'}; - + my $ca = undef; eval { if(defined $data->{'repository'}) { @@ -6678,17 +6780,17 @@ description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); } - return 1; + return 1; } =item * C<$bool = ImportCA($valueMap)> -Import a CA certificate and private key and creates a +Import a CA certificate and private key and creates a infrastructure. -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required - A name for this CA) @@ -6722,9 +6824,9 @@ sub ImportCA { my $self = shift; my $data = shift; - + my $caName = ""; - + if (not defined YaST::caUtils->checkCommonValues($data)) { return $self->SetError(%{YaST::caUtils->Error()}); } @@ -6745,7 +6847,7 @@ return $self->SetError(summary => __("Invalid value for parameter 'caKey'."), code => "PARAM_CHECK_FAILED"); } - + my $size = SCR->Read(".target.size", $data->{caKey}); if ($size <= 0) { return $self->SetError(summary => sprintf( @@ -6764,13 +6866,13 @@ my $cert = LIMAL::CaMgm::LocalManagement::readFile($data->{caCertificate}); my $key = LIMAL::CaMgm::LocalManagement::readFile($data->{caKey}); - if( defined $data->{'repository'}) + if( defined $data->{'repository'}) { LIMAL::CaMgm::CA::importCA($caName, $cert, $key, $data->{caPasswd}, $data->{"repository"}); } - else + else { LIMAL::CaMgm::CA::importCA($caName, $cert, $key, $data->{caPasswd}); @@ -6792,7 +6894,7 @@ Delete a Certificate Authority infrastructure -In I<$valueMap> you can define the following keys: +In I<$valueMap> you can define the following keys: * caName (required - A name for this CA) @@ -6801,8 +6903,8 @@ * force (0/1 default is 0) Normaly you can only delete a CA if the CA certificate is expired or -you have never signed a certificate with this CA. In all other cases -you have to set the force parameter to 1 if you realy want to delete +you have never signed a certificate with this CA. In all other cases +you have to set the force parameter to 1 if you realy want to delete the CA and you know what you are doing. The return value is "undef" on an error and "1" on success. @@ -6827,7 +6929,7 @@ sub DeleteCA { my $self = shift; my $data = shift; - + my $caName = ""; my $doDelete = 0; @@ -6848,7 +6950,7 @@ code => "PARAM_CHECK_FAILED"); } - if(exists $data->{force} && + if(exists $data->{force} && defined $data->{force} && $data->{force} == 1) { # force delete @@ -6861,7 +6963,7 @@ if( defined $data->{'repository'}) { - LIMAL::CaMgm::CA::deleteCA($caName, + LIMAL::CaMgm::CA::deleteCA($caName, $data->{caPasswd}, $doDelete, $data->{"repository"}); @@ -6906,7 +7008,7 @@ * issuerAltName -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. EXAMPLE: @@ -6916,7 +7018,7 @@ my $data = { 'caName' => 'My_CA' } - $crlValueMap = YaPI::CaManagement->ReadCRLDefaults($data) + $crlValueMap = YaPI::CaManagement->ReadCRLDefaults($data) if( not defined $crlValueMap ) { # error } else { @@ -6926,7 +7028,7 @@ =cut BEGIN { $TYPEINFO{ReadCRLDefaults} = [ - "function", + "function", ["map", "string", "any"], ["map", "string", "any"] ]; } @@ -6958,21 +7060,21 @@ eval { if(defined $data->{'repository'}) { - - $ca = new LIMAL::CaMgm::CA($data->{'caName'}, + + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}, $data->{'repository'}); } else { - + $ca = new LIMAL::CaMgm::CA($data->{'caName'}, $data->{'caPasswd'}); - + } - + $cgd = $ca->getCRLDefaults(); - + my $crlExt = $cgd->getExtensions(); - + my $e = YaST::caUtils->extractAuthorityKeyIdentifier($crlExt->getAuthorityKeyIdentifier(), $ret); if(!defined $e) { @@ -7019,7 +7121,7 @@ * issuerAltName -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. The return value is "undef" on an error and "1" on success. @@ -7028,7 +7130,7 @@ my $data = { 'caName' => 'My_CA', - 'days' => '7' + 'days' => '7' }; my $res = YaPI::CaManagement->WriteCRLDefaults($data); if( not defined $res ) { @@ -7050,7 +7152,7 @@ if (not defined YaST::caUtils->checkCommonValues($data)) { return $self->SetError(%{YaST::caUtils->Error()}); } - + # checking requires if (!defined $data->{"caName"}) { # parameter check failed @@ -7058,19 +7160,19 @@ code => "CHECK_PARAM_FAILED"); } $caName = $data->{"caName"}; - + my $ca = undef; eval { - + if( defined $data->{'repository'}) { - - $ca = new LIMAL::CaMgm::CA($data->{"caName"}, + + $ca = new LIMAL::CaMgm::CA($data->{"caName"}, $data->{'caPasswd'}, $data->{"repository"}); } else { - + $ca = new LIMAL::CaMgm::CA($data->{"caName"}, $data->{'caPasswd'}); - + } }; if($@) { @@ -7090,7 +7192,7 @@ } my $exts = $cgd->getExtensions(); - + my $e = YaST::caUtils->transformAuthorityKeyIdentifier($exts, $data->{'authorityKeyIdentifier'}); if(!defined $e) { @@ -7106,18 +7208,18 @@ $cgd->setExtensions($exts); }; if($@) { - + return $self->SetError( summary => __("Modifying CRLGenerationData failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); } - + eval { $ca->setCRLDefaults($cgd); }; if($@) { - + return $self->SetError( summary => __("Writing the defaults failed."), description => YaST::caUtils->exception2String($@), code => "LIMAL_CALL_FAILED"); @@ -7144,7 +7246,7 @@ * newPasswd -The syntax of these values are explained in the +The syntax of these values are explained in the B<COMMON PARAMETER> section. The return value is "undef" on an error and "1" on success. @@ -7195,20 +7297,20 @@ { $data->{algorithm} = "des3"; } - + my $oldkey = ""; my $keyfilename = ""; - + if(defined $certificate && $certificate ne "") { my $keyname = ""; - + if($certificate =~ /:([0-9a-fA-F-]+)/) { $keyname = $1; } $keyfilename = "$repos/$caName/keys/$keyname.key"; - + if( -e $keyfilename) { $oldkey = LIMAL::CaMgm::LocalManagement::readFile($keyfilename); @@ -7224,7 +7326,7 @@ { # certificate empty == cpw on the cakey $keyfilename = "$repos/$caName/cacert.key"; - + if( -e $keyfilename) { $oldkey = LIMAL::CaMgm::LocalManagement::readFile($keyfilename); @@ -7236,14 +7338,14 @@ code => "FILE_DOES_NOT_EXIST"); } } - + $newkey = LIMAL::CaMgm::LocalManagement::rsaConvert($oldkey, $LIMAL::CaMgm::E_PEM, $LIMAL::CaMgm::E_PEM, $data->{oldPasswd}, $data->{newPasswd}, $data->{algorithm}); - + LIMAL::CaMgm::LocalManagement::writeFile($newkey, $keyfilename, 1); Modified: trunk/ca-management/src/new_cert_read_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/new_cert_read_… ============================================================================== --- trunk/ca-management/src/new_cert_read_write.ycp (original) +++ trunk/ca-management/src/new_cert_read_write.ycp Thu Jan 14 12:53:46 2010 @@ -125,7 +125,7 @@ if (kind == "Sub CA" || kind == "Sub CA Request") { - ret = (map) YaPI::CaManagement::ReadCertificateDefaults ($["caName": CaMgm::currentCA, + ret = (map) YaPI::CaManagement::ReadCertificateDefaults ($["caName": CaMgm::currentCA, "caPasswd":getPassword(CaMgm::currentCA), "certType":"ca"]); y2milestone("ReadCertificateDefaults(%1): %2", @@ -135,7 +135,7 @@ if (kind == "Server Certificate" ||kind == "Server Request") { - ret = (map) YaPI::CaManagement::ReadCertificateDefaults ($["caName": CaMgm::currentCA, + ret = (map) YaPI::CaManagement::ReadCertificateDefaults ($["caName": CaMgm::currentCA, "caPasswd":getPassword(CaMgm::currentCA), "certType":"server"]); y2milestone("ReadCertificateDefaults(%1): %2", @@ -145,7 +145,7 @@ if (kind == "Client Certificate" ||kind == "Client Request") { - ret = (map) YaPI::CaManagement::ReadCertificateDefaults ($["caName": CaMgm::currentCA, + ret = (map) YaPI::CaManagement::ReadCertificateDefaults ($["caName": CaMgm::currentCA, "caPasswd":getPassword(CaMgm::currentCA), "certType":"client"]); y2milestone("ReadCertificateDefaults(%1): %2", @@ -701,7 +701,7 @@ else { // Certificates, Sub-CAs, Requests - map ret = (map) YaPI::CaManagement::ReadCA ($["caName":CaMgm::currentCA, + map ret = (map) YaPI::CaManagement::ReadCA ($["caName":CaMgm::currentCA, "caPasswd":getPassword(CaMgm::currentCA), "type":"parsed"]); y2milestone("ReadCA(%1): %2", CaMgm::currentCA, ret); @@ -758,7 +758,7 @@ param["caPasswd"] = getPassword(CaMgm::currentCA); //param["notext"] = "1"; foreach(map elem, CaMgm::prop_subject_alt_name_list, { - CaMgm::adv_subject_alt_name_list = add (CaMgm::adv_subject_alt_name_list, elem); + CaMgm::adv_subject_alt_name_list = add (CaMgm::adv_subject_alt_name_list, elem); }); } if (kind == "Client Certificate") @@ -1297,7 +1297,7 @@ // fillup parameters depending on kind param["caName"] = CaMgm::currentCA; - // set the real password later. + // set the real password later. param["caPasswd"] = "<was set>"; param["certType"] = kindmap[CaMgm::currentDefault]:""; @@ -1324,7 +1324,7 @@ { param["basicConstraints"] = param["basicConstraints"]:"" + ", pathlen:" + tostring(CaMgm::adv_pathlenValue); - } + } if (CaMgm::adv_cri_nsComment) { Modified: trunk/ca-management/src/util.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/util.ycp?rev=6… ============================================================================== --- trunk/ca-management/src/util.ycp (original) +++ trunk/ca-management/src/util.ycp Thu Jan 14 12:53:46 2010 @@ -11,10 +11,10 @@ textdomain "ca-management"; - import "CaMgm"; + import "CaMgm"; import "Label"; import "Popup"; - import "Wizard"; + import "Wizard"; import "Hostname"; import "YaPI::CaManagement"; @@ -51,7 +51,7 @@ { first = first + 1; } - + while(last >= 0 && isBlank(substring(str, last, 1))) { last = last - 1; @@ -63,7 +63,7 @@ return ""; } - + /** * Asking for a existing or new file * @param flag new file, filter, headline @@ -74,7 +74,7 @@ string headline) ``{ map<string,any> display = UI::GetDisplayInfo (); string ret = ""; - + if (SCR::Read (.target.size, "/opt/kde3/bin/kfiledialog") > 0 && strip (getenv ("KDE_FULL_SESSION")) == "true" && !display["TextMode"]:false) @@ -94,14 +94,14 @@ } else { - ret = UI::AskForExistingFile( ".", filterString, headline ); + ret = UI::AskForExistingFile( ".", filterString, headline ); } } return ret; } - + /** * Creates Country items * @return a list country items formated for a UI table @@ -118,14 +118,14 @@ country_map, { return v; }); name_list = sort (name_list); - + foreach (string name, name_list, ``{ result = add (result, `item (`id (country_index[name]:""), name , CaMgm::country == country_index[name]:"") ); }); return result; } - + /** * See RFC 2822, 3.4 @@ -157,7 +157,7 @@ { title = _("Change CA Password"); } - + // asking user UI::OpenDialog (`opt(`decorated ), `HBox( `HSpacing(2), @@ -175,12 +175,12 @@ `HStretch(), `PushButton (`id(`cancel), `opt( `key_F9), Label::AbortButton()) ), - `VSpacing (1) + `VSpacing (1) ), `HSpacing (2) ) ); - + UI::SetFocus (`id(`oldpw)); symbol ui = nil; repeat @@ -228,7 +228,7 @@ if(certificate == "") { CaMgm::passwdMap[CAname] = newPassword; - Popup::Message(_("CA Password changed.")); + Popup::Message(_("CA Password changed.")); } else { @@ -241,17 +241,17 @@ until (contains ([`ok, `cancel], ui)); UI::CloseDialog (); } - + /** * Dialog for asking a CA password. Returns the password * without asking if is has already input before. - * @param CAname + * @param CAname * @return string password */ define string getPassword(string CAname)``{ string password = nil; - + if (!haskey(CaMgm::passwdMap, CAname)) { // asking user @@ -263,13 +263,13 @@ `Heading (_("Enter CA Password")), `VSpacing (1), `Password( `id (`entry), `opt(`hstretch), _("&Password:")), - `VSpacing (1), + `VSpacing (1), `HBox ( // push button label `PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton()), `HStretch(), `PushButton (`id(`cancel), `opt( `key_F9), Label::AbortButton()) ), - `VSpacing (1) + `VSpacing (1) ), `HSpacing (2) ) @@ -313,13 +313,13 @@ // already available password = CaMgm::passwdMap[CAname]:""; } - + return password; } /** * Dialog for exporting CA/Certificate/CRL to LDAP - * + * * @param "CA" "CRL" "CERT" "subjectAltName" * @return true ( success ) */ @@ -336,9 +336,9 @@ y2milestone ("exportToLDAP type: %1; CAname: %2, commonName: %3, email: %4, certificate: %5, subjectAltName: %6", kind,CAname,commonName,email,certificate,subjectAltName); - - passwordTerm = add (passwordTerm, `Password(`id (`password), `opt(`hstretch), _("LDAP P&assword:"))); - + + passwordTerm = add (passwordTerm, `Password(`id (`password), `opt(`hstretch), _("LDAP P&assword:"))); + if (kind == "CERT") { if (size (subjectAltName) > 0) @@ -355,7 +355,7 @@ "caName":CAname, "commonName":commonName, "emailAddress":email]); - } + } passwordTerm = add (passwordTerm, `Password( `id (`keyPasswd), `opt(`hstretch), _("Certificate &Password:"))); passwordTerm = add (passwordTerm, `HBox( `Password( `id (`p12Passwd), `opt(`hstretch), _("&New Password:")), @@ -381,7 +381,7 @@ "commonName":commonName, "emailAddress":email, "subjectAltName":subjectAltName], - messageMap); + messageMap); } else { @@ -389,7 +389,7 @@ $["type":kindmap[kind]:"", "caName":CAname], messageMap); } - + if (messageMap["code"]:"" == "LDAP_CONFIG_NEEDED") { UI::OpenDialog (`opt(`decorated ), @@ -403,13 +403,13 @@ ")), `VSpacing (1), `Password( `id (`password), `opt(`hstretch), _("P&assword:")), - `VSpacing (1), + `VSpacing (1), `HBox ( // push button label `PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton()), `HStretch(), `PushButton (`id(`cancel), `opt( `key_F9), Label::AbortButton()) ), - `VSpacing (1) + `VSpacing (1) ), `HSpacing (2) ) @@ -426,7 +426,7 @@ if (YaPI::CaManagement::InitLDAPcaManagement($["ldapPasswd":password])) { if (kind == "CERT") - { + { defaultv = YaPI::CaManagement::ReadLDAPExportDefaults ($["type":kindmap[kind]:"", "caName":CAname, "commonName":commonName, @@ -436,11 +436,11 @@ { defaultv = YaPI::CaManagement::ReadLDAPExportDefaults ($["type":kindmap[kind]:"", "caName":CAname]); - } + } } else { - showErrorCaManagement (); + showErrorCaManagement (); } } } @@ -451,8 +451,8 @@ if (defaultv == nil) { - showErrorCaManagement (); - } + showErrorCaManagement (); + } else { hostname = defaultv["ldapHostname"]:""; @@ -462,7 +462,7 @@ } y2milestone("ReadLDAPExportDefaults() returned %1", defaultv); - + UI::OpenDialog (`opt(`decorated ), `HBox( `HSpacing(2), `VBox ( @@ -475,13 +475,13 @@ `HBox (`HWeight (1, `ComboBox( `id (`dn), `opt(`editable), _("&DN:"), dn))), `TextEntry( `id (`binddn), _("&Bind DN:"), binddn), passwordTerm, - `VSpacing (1), + `VSpacing (1), `HBox ( // push button label `PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton()), `HStretch(), `PushButton (`id(`cancel), `opt( `key_F9), Label::AbortButton()) ), - `VSpacing (1) + `VSpacing (1) ), `HSpacing (2) ) @@ -492,13 +492,13 @@ repeat { ui = (symbol) UI::UserInput (); - + password = (string) UI::QueryWidget(`id(`password), `Value); hostname = (string) UI::QueryWidget(`id(`hostname), `Value); port = (string) UI::QueryWidget(`id(`port), `Value); string stringDN = (string) UI::QueryWidget(`id(`dn), `Value); - binddn = (string) UI::QueryWidget(`id(`binddn), `Value); - + binddn = (string) UI::QueryWidget(`id(`binddn), `Value); + if (ui == `cancel) { password = nil; @@ -602,14 +602,18 @@ `Heading (_("Export CA to File")), `VSpacing (1), `Frame ( _("Export Format"), - `RadioButtonGroup(`id(`rb), + `RadioButtonGroup(`id(`rb), `VBox( `Left(`RadioButton(`id(`PEM_CERT), `opt(`notify), _("O&nly the Certificate in PEM Format"), true)), - `Left(`RadioButton(`id(`PEM_CERT_KEY), `opt(`notify), - _("Ce&rtificate and the Key Unencrypted in PEM Format"))), - `Left(`RadioButton(`id(`PEM_CERT_ENCKEY), `opt(`notify), - _("C&ertificate and the Key Encrypted in PEM Format"))), + `Left(`RadioButton(`id(`PEM_KEY), `opt(`notify), + _("Only the Key &Unencrypted in PEM Format"))), + `Left(`RadioButton(`id(`PEM_ENCKEY), `opt(`notify), + _("Only the &Key Encrypted in PEM Format"))), + `Left(`RadioButton(`id(`PEM_CERT_KEY), `opt(`notify), + _("Ce&rtificate and the Key Unencrypted in PEM Format"))), + `Left(`RadioButton(`id(`PEM_CERT_ENCKEY), `opt(`notify), + _("C&ertificate and the Key Encrypted in PEM Format"))), `Left(`RadioButton(`id(`DER_CERT), `opt(`notify), _("&Certificate in DER Format"))), `Left(`RadioButton(`id(`PKCS12), `opt(`notify), @@ -622,21 +626,21 @@ `HBox( `Password( `id (`PK12password), `opt(`hstretch), _("&New Password")), `Password( `id (`verifyPassword), `opt(`hstretch), _("&Verify Password")) - ), - `HBox ( + ), + `HBox ( `HWeight(1, `TextEntry( `id (`filename), _("&File Name:"))), `VBox( `Label(""), `PushButton (`id(`browse), `opt( `notify), Label::BrowseButton()) ) - ), - `VSpacing (1), + ), + `VSpacing (1), `HBox ( // push button label `PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton()), `HStretch(), `PushButton (`id(`cancel), `opt( `key_F9), Label::AbortButton()) ), - `VSpacing (1) + `VSpacing (1) ), `HSpacing (2) ) @@ -644,41 +648,45 @@ symbol ui = nil; UI::ChangeWidget (`id (`PK12password), `Enabled, false); - UI::ChangeWidget (`id (`verifyPassword), `Enabled, false); + UI::ChangeWidget (`id (`verifyPassword), `Enabled, false); repeat { ui = (symbol) UI::UserInput (); map<symbol,string> kindmap = $[`PEM_CERT:"PEM_CERT", - `PEM_CERT_KEY:"PEM_CERT_KEY", - `PEM_CERT_ENCKEY:"PEM_CERT_ENCKEY", + `PEM_KEY:"PEM_KEY", + `PEM_ENCKEY:"PEM_ENCKEY", + `PEM_CERT_KEY:"PEM_CERT_KEY", + `PEM_CERT_ENCKEY:"PEM_CERT_ENCKEY", `DER_CERT:"DER_CERT", `PKCS12:"PKCS12", `PKCS12_CHAIN:"PKCS12_CHAIN"]; - + string kind = kindmap[(symbol) UI::QueryWidget(`id(`rb), `CurrentButton)]:""; map<symbol,string> filtermap = $[`PEM_CERT:"*.pem *.crt *", - `PEM_CERT_KEY:"*.pem *.crt *", - `PEM_CERT_ENCKEY:"*.pem *.crt *", + `PEM_KEY:"*.pem *.key *", + `PEM_ENCKEY:"*.pem *.key *", + `PEM_CERT_KEY:"*.pem *.crt *", + `PEM_CERT_ENCKEY:"*.pem *.crt *", `DER_CERT:"*.der *.crt *", `PKCS12:"*.p12 *.crt *", `PKCS12_CHAIN:"*.p12 *.crt *"]; - + string filterString = filtermap[(symbol) UI::QueryWidget(`id(`rb), - `CurrentButton)]:"*"; + `CurrentButton)]:"*"; if (kind == "PKCS12" || kind == "PKCS12_CHAIN") { UI::ChangeWidget (`id (`PK12password), `Enabled, true); - UI::ChangeWidget (`id (`verifyPassword), `Enabled, true); + UI::ChangeWidget (`id (`verifyPassword), `Enabled, true); } else { UI::ChangeWidget (`id (`PK12password), `Enabled, false); - UI::ChangeWidget (`id (`verifyPassword), `Enabled, false); + UI::ChangeWidget (`id (`verifyPassword), `Enabled, false); } if (ui == `browse) @@ -689,7 +697,7 @@ UI::ChangeWidget(`id(`filename), `Value, name); } } - + if (ui == `ok) { // export to file @@ -701,7 +709,7 @@ Popup::Error(_("New passwords do not match.")); ui = `again; } - + string filename = (string) UI::QueryWidget(`id(`filename), `Value); if (size (filename) == 0) { @@ -738,7 +746,7 @@ || ret != "1") { showErrorCaManagement (); - ui = `again; + ui = `again; } else { @@ -749,7 +757,7 @@ } until (contains ([`ok, `cancel], ui)); UI::CloseDialog (); - } + } /** * Dialog for exporting CRL to file @@ -765,7 +773,7 @@ `Heading (_("Export CRL to File")), `VSpacing (1), `Frame ( _("Export Format"), - `RadioButtonGroup(`id(`rb), + `RadioButtonGroup(`id(`rb), `VBox( `Left(`RadioButton(`id(`PEM), `opt(`notify), _("&PEM Format"), true)), @@ -774,20 +782,20 @@ ) ) ), - `HBox ( + `HBox ( `HWeight(1, `TextEntry( `id (`filename), _("&File Name:"))), `VBox( `Label(""), `PushButton (`id(`browse), `opt( `notify), Label::BrowseButton()) ) - ), - `VSpacing (1), + ), + `VSpacing (1), `HBox ( // push button label `PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton()), `HStretch(), `PushButton (`id(`cancel), `opt( `key_F9), Label::AbortButton()) ), - `VSpacing (1) + `VSpacing (1) ), `HSpacing (2) ) @@ -803,10 +811,10 @@ map<symbol,string> filtermap = $[`PEM:"*.pem *.crt *", `DER:"*.der *.crt *"]; - + string filterString = filtermap[(symbol) UI::QueryWidget(`id(`rb), - `CurrentButton)]:"*"; - + `CurrentButton)]:"*"; + string kind = kindmap[(symbol) UI::QueryWidget(`id(`rb), `CurrentButton)]:""; @@ -818,7 +826,7 @@ UI::ChangeWidget(`id(`filename), `Value, name); } } - + if (ui == `ok) { // export to file @@ -837,7 +845,7 @@ "exportFormat" : kind, "destinationFile" : filename ]); - + y2milestone ("ExportCRL(%1) return %2", $["caName": CAname, "exportFormat" : kind, "destinationFile" : filename @@ -846,7 +854,7 @@ || ret != "1") { showErrorCaManagement (); - ui = `again; + ui = `again; } else { @@ -873,12 +881,16 @@ `Heading (_("Export Certificate to File")), `VSpacing (1), `Frame ( _("Export Format"), - `RadioButtonGroup(`id(`rb), + `RadioButtonGroup(`id(`rb), `VBox( `Left(`RadioButton(`id(`PEM_CERT), `opt(`notify), _("&Only the Certificate in PEM Format"), true)), - `Left(`RadioButton(`id(`PEM_CERT_KEY), `opt(`notify), - _("Ce&rtificate and the Key Unencrypted in PEM Format"))), + `Left(`RadioButton(`id(`PEM_KEY), `opt(`notify), + _("Only the Key &Unencrypted in PEM Format"))), + `Left(`RadioButton(`id(`PEM_ENCKEY), `opt(`notify), + _("Only the &Key Encrypted in PEM Format"))), + `Left(`RadioButton(`id(`PEM_CERT_KEY), `opt(`notify), + _("Ce&rtificate and the Key Unencrypted in PEM Format"))), `Left(`RadioButton(`id(`PEM_CERT_ENCKEY), `opt(`notify), _("C&ertificate and the Key Encrypted in PEM Format"))), `Left(`RadioButton(`id(`DER_CERT), `opt(`notify), @@ -895,20 +907,20 @@ `Password( `id (`PK12password), `opt(`hstretch), _("&New Password")), `Password( `id (`verifyPassword), `opt(`hstretch), _("&Verify Password")) ), - `HBox ( + `HBox ( `HWeight(1, `TextEntry( `id (`filename), _("&File Name:"))), `VBox( `Label(""), `PushButton (`id(`browse), `opt( `notify), Label::BrowseButton()) ) - ), - `VSpacing (1), + ), + `VSpacing (1), `HBox ( // push button label `PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton()), `HStretch(), `PushButton (`id(`cancel), `opt( `key_F9), Label::AbortButton()) ), - `VSpacing (1) + `VSpacing (1) ), `HSpacing (2) ) @@ -916,42 +928,46 @@ symbol ui = nil; UI::ChangeWidget (`id (`PK12password), `Enabled, false); - UI::ChangeWidget (`id (`verifyPassword), `Enabled, false); + UI::ChangeWidget (`id (`verifyPassword), `Enabled, false); repeat { ui = (symbol) UI::UserInput (); map<symbol,string> kindmap = $[`PEM_CERT:"PEM_CERT", - `PEM_CERT_KEY:"PEM_CERT_KEY", - `PEM_CERT_ENCKEY:"PEM_CERT_ENCKEY", + `PEM_KEY:"PEM_KEY", + `PEM_ENCKEY:"PEM_ENCKEY", + `PEM_CERT_KEY:"PEM_CERT_KEY", + `PEM_CERT_ENCKEY:"PEM_CERT_ENCKEY", `DER_CERT:"DER_CERT", `PKCS12:"PKCS12", `PKCS12_CHAIN:"PKCS12_CHAIN"]; - + string kind = kindmap[(symbol) UI::QueryWidget(`id(`rb), `CurrentButton)]:""; map<symbol,string> filtermap = $[`PEM_CERT:"*.pem *.crt *", - `PEM_CERT_KEY:"*.pem *.crt *", - `PEM_CERT_ENCKEY:"*.pem *.crt *", + `PEM_KEY:"*.pem *.key *", + `PEM_ENCKEY:"*.pem *.key *", + `PEM_CERT_KEY:"*.pem *.crt *", + `PEM_CERT_ENCKEY:"*.pem *.crt *", `DER_CERT:"*.der *.crt *", `PKCS12:"*.p12 *.crt *", `PKCS12_CHAIN:"*.p12 *.crt *"]; - + string filterString = filtermap[(symbol) UI::QueryWidget(`id(`rb), - `CurrentButton)]:"*"; - + `CurrentButton)]:"*"; + if (kind == "PKCS12" || kind == "PKCS12_CHAIN") { UI::ChangeWidget (`id (`PK12password), `Enabled, true); - UI::ChangeWidget (`id (`verifyPassword), `Enabled, true); + UI::ChangeWidget (`id (`verifyPassword), `Enabled, true); } else { UI::ChangeWidget (`id (`PK12password), `Enabled, false); - UI::ChangeWidget (`id (`verifyPassword), `Enabled, false); + UI::ChangeWidget (`id (`verifyPassword), `Enabled, false); } if (ui == `browse) @@ -962,7 +978,7 @@ UI::ChangeWidget(`id(`filename), `Value, name); } } - + if (ui == `ok) { // export to file @@ -1041,13 +1057,13 @@ term contents = `VBox ( `VSpacing (1), - `HBox ( + `HBox ( `HWeight(1, `TextEntry( `id (`filename), _("&File Name:"))), `VBox( `Label(""), `PushButton (`id(`browse), `opt( `notify), Label::BrowseButton()) ) - ), + ), `VSpacing (1), `Password( `id (`password), `opt(`hstretch), _("&Password:")), `VSpacing (1) @@ -1060,12 +1076,12 @@ // help text 2/3 help_text = help_text + _("Import a server certificate and correspondenting CA and copy them to a place where other YaST modules look for such a common certificate."); - + // help text 3/3 help_text = help_text + _("Password: Certificate password -"); - +"); + Wizard::CreateDialog(); Wizard::SetDesktopIcon("ca-management"); Wizard::SetContents( _("Importing Common Certificate from Disk"), contents, @@ -1080,7 +1096,7 @@ { success = false; ret = UI::UserInput (); - + if (ret == `browse) { string name = selectFile (false, "*.p12", "Import from ..." ); @@ -1088,9 +1104,9 @@ { UI::ChangeWidget(`id(`filename), `Value, name); } - ret = `again; + ret = `again; } - + if (ret == `next) { // reading certificate from disk @@ -1103,14 +1119,14 @@ else { password = (string) UI::QueryWidget (`id(`password), `Value); - + UI::BusyCursor(); UI::OpenDialog(`VBox(`Label(_("Importing certificate...")))); - + boolean yapiret = (boolean) YaPI::CaManagement::ImportCommonServerCertificate ($["passwd" : password, "inFile" : filename]); y2milestone ("ImportCommonServerCertificate(%1) return %2", - filename, + filename, yapiret); if (yapiret == nil || !yapiret) @@ -1122,8 +1138,8 @@ { Popup::Message(_("Certificate has been imported.")); success = true; - } - UI::CloseDialog (); + } + UI::CloseDialog (); } } } @@ -1140,12 +1156,12 @@ * @return success */ define boolean exportCommonServerCertificate (string CAname, string certificate, string commonName) ``{ - + boolean success = false; boolean check = YaPI::CaManagement::Verify ($["caName": CAname, "caPasswd":getPassword(CAname), "certificate" : certificate, - "disableCRLcheck" : "1", + "disableCRLcheck" : "1", "purpose" : "sslserver" ]); // Checking, if the certificate is a server certificate @@ -1161,7 +1177,7 @@ return true; } } - + // evaluate if the common name of the server certificate is the hostname map retmap = (map) SCR::Execute (.target.bash_output, "/bin/hostname --long", @@ -1169,7 +1185,7 @@ y2milestone("Hostname :%1", retmap); if (commonName != strip(retmap["stdout"]:"")) { - string errorString = sformat ( _("The common name of the certificate (%1) is not the name of + string errorString = sformat ( _("The common name of the certificate (%1) is not the name of the server (%2). This certificate might be not practical as a common server certificate. "), @@ -1177,7 +1193,7 @@ strip(retmap["stdout"]:"")); Popup::Warning (errorString); } - + UI::OpenDialog (`opt(`decorated ), `HBox( `HSpacing(2), `VBox ( @@ -1192,7 +1208,7 @@ `HStretch(), `PushButton (`id(`cancel), `opt( `key_F9), Label::AbortButton()) ), - `VSpacing (1) + `VSpacing (1) ), `HSpacing (2) ) @@ -1209,7 +1225,7 @@ UI::BusyCursor(); UI::OpenDialog(`VBox(`Label(_("Exporting certificate...")))); string filename = (string) SCR::Read (.target.tmpdir) + "/commonCertificate"; - + string ret = (string) YaPI::CaManagement::ExportCertificate ($["caName": CAname, "caPasswd" : getPassword (CAname), "certificate" : certificate, @@ -1235,7 +1251,7 @@ boolean yapiret = (boolean) YaPI::CaManagement::ImportCommonServerCertificate ($["passwd" : password, "inFile" : filename]); y2milestone ("ImportCommonServerCertificate(%1) return %2", - filename, + filename, yapiret); if (yapiret == nil || !yapiret) @@ -1247,14 +1263,14 @@ { Popup::Message(_("Certificate has been written as common server certificate.")); success = true; - } + } } - UI::CloseDialog (); + UI::CloseDialog (); } - } + } until (contains ([`ok, `cancel], ui)); - UI::CloseDialog (); - + UI::CloseDialog (); + return success; } @@ -1273,7 +1289,7 @@ `VSpacing (1), `Heading (_("Import Request from Disk")), `VSpacing (1), - `HBox ( + `HBox ( `HWeight(2, `TextEntry( `id (`filename), _("&File Name:"))), `HWeight(1,`VBox( `Label(""), @@ -1281,12 +1297,12 @@ ) ) ), - `VSpacing (1), + `VSpacing (1), `HBox ( // push button label `PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton()), `HStretch(), `PushButton (`id(`cancel), `opt( `key_F9), Label::AbortButton()) - ), + ), `VSpacing (1) ) ) @@ -1300,7 +1316,7 @@ { success = false; ret = UI::UserInput (); - + if (ret == `browse) { string name = selectFile ( false, "*.pem *.req *.csr *.der", "Import from ..." ); @@ -1308,9 +1324,9 @@ { UI::ChangeWidget(`id(`filename), `Value, name); } - ret = `again; + ret = `again; } - + if (ret == `ok) { // reading certificate from disk @@ -1343,13 +1359,13 @@ { UI::BusyCursor(); UI::OpenDialog(`VBox(`Label(_("Importing request...")))); - + string yapiret = (string) YaPI::CaManagement::ImportRequest ($["caName" : CaName, "caPasswd":getPassword(CaName), "inFile" : filename, "importFormat" : extention]); y2milestone ("ImportRequest(%1) return %2", - filename, + filename, yapiret); if (yapiret == nil) { @@ -1360,13 +1376,13 @@ { Popup::Message(_("Request has been imported.")); success = true; - } + } UI::CloseDialog (); } } } } - UI::CloseDialog (); + UI::CloseDialog (); return success; } @@ -1384,7 +1400,7 @@ `VSpacing (1), `Heading (_("Import CA from Disk")), `TextEntry( `id (`caName), _("&CA Name:")), - `HBox ( + `HBox ( `HWeight(2, `TextEntry( `id (`pathCert), _("&Path of CA Certificate"))), `HWeight(1,`VBox( `Label(""), @@ -1392,21 +1408,21 @@ ) ) ), - `HBox ( + `HBox ( `HWeight(2, `TextEntry( `id (`pathKey), _("&Path of Key"))), `HWeight(1,`VBox( `Label(""), `PushButton (`id(`browseKey), `opt( `notify), Label::BrowseButton()) ) ) - ), + ), `Password( `id (`passKey), `opt(`hstretch),_("&Key Password")), - `VSpacing (1), + `VSpacing (1), `HBox ( // push button label `PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton()), `HStretch(), `PushButton (`id(`cancel), `opt( `key_F9), Label::AbortButton()) - ), + ), `VSpacing (1) ) ) @@ -1420,7 +1436,7 @@ { success = false; ret = UI::UserInput (); - + if (ret == `browseCert) { string name = selectFile (false, "*.pem *.crt", "Import from ..." ); @@ -1428,9 +1444,9 @@ { UI::ChangeWidget(`id(`pathCert), `Value, name); } - ret = `again; + ret = `again; } - + if (ret == `browseKey) { string name = selectFile (false, "*.pem *.key", "Import from ..." ); @@ -1438,13 +1454,13 @@ { UI::ChangeWidget(`id(`pathKey), `Value, name); } - ret = `again; - } - + ret = `again; + } + if (ret == `ok) { // reading CA from disk - + string caCertificate = (string) UI::QueryWidget(`id(`pathCert), `Value); string caKey = (string) UI::QueryWidget(`id(`pathKey), `Value); string caPasswd = (string) UI::QueryWidget(`id(`passKey), `Value); @@ -1472,12 +1488,12 @@ Popup::Error(_("CA name required.")); ret = `again; } - + if (ret == `ok) { UI::BusyCursor(); UI::OpenDialog(`VBox(`Label(_("Importing request...")))); - + boolean yapiret = (boolean) YaPI::CaManagement::ImportCA ($["caName" : caName, "caCertificate" : caCertificate, "caKey" : caKey, @@ -1503,7 +1519,7 @@ } } } - UI::CloseDialog (); + UI::CloseDialog (); return success; } @@ -1511,7 +1527,7 @@ define map<string,string> getHostIPs () ``{ map<string,string> ret = $[]; - + list <string> ip_addresses = splitstring( ((map<string, any>)SCR::Execute(.target.bash_output, "ip -f inet -o addr show scope global | awk '{print $4}' | awk -F \/ '{print $1}' | tr '\n' ','"))["stdout"]:"", ",") ; @@ -1530,11 +1546,11 @@ { // add the IP address ret[ip] = "IP"; - + // first ask the DNS server about the name for this IP address list<string> hostnames = splitstring( ((map<string,any>)SCR::Execute(.target.bash_output, sformat("dig +noall +answer +time=2 +tries=1 -x %1 | awk '{print $5}' | sed 's/\.$//'| tr '\n' '|'", ip)))["stdout"]:"", "|"); - + boolean found = false; foreach(string hname, hostnames, { if(hname != "" && findfirstof(hname, ".") != nil) @@ -1549,7 +1565,7 @@ { list<string> hostnames = splitstring( ((map<string,any>)SCR::Execute(.target.bash_output, sformat("getent hosts %1 | awk '{print $2}' | sed 's/\.$//'| tr '\n' '|'", ip)))["stdout"]:"", "|"); - + foreach(string hname, hostnames, { if(hname != "" && findfirstof(hname, ".") != nil) { @@ -1561,9 +1577,9 @@ } }); y2milestone("getHostIPs return: %1", ret); - return ret; + return ret; } - + // EOF } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60357 - in /trunk/storage/storage/src/include: ep-lvm-lib.ycp ep-raid-lib.ycp
by aschnell＠svn.opensuse.org 14 Jan '10

14 Jan '10

Author: aschnell Date: Thu Jan 14 12:26:28 2010 New Revision: 60357 URL: http://svn.opensuse.org/viewcvs/yast?rev=60357&view=rev Log: - improved focus handling after deleting MDs and VGs Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp trunk/storage/storage/src/include/ep-raid-lib.ycp Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-lib.ycp Thu Jan 14 12:26:28 2010 @@ -155,8 +155,12 @@ if (Storage::DeleteLvmVg(vgname)) { + any new_focus = nil; + if (UI::QueryWidget(`tree, `CurrentItem) == device) + new_focus = `lvm; + UpdateMainStatus(); - UpdateNavigationTree(`lvm); + UpdateNavigationTree(new_focus); TreePanel::Create(); ret = true; } Modified: trunk/storage/storage/src/include/ep-raid-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-lib.ycp Thu Jan 14 12:26:28 2010 @@ -186,8 +186,12 @@ if (EpDeleteDevice(device)) { + any new_focus = nil; + if (UI::QueryWidget(`tree, `CurrentItem) == device) + new_focus = `md; + UpdateMainStatus(); - UpdateNavigationTree(`md); + UpdateNavigationTree(new_focus); TreePanel::Create(); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60356 - in /trunk: add-on-creator/package/ add-on-creator/src/ add-on/package/ add-on/src/ apparmor/package/ apparmor/src/desktop/ audit-laf/package/ audit-laf/src/ autofs/package/ autofs/src/ bac...
by kmachalkova＠svn.opensuse.org 14 Jan '10

14 Jan '10

Author: kmachalkova Date: Thu Jan 14 11:19:01 2010 New Revision: 60356 URL: http://svn.opensuse.org/viewcvs/yast?rev=60356&view=rev Log: Mass update of .desktop files - wrap YaST calls in xdg-su where applicable, remove X-KDE-SubstituteUID bnc#540627 Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/add-on-creator.desktop trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on.desktop trunk/add-on/src/vendor.desktop trunk/apparmor/package/yast2-apparmor.changes trunk/apparmor/src/desktop/SD_Reports.desktop trunk/apparmor/src/desktop/SD_add_profile.desktop trunk/apparmor/src/desktop/SD_control_panel.desktop trunk/apparmor/src/desktop/SD_delete_profile.desktop trunk/apparmor/src/desktop/SD_edit_profile.desktop trunk/apparmor/src/desktop/SD_genprof.desktop trunk/apparmor/src/desktop/SD_logprof.desktop trunk/audit-laf/package/yast2-audit-laf.changes trunk/audit-laf/src/audit-laf.desktop trunk/autofs/package/yast2-autofs.changes trunk/autofs/src/autofs.desktop trunk/backup/package/yast2-backup.changes trunk/backup/src/backup.desktop trunk/boot-server/package/yast2-boot-server.changes trunk/boot-server/src/wol.desktop trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/config/bootloader.desktop trunk/ca-management/package/yast2-ca-management.changes trunk/ca-management/src/ca_mgm.desktop trunk/ca-management/src/common_cert.desktop trunk/cluster/package/yast2-cluster.changes trunk/cluster/src/cluster.desktop trunk/country/keyboard/src/keyboard.desktop trunk/country/language/src/yast-language.desktop trunk/country/package/yast2-country.changes trunk/country/timezone/src/timezone.desktop trunk/dhcp-server/package/yast2-dhcp-server.changes trunk/dhcp-server/src/dhcp-server.desktop trunk/dirinstall/package/yast2-dirinstall.changes trunk/dirinstall/src/config/dirinstall.desktop trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/dns-server.desktop trunk/drbd/src/drbd.desktop trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes trunk/fingerprint-reader/src/fingerprint-reader.desktop trunk/firewall/package/yast2-firewall.changes trunk/firewall/src/firewall.desktop trunk/ftp-server/package/yast2-ftp-server.changes trunk/ftp-server/src/ftp-server.desktop trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/http-server.desktop trunk/inetd/package/yast2-inetd.changes trunk/inetd/src/inetd.desktop trunk/instserver/package/yast2-instserver.changes trunk/instserver/src/instserver.desktop trunk/irda/package/yast2-irda.changes trunk/irda/src/irda.desktop trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/iscsi-client.desktop trunk/iscsi-server/src/iscsi-server.desktop trunk/isns/package/yast2-isns.changes trunk/isns/src/isns.desktop trunk/kdump/package/yast2-kdump.changes trunk/kdump/src/kdump.desktop trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/src/kerberos.desktop trunk/kerberos-server/src/kerberos-server.desktop trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/ldap.desktop trunk/ldap-server/package/yast2-ldap-server.changes trunk/ldap-server/src/ldap-server.desktop trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/live-installer.desktop trunk/mail/package/yast2-mail.changes trunk/mail/src/mail.desktop trunk/mouse/package/yast2-mouse.changes trunk/mouse/src/mouse.desktop trunk/multipath/package/yast2-multipath.changes trunk/multipath/src/multipath.desktop trunk/network/package/yast2-network.changes trunk/network/src/config/dsl.desktop trunk/network/src/config/host.desktop trunk/network/src/config/isdn.desktop trunk/network/src/config/lan.desktop trunk/network/src/config/modem.desktop trunk/network/src/config/network.desktop trunk/network/src/config/provider.desktop trunk/network/src/config/proxy.desktop trunk/network/src/config/remote.desktop trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/nfs.desktop trunk/nfs-server/package/yast2-nfs-server.changes trunk/nfs-server/src/nfs_server.desktop trunk/nis-client/package/yast2-nis-client.changes trunk/nis-client/src/nis.desktop trunk/nis-server/package/yast2-nis-server.changes trunk/nis-server/src/nis_server.desktop trunk/ntp-client/package/yast2-ntp-client.changes trunk/ntp-client/src/ntp-client.desktop trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/online_update.desktop trunk/packager/package/yast2-packager.changes trunk/packager/src/config/sw_single.desktop trunk/packager/src/config/sw_source.desktop trunk/packager/src/config/webpin.desktop trunk/phone-services/package/yast2-phone-services.changes trunk/phone-services/src/config/answering_machine.desktop trunk/phone-services/src/config/fax.desktop trunk/power-management/package/yast2-power-management.changes trunk/power-management/src/power-management.desktop trunk/printer/package/yast2-printer.changes trunk/printer/src/printer.desktop trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/image-creator.desktop trunk/product-creator/src/product-creator.desktop trunk/profile-manager/package/yast2-profile-manager.changes trunk/profile-manager/src/profile-manager.desktop trunk/reipl/package/yast2-reipl.changes trunk/reipl/src/reipl.desktop trunk/repair/package/yast2-repair.changes trunk/repair/src/bootmsg.desktop trunk/repair/src/messages.desktop trunk/repair/src/repair.desktop trunk/restore/package/yast2-restore.changes trunk/restore/src/restore.desktop trunk/runlevel/package/yast2-runlevel.changes trunk/runlevel/src/runlevel.desktop trunk/s390/package/yast2-s390.changes trunk/s390/src/clients/dasd.desktop trunk/s390/src/clients/dump.desktop trunk/s390/src/clients/xpram.desktop trunk/s390/src/clients/zfcp.desktop trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/samba-client.desktop trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/src/samba-server.desktop trunk/scanner/package/yast2-scanner.changes trunk/scanner/src/scanner.desktop trunk/security/package/yast2-security.changes trunk/security/src/security.desktop trunk/slp-server/package/yast2-slp-server.changes trunk/slp-server/src/slp-server.desktop trunk/slp/package/yast2-slp.changes trunk/slp/src/slp.desktop trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/joystick.desktop trunk/sound/sound/src/sound.desktop trunk/squid/config/squid.desktop trunk/squid/package/yast2-squid.changes trunk/squidguard/package/yast2-squidguard.changes trunk/squidguard/src/squidguard.desktop trunk/sshd/package/yast2-sshd.changes trunk/sshd/src/sshd.desktop trunk/storage/disk/src/disk.desktop trunk/storage/package/yast2-storage.changes trunk/sudo/package/yast2-sudo.changes trunk/sudo/src/sudo.desktop trunk/support/package/yast2-support.changes trunk/support/src/support.desktop trunk/sysconfig/package/yast2-sysconfig.changes trunk/sysconfig/src/sysconfig.desktop trunk/system-profile/package/yast2-system-profile.changes trunk/system-profile/src/system-profile.desktop trunk/tftp-server/package/yast2-tftp-server.changes trunk/tftp-server/src/tftp-server.desktop trunk/tune/hwinfo/src/hwinfo.desktop trunk/tune/hwinfo/src/system_settings.desktop trunk/tune/idedma/src/idedma.desktop trunk/tune/package/yast2-tune.changes trunk/tv/package/yast2-tv.changes trunk/tv/src/tv.desktop trunk/update/package/yast2-update.changes trunk/update/src/config/update.desktop trunk/users/package/yast2-users.changes trunk/users/src/users.desktop trunk/vm/package/yast2-vm.changes trunk/vm/src/xen.desktop trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/config/cd_update.desktop trunk/x11/package/yast2-x11.changes trunk/x11/src/config/x11.desktop Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add… ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Tue Dec 22 14:17:04 CET 2009 - jsuchome(a)suse.cz Modified: trunk/add-on-creator/src/add-on-creator.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/add-on-creato… ============================================================================== --- trunk/add-on-creator/src/add-on-creator.desktop (original) +++ trunk/add-on-creator/src/add-on-creator.desktop Thu Jan 14 11:19:01 2010 @@ -18,9 +18,8 @@ X-SuSE-YaST-Keywords=product,appliance,add-on Icon=yast-addon -Exec=/sbin/yast2 add-on-creator +Exec=xdg-su -c "/sbin/yast2 add-on-creator" Name=Add-On Creator GenericName=Create Add-On product -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Fri Apr 3 14:34:11 CEST 2009 - locilka(a)suse.cz Modified: trunk/add-on/src/add-on.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on.desktop?rev=60… ============================================================================== --- trunk/add-on/src/add-on.desktop (original) +++ trunk/add-on/src/add-on.desktop Thu Jan 14 11:19:01 2010 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstSchema=add-on.rnc Icon=yast-addon -Exec=/sbin/yast2 add-on +Exec=xdg-su -c "/sbin/yast2 add-on" Name=Add-On Products GenericName=Install or remove add-on products -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/add-on/src/vendor.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/vendor.desktop?rev=60… ============================================================================== --- trunk/add-on/src/vendor.desktop (original) +++ trunk/add-on/src/vendor.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-vendor -Exec=/sbin/yast2 vendor +Exec=xdg-su -c "/sbin/yast2 vendor" Name=Vendor Driver CD GenericName=Install a driver from a vendor-specific CD-ROM -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/apparmor/package/yast2-apparmor.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/package/yast2-apparmor.… ============================================================================== --- trunk/apparmor/package/yast2-apparmor.changes (original) +++ trunk/apparmor/package/yast2-apparmor.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Mon Nov 23 16:09:14 CET 2009 - kmachalkova(a)suse.cz Modified: trunk/apparmor/src/desktop/SD_Reports.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/desktop/SD_Reports.… ============================================================================== --- trunk/apparmor/src/desktop/SD_Reports.desktop (original) +++ trunk/apparmor/src/desktop/SD_Reports.desktop Thu Jan 14 11:19:01 2010 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstClonable=false Icon=apparmor_view_profile -Exec=/sbin/yast2 SD_Report +Exec=xdg-su -c "/sbin/yast2 SD_Report" Name=AppArmor Reports GenericName=AppArmor Configuration Modified: trunk/apparmor/src/desktop/SD_add_profile.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/desktop/SD_add_prof… ============================================================================== --- trunk/apparmor/src/desktop/SD_add_profile.desktop (original) +++ trunk/apparmor/src/desktop/SD_add_profile.desktop Thu Jan 14 11:19:01 2010 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstClonable=false Icon=apparmor_add_profile -Exec=/sbin/yast2 SD_AddProfile +Exec=xdg-su -c "/sbin/yast2 SD_AddProfile" Name=Manually Add Profile GenericName=AppArmor Configuration Modified: trunk/apparmor/src/desktop/SD_control_panel.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/desktop/SD_control_… ============================================================================== --- trunk/apparmor/src/desktop/SD_control_panel.desktop (original) +++ trunk/apparmor/src/desktop/SD_control_panel.desktop Thu Jan 14 11:19:01 2010 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstClonable=false Icon=apparmor_control_panel -Exec=/sbin/yast2 subdomain +Exec=xdg-su -c "/sbin/yast2 subdomain" Name=AppArmor Control Panel GenericName=AppArmor Control Panel Modified: trunk/apparmor/src/desktop/SD_delete_profile.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/desktop/SD_delete_p… ============================================================================== --- trunk/apparmor/src/desktop/SD_delete_profile.desktop (original) +++ trunk/apparmor/src/desktop/SD_delete_profile.desktop Thu Jan 14 11:19:01 2010 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstClonable=false Icon=apparmor_delete_profile -Exec=/sbin/yast2 SD_DeleteProfile +Exec=xdg-su -c "/sbin/yast2 SD_DeleteProfile" Name=Delete Profile GenericName=AppArmor Configuration Modified: trunk/apparmor/src/desktop/SD_edit_profile.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/desktop/SD_edit_pro… ============================================================================== --- trunk/apparmor/src/desktop/SD_edit_profile.desktop (original) +++ trunk/apparmor/src/desktop/SD_edit_profile.desktop Thu Jan 14 11:19:01 2010 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstClonable=false Icon=apparmor_edit_profile -Exec=/sbin/yast2 SD_EditProfile +Exec=xdg-su -c "/sbin/yast2 SD_EditProfile" Name=Edit Profile GenericName=AppArmor Configuration Modified: trunk/apparmor/src/desktop/SD_genprof.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/desktop/SD_genprof.… ============================================================================== --- trunk/apparmor/src/desktop/SD_genprof.desktop (original) +++ trunk/apparmor/src/desktop/SD_genprof.desktop Thu Jan 14 11:19:01 2010 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstClonable=false Icon=apparmor_creation_wizard -Exec=/sbin/yast2 GenProf +Exec=xdg-su -c "/sbin/yast2 GenProf" Name=Add Profile Wizard GenericName=Profile Wizard Modified: trunk/apparmor/src/desktop/SD_logprof.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/desktop/SD_logprof.… ============================================================================== --- trunk/apparmor/src/desktop/SD_logprof.desktop (original) +++ trunk/apparmor/src/desktop/SD_logprof.desktop Thu Jan 14 11:19:01 2010 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstClonable=false Icon=apparmor_update_wizard -Exec=/sbin/yast2 LogProf +Exec=xdg-su -c "/sbin/yast2 LogProf" Name=Update Profile Wizard GenericName=Update Profiles Modified: trunk/audit-laf/package/yast2-audit-laf.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/package/yast2-audit-la… ============================================================================== --- trunk/audit-laf/package/yast2-audit-laf.changes (original) +++ trunk/audit-laf/package/yast2-audit-laf.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Thu Nov 5 09:28:14 CET 2009 - gs(a)suse.de - Bug-fix for typo in help text (bnc #532137) Modified: trunk/audit-laf/src/audit-laf.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/audit-laf.desktop?… ============================================================================== --- trunk/audit-laf/src/audit-laf.desktop (original) +++ trunk/audit-laf/src/audit-laf.desktop Thu Jan 14 11:19:01 2010 @@ -20,9 +20,8 @@ X-SuSE-YaST-Keywords=audit,auditd,auditctl,auditing,dispatcher,LAF Icon=yast-audit-laf -Exec=/sbin/yast2 audit-laf +Exec=xdg-su -c "/sbin/yast2 audit-laf" Name=Linux Audit Framework (LAF) GenericName=audit-laf -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/autofs/package/yast2-autofs.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autofs/package/yast2-autofs.chan… ============================================================================== --- trunk/autofs/package/yast2-autofs.changes (original) +++ trunk/autofs/package/yast2-autofs.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Mon Sep 28 08:40:50 CEST 2009 - varkoly(a)suse.de Modified: trunk/autofs/src/autofs.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/autofs/src/autofs.desktop?rev=60… ============================================================================== --- trunk/autofs/src/autofs.desktop (original) +++ trunk/autofs/src/autofs.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource=autofs Icon=yast-autofs -Exec=/sbin/yast2 autofs +Exec=xdg-su -c "/sbin/yast2 autofs" Name=Autofs GenericName=autofs -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/package/yast2-backup.chan… ============================================================================== --- trunk/backup/package/yast2-backup.changes (original) +++ trunk/backup/package/yast2-backup.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Wed Dec 2 15:41:11 CET 2009 - locilka(a)suse.cz Modified: trunk/backup/src/backup.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/backup.desktop?rev=60… ============================================================================== --- trunk/backup/src/backup.desktop (original) +++ trunk/backup/src/backup.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-backup -Exec=/sbin/yast2 backup +Exec=xdg-su -c "/sbin/yast2 backup" Name=System Backup GenericName=Back up files and system areas -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/boot-server/package/yast2-boot-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/boot-server/package/yast2-boot-s… ============================================================================== --- trunk/boot-server/package/yast2-boot-server.changes (original) +++ trunk/boot-server/package/yast2-boot-server.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz Modified: trunk/boot-server/src/wol.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/boot-server/src/wol.desktop?rev=… ============================================================================== --- trunk/boot-server/src/wol.desktop (original) +++ trunk/boot-server/src/wol.desktop Thu Jan 14 11:19:01 2010 @@ -16,9 +16,8 @@ X-SuSE-YaST-SortKey= Icon=yast-wol -Exec=/sbin/yast2 wol +Exec=xdg-su -c "/sbin/yast2 wol" Name=WOL GenericName=Configure Wake-on-Lan -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Tue Jan 12 13:07:25 CET 2010 - juhliarik(a)suse.cz - added fix for data in device.map if MD RAID from Intel is used Modified: trunk/bootloader/src/config/bootloader.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/config/bootloader… ============================================================================== --- trunk/bootloader/src/config/bootloader.desktop (original) +++ trunk/bootloader/src/config/bootloader.desktop Thu Jan 14 11:19:01 2010 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstSchema=bootloader.rnc Icon=yast-bootloader -Exec=/sbin/yast2 bootloader +Exec=xdg-su -c "/sbin/yast2 bootloader" Name=Boot Loader GenericName=Configure the boot loader -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-m… ============================================================================== --- trunk/ca-management/package/yast2-ca-management.changes (original) +++ trunk/ca-management/package/yast2-ca-management.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Fri Nov 13 11:05:18 CET 2009 - mc(a)suse.de - fix close dialog while importing certificates (bnc#554677) Modified: trunk/ca-management/src/ca_mgm.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/ca_mgm.desktop… ============================================================================== --- trunk/ca-management/src/ca_mgm.desktop (original) +++ trunk/ca-management/src/ca_mgm.desktop Thu Jan 14 11:19:01 2010 @@ -19,10 +19,9 @@ X-SuSE-YaST-AutoInstSchema=ca_mgm.rnc Icon=yast-ca_mgm -Exec=/sbin/yast2 ca_mgm +Exec=xdg-su -c "/sbin/yast2 ca_mgm" Name=CA Management GenericName=Configure CAs, certificates, and requests -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/ca-management/src/common_cert.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/common_cert.de… ============================================================================== --- trunk/ca-management/src/common_cert.desktop (original) +++ trunk/ca-management/src/common_cert.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-common_cert -Exec=/sbin/yast2 common_cert +Exec=xdg-su -c "/sbin/yast2 common_cert" Name=Common Server Certificate GenericName=Install an SSL certificate for server services -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/cluster/package/yast2-cluster.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/package/yast2-cluster.ch… ============================================================================== --- trunk/cluster/package/yast2-cluster.changes (original) +++ trunk/cluster/package/yast2-cluster.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Sun Dec 7 15:47:32 CST 2008 - xwhu(a)suse.de - Full functional checked in Modified: trunk/cluster/src/cluster.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/cluster.desktop?rev=… ============================================================================== --- trunk/cluster/src/cluster.desktop (original) +++ trunk/cluster/src/cluster.desktop Thu Jan 14 11:19:01 2010 @@ -17,8 +17,7 @@ X-SuSE-YaST-AutoInstResource=cluster Icon=yast-heartbeat -Exec=/sbin/yast2 cluster +Exec=xdg-su -c "/sbin/yast2 cluster" Name=Cluster GenericName=Configure Cluster -X-KDE-SubstituteUID=true Modified: trunk/country/keyboard/src/keyboard.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/keyboard/src/keyboard.de… ============================================================================== --- trunk/country/keyboard/src/keyboard.desktop (original) +++ trunk/country/keyboard/src/keyboard.desktop Thu Jan 14 11:19:01 2010 @@ -20,9 +20,8 @@ X-SuSE-YaST-Keywords=keyboard Icon=yast-keyboard -Exec=/sbin/yast2 keyboard +Exec=xdg-su -c "/sbin/yast2 keyboard" Name=System Keyboard Layout GenericName=Select the system keyboard -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/country/language/src/yast-language.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/yast-langua… ============================================================================== --- trunk/country/language/src/yast-language.desktop (original) +++ trunk/country/language/src/yast-language.desktop Thu Jan 14 11:19:01 2010 @@ -21,9 +21,8 @@ X-SuSE-YaST-Keywords=language,locale,country Icon=yast-language -Exec=/sbin/yast2 language +Exec=xdg-su -c "/sbin/yast2 language" Name=Language GenericName=Change the language and install additional languages -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Tue Jan 12 09:19:24 CET 2010 - jsuchome(a)suse.cz Modified: trunk/country/timezone/src/timezone.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/timezone.de… ============================================================================== --- trunk/country/timezone/src/timezone.desktop (original) +++ trunk/country/timezone/src/timezone.desktop Thu Jan 14 11:19:01 2010 @@ -20,9 +20,8 @@ X-SuSE-YaST-Keywords=time,timezone,clock Icon=yast-timezone -Exec=/sbin/yast2 timezone +Exec=xdg-su -c "/sbin/yast2 timezone" Name=Date and Time GenericName=Control time zone, date, and system time -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/dhcp-server/package/yast2-dhcp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/package/yast2-dhcp-s… ============================================================================== --- trunk/dhcp-server/package/yast2-dhcp-server.changes (original) +++ trunk/dhcp-server/package/yast2-dhcp-server.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Tue Jun 16 14:19:32 CEST 2009 - mvidner(a)suse.cz Modified: trunk/dhcp-server/src/dhcp-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/dhcp-server.desk… ============================================================================== --- trunk/dhcp-server/src/dhcp-server.desktop (original) +++ trunk/dhcp-server/src/dhcp-server.desktop Thu Jan 14 11:19:01 2010 @@ -21,9 +21,8 @@ X-SuSE-YaST-AutoInstSchema=dhcp-server.rnc Icon=yast-dhcp-server -Exec=/sbin/yast2 dhcp-server +Exec=xdg-su -c "/sbin/yast2 dhcp-server" Name=DHCP Server GenericName=Configure a DHCP server -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/dirinstall/package/yast2-dirinstall.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/package/yast2-dirinst… ============================================================================== --- trunk/dirinstall/package/yast2-dirinstall.changes (original) +++ trunk/dirinstall/package/yast2-dirinstall.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Tue Sep 8 13:46:06 CEST 2009 - kmachalkova(a)suse.cz Modified: trunk/dirinstall/src/config/dirinstall.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/config/dirinstall… ============================================================================== --- trunk/dirinstall/src/config/dirinstall.desktop (original) +++ trunk/dirinstall/src/config/dirinstall.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoinstResource= Icon=yast-dirinstall -Exec=/sbin/yast2 dirinstall +Exec=xdg-su -c "/sbin/yast2 dirinstall" Name=Installation into Directory GenericName=Install the system into a directory -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Thu Nov 26 14:00:19 CET 2009 - locilka(a)suse.cz Modified: trunk/dns-server/src/dns-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dns-server.deskto… ============================================================================== --- trunk/dns-server/src/dns-server.desktop (original) +++ trunk/dns-server/src/dns-server.desktop Thu Jan 14 11:19:01 2010 @@ -20,9 +20,8 @@ X-SuSE-YaST-AutoInstSchema=dns-server.rnc Icon=yast-dns-server -Exec=/sbin/yast2 dns-server +Exec=xdg-su -c "/sbin/yast2 dns-server" Name=DNS Server GenericName=Configure a DNS server -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/drbd/src/drbd.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/drbd/src/drbd.desktop?rev=60356&… ============================================================================== --- trunk/drbd/src/drbd.desktop (original) +++ trunk/drbd/src/drbd.desktop Thu Jan 14 11:19:01 2010 @@ -17,8 +17,7 @@ X-SuSE-YaST-AutoInstResource=drbd Icon=yast-iscsi-client -Exec=/sbin/yast2 drbd +Exec=xdg-su -c "/sbin/yast2 drbd" Name=Drbd GenericName=drbd -X-KDE-SubstituteUID=true Modified: trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/package/yast2… ============================================================================== --- trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes (original) +++ trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Tue Sep 1 08:59:25 CEST 2009 - jsuchome(a)suse.cz Modified: trunk/fingerprint-reader/src/fingerprint-reader.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/fingerpri… ============================================================================== --- trunk/fingerprint-reader/src/fingerprint-reader.desktop (original) +++ trunk/fingerprint-reader/src/fingerprint-reader.desktop Thu Jan 14 11:19:01 2010 @@ -18,9 +18,8 @@ X-SuSE-YaST-Keywords=fingerprint,authentication Icon=yast-fingerprint -Exec=/sbin/yast2 fingerprint-reader +Exec=xdg-su -c "/sbin/yast2 fingerprint-reader" Name=Fingerprint Reader GenericName=Set up fingerprint authentication -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/firewall/package/yast2-firewall.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/package/yast2-firewall.… ============================================================================== --- trunk/firewall/package/yast2-firewall.changes (original) +++ trunk/firewall/package/yast2-firewall.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Thu Nov 26 19:20:16 CET 2009 - kmachalkova(a)suse.cz - Adapted to new Netmask API - prefix and netmask are now checked Modified: trunk/firewall/src/firewall.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/firewall.desktop?re… ============================================================================== --- trunk/firewall/src/firewall.desktop (original) +++ trunk/firewall/src/firewall.desktop Thu Jan 14 11:19:01 2010 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstSchema=firewall.rnc Icon=yast-firewall -Exec=/sbin/yast2 firewall +Exec=xdg-su -c "/sbin/yast2 firewall" Name=Firewall GenericName=Configure a firewall -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/package/yast2-ftp-ser… ============================================================================== --- trunk/ftp-server/package/yast2-ftp-server.changes (original) +++ trunk/ftp-server/package/yast2-ftp-server.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Mon Nov 30 09:36:55 CET 2009 - juhliarik(a)suse.cz Modified: trunk/ftp-server/src/ftp-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/ftp-server.deskto… ============================================================================== --- trunk/ftp-server/src/ftp-server.desktop (original) +++ trunk/ftp-server/src/ftp-server.desktop Thu Jan 14 11:19:01 2010 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstSchema=ftp-server.rnc Icon=yast-ftp-server -Exec=/sbin/yast2 ftp-server +Exec=xdg-su -c "/sbin/yast2 ftp-server" Name=FTP Server GenericName=Module for configuration FTP daemon (vsftpd or pure-ftpd) -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-s… ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Mon Jan 4 17:43:07 CET 2010 - mzugec(a)suse.cz - determine vhost by HostIP instead of ServerName (bnc#567027) Modified: trunk/http-server/src/http-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/http-server.desk… ============================================================================== --- trunk/http-server/src/http-server.desktop (original) +++ trunk/http-server/src/http-server.desktop Thu Jan 14 11:19:01 2010 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstSchema=http-server.rnc Icon=yast-http-server -Exec=/sbin/yast2 http-server +Exec=xdg-su -c "/sbin/yast2 http-server" Name=HTTP Server GenericName=Configure an Apache 2 server -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/inetd/package/yast2-inetd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/package/yast2-inetd.change… ============================================================================== --- trunk/inetd/package/yast2-inetd.changes (original) +++ trunk/inetd/package/yast2-inetd.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Tue Jun 16 14:39:04 CEST 2009 - mvidner(a)suse.cz - Using autodocs-ycp.ami, which contains a fix for automake 1.11. Modified: trunk/inetd/src/inetd.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/src/inetd.desktop?rev=6035… ============================================================================== --- trunk/inetd/src/inetd.desktop (original) +++ trunk/inetd/src/inetd.desktop Thu Jan 14 11:19:01 2010 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstSchema=inetd.rnc Icon=yast-inetd -Exec=/sbin/yast2 inetd +Exec=xdg-su -c "/sbin/yast2 inetd" Name=Network Services (xinetd) GenericName=Configure network services (xinetd) -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/instserver/package/yast2-instserver.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/package/yast2-instser… ============================================================================== --- trunk/instserver/package/yast2-instserver.changes (original) +++ trunk/instserver/package/yast2-instserver.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Tue Sep 22 17:23:42 CEST 2009 - lslezak(a)suse.cz Modified: trunk/instserver/src/instserver.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/src/instserver.deskto… ============================================================================== --- trunk/instserver/src/instserver.desktop (original) +++ trunk/instserver/src/instserver.desktop Thu Jan 14 11:19:01 2010 @@ -16,9 +16,8 @@ X-SuSE-YaST-SortKey= Icon=yast-instserver -Exec=/sbin/yast2 instserver +Exec=xdg-su -c "/sbin/yast2 instserver" Name=Installation Server GenericName=Configure and manage installation servers -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/irda/package/yast2-irda.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/irda/package/yast2-irda.changes?… ============================================================================== --- trunk/irda/package/yast2-irda.changes (original) +++ trunk/irda/package/yast2-irda.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Fri Nov 27 08:28:57 CET 2009 - jsuchome(a)suse.cz Modified: trunk/irda/src/irda.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/irda/src/irda.desktop?rev=60356&… ============================================================================== --- trunk/irda/src/irda.desktop (original) +++ trunk/irda/src/irda.desktop Thu Jan 14 11:19:01 2010 @@ -18,9 +18,8 @@ X-SuSE-YaST-Keywords=irda,infrared Icon=yast-irda -Exec=/sbin/yast2 irda +Exec=xdg-su -c "/sbin/yast2 irda" Name=Infrared Device GenericName=Configure an Infrared device (IrDA) -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Tue Sep 29 16:22:58 CEST 2009 - mzugec(a)suse.cz Modified: trunk/iscsi-client/src/iscsi-client.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/iscsi-client.de… ============================================================================== --- trunk/iscsi-client/src/iscsi-client.desktop (original) +++ trunk/iscsi-client/src/iscsi-client.desktop Thu Jan 14 11:19:01 2010 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstSchema=iscsi-client.rnc Icon=yast-iscsi-client -Exec=/sbin/yast2 iscsi-client +Exec=xdg-su -c "/sbin/yast2 iscsi-client" Name=iSCSI Initiator GenericName=Configure an iSCSI initiator -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/iscsi-server/src/iscsi-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/src/iscsi-server.de… ============================================================================== --- trunk/iscsi-server/src/iscsi-server.desktop (original) +++ trunk/iscsi-server/src/iscsi-server.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource=iscsi-server Icon=yast-iscsi-server -Exec=/sbin/yast2 iscsi-server +Exec=xdg-su -c "/sbin/yast2 iscsi-server" Name=iSCSI Target GenericName=Configure an iSCSI target -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/isns/package/yast2-isns.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/package/yast2-isns.changes?… ============================================================================== --- trunk/isns/package/yast2-isns.changes (original) +++ trunk/isns/package/yast2-isns.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Thu Nov 5 11:37:05 CET 2009 - mzugec(a)suse.cz Modified: trunk/isns/src/isns.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/src/isns.desktop?rev=60356&… ============================================================================== --- trunk/isns/src/isns.desktop (original) +++ trunk/isns/src/isns.desktop Thu Jan 14 11:19:01 2010 @@ -17,8 +17,7 @@ X-SuSE-YaST-AutoInstResource=isns Icon=yast-iscsi-server -Exec=/sbin/yast2 isns +Exec=xdg-su -c "/sbin/yast2 isns" Name=iSNS Server GenericName=Configure an iSNS server -X-KDE-SubstituteUID=true Modified: trunk/kdump/package/yast2-kdump.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/package/yast2-kdump.change… ============================================================================== --- trunk/kdump/package/yast2-kdump.changes (original) +++ trunk/kdump/package/yast2-kdump.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Tue Jan 12 10:05:15 CET 2010 - juhliarik(a)suse.cz - deleted offset "@16M" for crashkernel value (bnc#567572) Modified: trunk/kdump/src/kdump.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/kdump.desktop?rev=6035… ============================================================================== --- trunk/kdump/src/kdump.desktop (original) +++ trunk/kdump/src/kdump.desktop Thu Jan 14 11:19:01 2010 @@ -21,9 +21,8 @@ X-SuSE-YaST-AutoInstClonable=true Icon=yast-kdump -Exec=/sbin/yast2 kdump +Exec=xdg-su -c "/sbin/yast2 kdump" Name=Kernel Kdump GenericName=Kernel Kdump Configuration Tool -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/package/yast2-ke… ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Thu Sep 3 14:12:15 CEST 2009 - jsuchome(a)suse.cz Modified: trunk/kerberos-client/src/kerberos.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/kerberos.des… ============================================================================== --- trunk/kerberos-client/src/kerberos.desktop (original) +++ trunk/kerberos-client/src/kerberos.desktop Thu Jan 14 11:19:01 2010 @@ -22,9 +22,8 @@ X-SuSE-YaST-Keywords=kerberos,authentication Icon=yast-kerberos -Exec=/sbin/yast2 kerberos-client +Exec=xdg-su -c "/sbin/yast2 kerberos-client" Name=Kerberos Client GenericName=Configure a Kerberos client -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/kerberos-server/src/kerberos-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-server/src/kerberos-ser… ============================================================================== --- trunk/kerberos-server/src/kerberos-server.desktop (original) +++ trunk/kerberos-server/src/kerberos-server.desktop Thu Jan 14 11:19:01 2010 @@ -16,9 +16,8 @@ X-SuSE-YaST-AutoInstResource=kerberos-server Icon=yast-kerberos -Exec=/sbin/yast2 kerberos-server +Exec=xdg-su -c "/sbin/yast2 kerberos-server" Name=Kerberos Server GenericName=kerberos-server -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Wed Jan 13 09:06:44 CET 2010 - jsuchome(a)suse.cz Modified: trunk/ldap-client/src/ldap.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap.desktop?rev… ============================================================================== --- trunk/ldap-client/src/ldap.desktop (original) +++ trunk/ldap-client/src/ldap.desktop Thu Jan 14 11:19:01 2010 @@ -21,9 +21,8 @@ X-SuSE-YaST-Keywords=ldap,authentication Icon=yast-ldap -Exec=/sbin/yast2 ldap +Exec=xdg-su -c "/sbin/yast2 ldap" Name=LDAP Client GenericName=Configure the LDAP client -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/package/yast2-ldap-s… ============================================================================== --- trunk/ldap-server/package/yast2-ldap-server.changes (original) +++ trunk/ldap-server/package/yast2-ldap-server.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Fri Sep 25 13:48:52 UTC 2009 - rhafer(a)novell.com Modified: trunk/ldap-server/src/ldap-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server.desk… ============================================================================== --- trunk/ldap-server/src/ldap-server.desktop (original) +++ trunk/ldap-server/src/ldap-server.desktop Thu Jan 14 11:19:01 2010 @@ -20,9 +20,8 @@ X-SuSE-YaST-AutoInstSchema=ldap-server.rnc Icon=yast-ldap-server -Exec=/sbin/yast2 ldap-server +Exec=xdg-su -c "/sbin/yast2 ldap-server" Name=LDAP Server GenericName=Configure an LDAP Server -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-liv… ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Fri Oct 30 13:46:38 CET 2009 - jsrain(a)suse.cz Modified: trunk/live-installer/src/live-installer.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live-installe… ============================================================================== --- trunk/live-installer/src/live-installer.desktop (original) +++ trunk/live-installer/src/live-installer.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource=live-installer Icon=yast-live-install -Exec=/sbin/yast2 live-installer +Exec=xdg-su -c "/sbin/yast2 live-installer" Name=Live Installer GenericName=Install current configuration to your system -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?… ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Sat Nov 21 15:02:51 CET 2009 - varkoly(a)suse.de Modified: trunk/mail/src/mail.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.desktop?rev=60356&… ============================================================================== --- trunk/mail/src/mail.desktop (original) +++ trunk/mail/src/mail.desktop Thu Jan 14 11:19:01 2010 @@ -18,9 +18,8 @@ X-SuSE-YaST-AutoInstSchema=mail.rnc Icon=yast-mail -Exec=/sbin/yast2 mail +Exec=xdg-su -c "/sbin/yast2 mail" Name=Mail Server GenericName=Configure mail -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/mouse/package/yast2-mouse.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mouse/package/yast2-mouse.change… ============================================================================== --- trunk/mouse/package/yast2-mouse.changes (original) +++ trunk/mouse/package/yast2-mouse.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Wed Sep 23 16:26:49 CEST 2009 - jdsn(a)suse.de Modified: trunk/mouse/src/mouse.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/mouse/src/mouse.desktop?rev=6035… ============================================================================== --- trunk/mouse/src/mouse.desktop (original) +++ trunk/mouse/src/mouse.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-mouse -Exec=/sbin/yast2 mouse +Exec=xdg-su -c "/sbin/yast2 mouse" Name=Mouse on Text Console (GPM) GenericName=Change the text console mouse model -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/multipath/package/yast2-multipath.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/multipath/package/yast2-multipat… ============================================================================== --- trunk/multipath/package/yast2-multipath.changes (original) +++ trunk/multipath/package/yast2-multipath.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Tue Sep 16 10:49:26 CEST 2008 - locilka(a)suse.cz - Added ag_multipath (written in Python) and multipath.scr Modified: trunk/multipath/src/multipath.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/multipath/src/multipath.desktop?… ============================================================================== --- trunk/multipath/src/multipath.desktop (original) +++ trunk/multipath/src/multipath.desktop Thu Jan 14 11:19:01 2010 @@ -17,8 +17,7 @@ X-SuSE-YaST-AutoInstResource=multipath Icon=yast-iscsi-server -Exec=/sbin/yast2 multipath +Exec=xdg-su -c "/sbin/yast2 multipath" Name=Multipath GenericName=multipath -X-KDE-SubstituteUID=true Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Wed Dec 16 15:59:25 CET 2009 - mzugec(a)suse.cz Modified: trunk/network/src/config/dsl.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/dsl.desktop?r… ============================================================================== --- trunk/network/src/config/dsl.desktop (original) +++ trunk/network/src/config/dsl.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource=dsl Icon=yast-dsl -Exec=/sbin/yast2 dsl +Exec=xdg-su -c "/sbin/yast2 dsl" Name=DSL GenericName=Configure a DSL connection -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/network/src/config/host.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/host.desktop?… ============================================================================== --- trunk/network/src/config/host.desktop (original) +++ trunk/network/src/config/host.desktop Thu Jan 14 11:19:01 2010 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstSchema=host.rnc Icon=yast-host -Exec=/sbin/yast2 host +Exec=xdg-su -c "/sbin/yast2 host" Name=Hostnames GenericName=Assign hostnames and aliases to IP addresses -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/network/src/config/isdn.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/isdn.desktop?… ============================================================================== --- trunk/network/src/config/isdn.desktop (original) +++ trunk/network/src/config/isdn.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource=isdn Icon=yast-isdn -Exec=/sbin/yast2 isdn +Exec=xdg-su -c "/sbin/yast2 isdn" Name=ISDN GenericName=Configure an ISDN connection -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/network/src/config/lan.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/lan.desktop?r… ============================================================================== --- trunk/network/src/config/lan.desktop (original) +++ trunk/network/src/config/lan.desktop Thu Jan 14 11:19:01 2010 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstSchema=networking.rnc Icon=yast-lan -Exec=/sbin/yast2 lan +Exec=xdg-su -c "/sbin/yast2 lan" Name=Network Settings GenericName=Configure network cards, hostname and routing -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/network/src/config/modem.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/modem.desktop… ============================================================================== --- trunk/network/src/config/modem.desktop (original) +++ trunk/network/src/config/modem.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource=modem Icon=yast-modem -Exec=/sbin/yast2 modem +Exec=xdg-su -c "/sbin/yast2 modem" Name=Modem GenericName=Configure a modem -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/network/src/config/network.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/network.deskt… ============================================================================== --- trunk/network/src/config/network.desktop (original) +++ trunk/network/src/config/network.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource=network Icon=yast-network -Exec=/sbin/yast2 network +Exec=xdg-su -c "/sbin/yast2 network" Name=Expert Network Configuration GenericName=Configure network -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/network/src/config/provider.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/provider.desk… ============================================================================== --- trunk/network/src/config/provider.desktop (original) +++ trunk/network/src/config/provider.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource=provider Icon=yast-provider -Exec=/sbin/yast2 provider +Exec=xdg-su -c "/sbin/yast2 provider" Name=Providers GenericName=Configure providers -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/network/src/config/proxy.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/proxy.desktop… ============================================================================== --- trunk/network/src/config/proxy.desktop (original) +++ trunk/network/src/config/proxy.desktop Thu Jan 14 11:19:01 2010 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstSchema=proxy.rnc Icon=yast-proxy -Exec=/sbin/yast2 proxy +Exec=xdg-su -c "/sbin/yast2 proxy" Name=Proxy GenericName=Configure a proxy -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/network/src/config/remote.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/remote.deskto… ============================================================================== --- trunk/network/src/config/remote.desktop (original) +++ trunk/network/src/config/remote.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource=remote Icon=yast-remote -Exec=/sbin/yast2 remote +Exec=xdg-su -c "/sbin/yast2 remote" Name=Remote Administration (VNC) GenericName=Set up remote administration -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Wed Apr 8 13:13:58 CEST 2009 - kmachalkova(a)suse.cz Modified: trunk/nfs-client/src/nfs.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/nfs.desktop?rev=6… ============================================================================== --- trunk/nfs-client/src/nfs.desktop (original) +++ trunk/nfs-client/src/nfs.desktop Thu Jan 14 11:19:01 2010 @@ -21,9 +21,8 @@ X-SuSE-YaST-AutoInstSchema=nfs.rnc Icon=yast-nfs -Exec=/sbin/yast2 nfs +Exec=xdg-su -c "/sbin/yast2 nfs" Name=NFS Client GenericName=Configure an NFS client -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/nfs-server/package/yast2-nfs-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/package/yast2-nfs-ser… ============================================================================== --- trunk/nfs-server/package/yast2-nfs-server.changes (original) +++ trunk/nfs-server/package/yast2-nfs-server.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Mon Sep 21 09:44:32 CEST 2009 - mvidner(a)suse.cz Modified: trunk/nfs-server/src/nfs_server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/nfs_server.deskto… ============================================================================== --- trunk/nfs-server/src/nfs_server.desktop (original) +++ trunk/nfs-server/src/nfs_server.desktop Thu Jan 14 11:19:01 2010 @@ -20,9 +20,8 @@ X-SuSE-YaST-Keywords=share,NFS,file,mount Icon=yast-nfs_server -Exec=/sbin/yast2 nfs_server +Exec=xdg-su -c "/sbin/yast2 nfs_server" Name=NFS Server GenericName=Configure an NFS server -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/nis-client/package/yast2-nis-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/package/yast2-nis-cli… ============================================================================== --- trunk/nis-client/package/yast2-nis-client.changes (original) +++ trunk/nis-client/package/yast2-nis-client.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Mon Jul 27 15:42:20 CEST 2009 - jsuchome(a)suse.cz Modified: trunk/nis-client/src/nis.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/src/nis.desktop?rev=6… ============================================================================== --- trunk/nis-client/src/nis.desktop (original) +++ trunk/nis-client/src/nis.desktop Thu Jan 14 11:19:01 2010 @@ -18,9 +18,8 @@ X-SuSE-YaST-AutoInstSchema=nis.rnc Icon=yast-nis -Exec=/sbin/yast2 nis +Exec=xdg-su -c "/sbin/yast2 nis" Name=NIS Client GenericName=Configure a NIS client -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/nis-server/package/yast2-nis-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-server/package/yast2-nis-ser… ============================================================================== --- trunk/nis-server/package/yast2-nis-server.changes (original) +++ trunk/nis-server/package/yast2-nis-server.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Tue Jun 16 14:27:44 CEST 2009 - mvidner(a)suse.cz Modified: trunk/nis-server/src/nis_server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-server/src/nis_server.deskto… ============================================================================== --- trunk/nis-server/src/nis_server.desktop (original) +++ trunk/nis-server/src/nis_server.desktop Thu Jan 14 11:19:01 2010 @@ -18,9 +18,8 @@ X-SuSE-YaST-AutoInstSchema=nis_server.rnc Icon=yast-nis_server -Exec=/sbin/yast2 nis_server +Exec=xdg-su -c "/sbin/yast2 nis_server" Name=NIS Server GenericName=Configure a NIS server -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/ntp-client/package/yast2-ntp-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/package/yast2-ntp-cli… ============================================================================== --- trunk/ntp-client/package/yast2-ntp-client.changes (original) +++ trunk/ntp-client/package/yast2-ntp-client.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Wed Jul 8 13:30:06 CEST 2009 - ug(a)suse.de Modified: trunk/ntp-client/src/ntp-client.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/ntp-client.deskto… ============================================================================== --- trunk/ntp-client/src/ntp-client.desktop (original) +++ trunk/ntp-client/src/ntp-client.desktop Thu Jan 14 11:19:01 2010 @@ -20,9 +20,8 @@ X-SuSE-YaST-Keywords=time,sync,synchronization,NTP Icon=yast-ntp-client -Exec=/sbin/yast2 ntp-client +Exec=xdg-su -c "/sbin/yast2 ntp-client" Name=NTP Configuration GenericName=Configure an NTP client or server -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Wed Jan 13 09:20:17 CET 2010 - jsuchome(a)suse.cz - inst_you: do not run again if there's no patch left (bnc#515138) Modified: trunk/online-update/src/online_update.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/online_update.… ============================================================================== --- trunk/online-update/src/online_update.desktop (original) +++ trunk/online-update/src/online_update.desktop Thu Jan 14 11:19:01 2010 @@ -18,9 +18,8 @@ X-SuSE-YaST-Keywords=software,update,online Icon=yast-online_update -Exec=/sbin/yast2 online_update +Exec=xdg-su -c "/sbin/yast2 online_update" Name=Online Update GenericName=Get patches to correct and improve your existing installation -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Mon Jan 11 16:27:35 UTC 2010 - lslezak(a)suse.cz Modified: trunk/packager/src/config/sw_single.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/config/sw_single.de… ============================================================================== --- trunk/packager/src/config/sw_single.desktop (original) +++ trunk/packager/src/config/sw_single.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-sw_single -Exec=/sbin/yast2 sw_single +Exec=xdg-su -c "/sbin/yast2 sw_single" Name=Software Management GenericName=Install or remove software packages and manage software repositories -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/packager/src/config/sw_source.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/config/sw_source.de… ============================================================================== --- trunk/packager/src/config/sw_source.desktop (original) +++ trunk/packager/src/config/sw_source.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-sw_source -Exec=/sbin/yast2 repositories +Exec=xdg-su -c "/sbin/yast2 repositories" Name=Software Repositories GenericName=Choose the repositories for installation of software packages (CD, network, etc.), add the community repositories -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/packager/src/config/webpin.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/config/webpin.deskt… ============================================================================== --- trunk/packager/src/config/webpin.desktop (original) +++ trunk/packager/src/config/webpin.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-webpin -Exec=/sbin/yast2 webpin_package_search +Exec=xdg-su -c "/sbin/yast2 webpin_package_search" Name=Package Search (webpin) GenericName=Search for software in online repositories -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/phone-services/package/yast2-phone-services.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/phone-services/package/yast2-pho… ============================================================================== --- trunk/phone-services/package/yast2-phone-services.changes (original) +++ trunk/phone-services/package/yast2-phone-services.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Sat Sep 5 06:08:51 CEST 2009 - mvidner(a)suse.cz Modified: trunk/phone-services/src/config/answering_machine.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/phone-services/src/config/answer… ============================================================================== --- trunk/phone-services/src/config/answering_machine.desktop (original) +++ trunk/phone-services/src/config/answering_machine.desktop Thu Jan 14 11:19:01 2010 @@ -18,9 +18,8 @@ X-SuSE-YaST-Keywords=ISDN,phone,telephone,answering Icon=yast-answering_machine -Exec=/sbin/yast2 answering_machine +Exec=xdg-su -c "/sbin/yast2 answering_machine" Name=Phone Answering Machine GenericName=Set up a phone answering machine -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/phone-services/src/config/fax.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/phone-services/src/config/fax.de… ============================================================================== --- trunk/phone-services/src/config/fax.desktop (original) +++ trunk/phone-services/src/config/fax.desktop Thu Jan 14 11:19:01 2010 @@ -18,9 +18,8 @@ X-SuSE-YaST-Keywords=ISDN,fax,facsimile Icon=yast-fax -Exec=/sbin/yast2 fax +Exec=xdg-su -c "/sbin/yast2 fax" Name=Fax GenericName=Set up an ISDN fax device -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/power-management/package/yast2-power-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/package/yast2-p… ============================================================================== --- trunk/power-management/package/yast2-power-management.changes (original) +++ trunk/power-management/package/yast2-power-management.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Thu Dec 3 10:21:35 CET 2009 - jsrain(a)suse.cz - fixed desktop file category (bnc#559343) Modified: trunk/power-management/src/power-management.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/src/power-manag… ============================================================================== --- trunk/power-management/src/power-management.desktop (original) +++ trunk/power-management/src/power-management.desktop Thu Jan 14 11:19:01 2010 @@ -19,7 +19,7 @@ X-SuSE-YaST-AutoInstSchema=power-management.rnc Icon=yast-power-management -Exec=/sbin/yast2 power-management +Exec=xdg-su -c "/sbin/yast2 power-management" Name=Power Management GenericName=Configure power management Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Tue Dec 22 14:11:37 CET 2009 - jsmeix(a)suse.de Modified: trunk/printer/src/printer.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer.desktop?rev=… ============================================================================== --- trunk/printer/src/printer.desktop (original) +++ trunk/printer/src/printer.desktop Thu Jan 14 11:19:01 2010 @@ -18,8 +18,7 @@ X-SuSE-YaST-AutoInstClonable=true Icon=yast-printer -Exec=/sbin/yast2 printer +Exec=xdg-su -c "/sbin/yast2 printer" Name=Printer GenericName=Configure printers -X-KDE-SubstituteUID=true Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Wed Jan 6 13:52:43 CET 2010 - jsuchome(a)suse.cz Modified: trunk/product-creator/src/image-creator.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/image-creato… ============================================================================== --- trunk/product-creator/src/image-creator.desktop (original) +++ trunk/product-creator/src/image-creator.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-Keywords=product,appliance,kiwi Icon=yast-kiwi -Exec=/sbin/yast2 image-creator +Exec=xdg-su -c "/sbin/yast2 image-creator" Name=Image Creator GenericName=Create the Live CD, USB or XEN image -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/product-creator/src/product-creator.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/product-crea… ============================================================================== --- trunk/product-creator/src/product-creator.desktop (original) +++ trunk/product-creator/src/product-creator.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-Keywords=product,repository Icon=yast-cd-creator -Exec=/sbin/yast2 product-creator +Exec=xdg-su -c "/sbin/yast2 product-creator" Name=Product Creator GenericName=Create new products from existing repositories -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/profile-manager/package/yast2-profile-manager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/package/yast2-pr… ============================================================================== --- trunk/profile-manager/package/yast2-profile-manager.changes (original) +++ trunk/profile-manager/package/yast2-profile-manager.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Thu Sep 3 14:25:27 CEST 2009 - jsuchome(a)suse.cz Modified: trunk/profile-manager/src/profile-manager.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/profile-mana… ============================================================================== --- trunk/profile-manager/src/profile-manager.desktop (original) +++ trunk/profile-manager/src/profile-manager.desktop Thu Jan 14 11:19:01 2010 @@ -18,9 +18,8 @@ X-SuSE-YaST-Keywords=profile,scpm Icon=yast-profile-manager -Exec=/sbin/yast2 profile-manager +Exec=xdg-su -c "/sbin/yast2 profile-manager" Name=Profile Manager GenericName=Configure SCPM profiles -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/reipl/package/yast2-reipl.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/reipl/package/yast2-reipl.change… ============================================================================== --- trunk/reipl/package/yast2-reipl.changes (original) +++ trunk/reipl/package/yast2-reipl.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Mon Apr 20 12:01:39 CEST 2009 - jsrain(a)suse.cz Modified: trunk/reipl/src/reipl.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/reipl/src/reipl.desktop?rev=6035… ============================================================================== --- trunk/reipl/src/reipl.desktop (original) +++ trunk/reipl/src/reipl.desktop Thu Jan 14 11:19:01 2010 @@ -17,8 +17,7 @@ X-SuSE-YaST-AutoInstResource=reipl Icon=yast-reipl -Exec=/sbin/yast2 reipl +Exec=xdg-su -c "/sbin/yast2 reipl" Name=Reipl GenericName=reipl -X-KDE-SubstituteUID=true Modified: trunk/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.chan… ============================================================================== --- trunk/repair/package/yast2-repair.changes (original) +++ trunk/repair/package/yast2-repair.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Tue Jun 16 14:27:53 CEST 2009 - mvidner(a)suse.cz Modified: trunk/repair/src/bootmsg.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/bootmsg.desktop?rev=6… ============================================================================== --- trunk/repair/src/bootmsg.desktop (original) +++ trunk/repair/src/bootmsg.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-bootmsg -Exec=/sbin/yast2 view_anymsg /var/log/boot.msg +Exec=xdg-su -c "/sbin/yast2 view_anymsg /var/log/boot.msg" Name=Start-Up Log GenericName=Display the boot log (/var/log/boot.msg) -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/repair/src/messages.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/messages.desktop?rev=… ============================================================================== --- trunk/repair/src/messages.desktop (original) +++ trunk/repair/src/messages.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-messages -Exec=/sbin/yast2 view_anymsg /var/log/messages +Exec=xdg-su -c "/sbin/yast2 view_anymsg /var/log/messages" Name=System Log GenericName=Display the system's log (/var/log/messages) -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/repair/src/repair.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/repair.desktop?rev=60… ============================================================================== --- trunk/repair/src/repair.desktop (original) +++ trunk/repair/src/repair.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-repair -Exec=/sbin/yast2 repair +Exec=xdg-su -c "/sbin/yast2 repair" Name=System Repair GenericName=System Repair -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/package/yast2-restore.ch… ============================================================================== --- trunk/restore/package/yast2-restore.changes (original) +++ trunk/restore/package/yast2-restore.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Mon Dec 14 11:12:13 CET 2009 - locilka(a)suse.cz Modified: trunk/restore/src/restore.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/src/restore.desktop?rev=… ============================================================================== --- trunk/restore/src/restore.desktop (original) +++ trunk/restore/src/restore.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-restore -Exec=/sbin/yast2 restore +Exec=xdg-su -c "/sbin/yast2 restore" Name=System Restoration GenericName=Restore files from a backup archive -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/runlevel/package/yast2-runlevel.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/package/yast2-runlevel.… ============================================================================== --- trunk/runlevel/package/yast2-runlevel.changes (original) +++ trunk/runlevel/package/yast2-runlevel.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Wed Dec 9 13:40:07 CET 2009 - locilka(a)suse.cz Modified: trunk/runlevel/src/runlevel.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/src/runlevel.desktop?re… ============================================================================== --- trunk/runlevel/src/runlevel.desktop (original) +++ trunk/runlevel/src/runlevel.desktop Thu Jan 14 11:19:01 2010 @@ -18,9 +18,8 @@ X-SuSE-YaST-AutoInstSchema=runlevels.rnc Icon=yast-runlevel -Exec=/sbin/yast2 runlevel +Exec=xdg-su -c "/sbin/yast2 runlevel" Name=System Services (Runlevel) GenericName=Configure runlevels -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?… ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Mon Dec 21 17:20:19 CET 2009 - mzugec(a)suse.cz - dasd: activation non-formated devices (bnc#446998) Modified: trunk/s390/src/clients/dasd.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dasd.desktop?re… ============================================================================== --- trunk/s390/src/clients/dasd.desktop (original) +++ trunk/s390/src/clients/dasd.desktop Thu Jan 14 11:19:01 2010 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstClonable=true Icon=yast-dasd -Exec=/sbin/yast2 dasd +Exec=xdg-su -c "/sbin/yast2 dasd" Name=DASD GenericName=Configure dasd -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/s390/src/clients/dump.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dump.desktop?re… ============================================================================== --- trunk/s390/src/clients/dump.desktop (original) +++ trunk/s390/src/clients/dump.desktop Thu Jan 14 11:19:01 2010 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-dump -Exec=/sbin/yast2 dump +Exec=xdg-su -c "/sbin/yast2 dump" Name=Dump Devices GenericName=Configure Dump Devices Modified: trunk/s390/src/clients/xpram.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/xpram.desktop?r… ============================================================================== --- trunk/s390/src/clients/xpram.desktop (original) +++ trunk/s390/src/clients/xpram.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource=xpram Icon=yast-xpram -Exec=/sbin/yast2 xpram +Exec=xdg-su -c "/sbin/yast2 xpram" Name=XPRAM device GenericName=Configure an XpRAM device (XpRAM) -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/s390/src/clients/zfcp.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/zfcp.desktop?re… ============================================================================== --- trunk/s390/src/clients/zfcp.desktop (original) +++ trunk/s390/src/clients/zfcp.desktop Thu Jan 14 11:19:01 2010 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstClonable=true Icon=yast-zfcp -Exec=/sbin/yast2 zfcp +Exec=xdg-su -c "/sbin/yast2 zfcp" Name=Zfcp GenericName=Configure zfcp -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/package/yast2-samba… ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Thu Dec 10 13:50:38 CET 2009 - jsuchome(a)suse.cz - kde4-kdm is now kdm (bnc#561900) Modified: trunk/samba-client/src/samba-client.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/samba-client.de… ============================================================================== --- trunk/samba-client/src/samba-client.desktop (original) +++ trunk/samba-client/src/samba-client.desktop Thu Jan 14 11:19:01 2010 @@ -21,9 +21,8 @@ X-SuSE-YaST-Keywords=authentication,samba,windows Icon=yast-samba-client -Exec=/sbin/yast2 samba-client +Exec=xdg-su -c "/sbin/yast2 samba-client" Name=Windows Domain Membership GenericName=Configure the Windows Domain Membership -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba… ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Wed Sep 16 11:42:06 CEST 2009 - jsuchome(a)suse.cz Modified: trunk/samba-server/src/samba-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/samba-server.de… ============================================================================== --- trunk/samba-server/src/samba-server.desktop (original) +++ trunk/samba-server/src/samba-server.desktop Thu Jan 14 11:19:01 2010 @@ -20,9 +20,8 @@ X-SuSE-YaST-AutoInstSchema=samba-server.rnc Icon=yast-samba-server -Exec=/sbin/yast2 samba-server +Exec=xdg-su -c "/sbin/yast2 samba-server" Name=Samba Server GenericName=Configure a Samba server -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.ch… ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Wed Dec 23 15:21:13 CET 2009 - jsmeix(a)suse.de Modified: trunk/scanner/src/scanner.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/scanner.desktop?rev=… ============================================================================== --- trunk/scanner/src/scanner.desktop (original) +++ trunk/scanner/src/scanner.desktop Thu Jan 14 11:19:01 2010 @@ -5,7 +5,6 @@ X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 -X-KDE-SubstituteUID=true X-SuSE-YaST-Call=scanner X-SuSE-YaST-Group=Hardware X-SuSE-YaST-Argument= @@ -15,7 +14,7 @@ X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstResource= Icon=yast-scanner -Exec=/sbin/yast2 scanner +Exec=xdg-su -c "/sbin/yast2 scanner" Name=Scanner GenericName=Configure a scanner StartupNotify=true Modified: trunk/security/package/yast2-security.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/package/yast2-security.… ============================================================================== --- trunk/security/package/yast2-security.changes (original) +++ trunk/security/package/yast2-security.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Mon Dec 21 15:10:36 CET 2009 - jsuchome(a)suse.cz Modified: trunk/security/src/security.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/security.desktop?re… ============================================================================== --- trunk/security/src/security.desktop (original) +++ trunk/security/src/security.desktop Thu Jan 14 11:19:01 2010 @@ -20,9 +20,8 @@ X-SuSE-YaST-Keywords=security,system settings Icon=yast-security -Exec=/sbin/yast2 security +Exec=xdg-su -c "/sbin/yast2 security" Name=Local Security GenericName=Configure local security settings -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/slp-server/package/yast2-slp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/package/yast2-slp-ser… ============================================================================== --- trunk/slp-server/package/yast2-slp-server.changes (original) +++ trunk/slp-server/package/yast2-slp-server.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Thu May 21 10:07:37 CEST 2009 - mzugec(a)suse.cz - accept both IP and hostname in configuration (bnc#501941) Modified: trunk/slp-server/src/slp-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/src/slp-server.deskto… ============================================================================== --- trunk/slp-server/src/slp-server.desktop (original) +++ trunk/slp-server/src/slp-server.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource=slp-server Icon=yast-slp-server -Exec=/sbin/yast2 slp-server +Exec=xdg-su -c "/sbin/yast2 slp-server" Name=SLP Server GenericName=Configure a SLP server -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/slp/package/yast2-slp.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp/package/yast2-slp.changes?re… ============================================================================== --- trunk/slp/package/yast2-slp.changes (original) +++ trunk/slp/package/yast2-slp.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Tue Jun 16 14:58:01 CEST 2009 - mvidner(a)suse.cz - Using autodocs-ycp.ami, which contains a fix for automake 1.11. Modified: trunk/slp/src/slp.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp/src/slp.desktop?rev=60356&r1… ============================================================================== --- trunk/slp/src/slp.desktop (original) +++ trunk/slp/src/slp.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-slp -Exec=/sbin/yast2 slp +Exec=xdg-su -c "/sbin/yast2 slp" Name=SLP Browser GenericName=SLP Browser -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Wed Dec 30 16:16:00 UTC 2009 - lslezak(a)suse.cz Modified: trunk/sound/sound/src/joystick.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/joystick.desktop… ============================================================================== --- trunk/sound/sound/src/joystick.desktop (original) +++ trunk/sound/sound/src/joystick.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-joystick -Exec=/sbin/yast2 joystick +Exec=xdg-su -c "/sbin/yast2 joystick" Name=Joystick GenericName=Configure a joystick attached to the sound card -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/sound/sound/src/sound.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/sound.desktop?re… ============================================================================== --- trunk/sound/sound/src/sound.desktop (original) +++ trunk/sound/sound/src/sound.desktop Thu Jan 14 11:19:01 2010 @@ -18,9 +18,8 @@ X-SuSE-YaST-AutoInstSchema=sound.rnc Icon=yast-sound -Exec=/sbin/yast2 sound +Exec=xdg-su -c "/sbin/yast2 sound" Name=Sound GenericName=Configure your sound card -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/squid/config/squid.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/config/squid.desktop?rev=6… ============================================================================== --- trunk/squid/config/squid.desktop (original) +++ trunk/squid/config/squid.desktop Thu Jan 14 11:19:01 2010 @@ -18,9 +18,8 @@ X-SuSE-YaST-AutoInstSchema=squid.rnc Icon=yast-squid -Exec=/sbin/yast2 squid +Exec=xdg-su -c "/sbin/yast2 squid" Name=Squid GenericName=Configure a Squid cache proxy server -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/squid/package/yast2-squid.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/package/yast2-squid.change… ============================================================================== --- trunk/squid/package/yast2-squid.changes (original) +++ trunk/squid/package/yast2-squid.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Mon Jan 12 16:52:35 CET 2009 - jsrain(a)suse.de Modified: trunk/squidguard/package/yast2-squidguard.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/squidguard/package/yast2-squidgu… ============================================================================== --- trunk/squidguard/package/yast2-squidguard.changes (original) +++ trunk/squidguard/package/yast2-squidguard.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz Modified: trunk/squidguard/src/squidguard.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/squidguard/src/squidguard.deskto… ============================================================================== --- trunk/squidguard/src/squidguard.desktop (original) +++ trunk/squidguard/src/squidguard.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource=squidguard Icon=yast-squidguard -Exec=/sbin/yast2 squidguard +Exec=xdg-su -c "/sbin/yast2 squidguard" Name=Squidguard GenericName=Configure SquidGuard Redirector -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/sshd/package/yast2-sshd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/package/yast2-sshd.changes?… ============================================================================== --- trunk/sshd/package/yast2-sshd.changes (original) +++ trunk/sshd/package/yast2-sshd.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Tue Feb 24 16:44:38 CET 2009 - locilka(a)suse.cz - Added Login Settings help and improved the current dialog labels Modified: trunk/sshd/src/sshd.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/sshd.desktop?rev=60356&… ============================================================================== --- trunk/sshd/src/sshd.desktop (original) +++ trunk/sshd/src/sshd.desktop Thu Jan 14 11:19:01 2010 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstRequires=lan Icon=yast-sshd -Exec=/sbin/yast2 sshd +Exec=xdg-su -c "/sbin/yast2 sshd" Name=SSHD Configuration GenericName=Configure a SSHD Daemon -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/storage/disk/src/disk.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/disk/src/disk.desktop?re… ============================================================================== --- trunk/storage/disk/src/disk.desktop (original) +++ trunk/storage/disk/src/disk.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-disk -Exec=/sbin/yast2 disk +Exec=xdg-su -c "/sbin/yast2 disk" Name=Partitioner GenericName=Partition hard disks (including RAID, LVM, and encrypted file systems) -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Wed Jan 13 18:40:58 CET 2010 - aschnell(a)suse.de - fixed importing mount points for cases where the proposal has Modified: trunk/sudo/package/yast2-sudo.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/package/yast2-sudo.changes?… ============================================================================== --- trunk/sudo/package/yast2-sudo.changes (original) +++ trunk/sudo/package/yast2-sudo.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Mon Apr 20 11:32:27 CEST 2009 - kmachalkova(a)suse.cz Modified: trunk/sudo/src/sudo.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/sudo.desktop?rev=60356&… ============================================================================== --- trunk/sudo/src/sudo.desktop (original) +++ trunk/sudo/src/sudo.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource=sudo Icon=yast-sudo -Exec=/sbin/yast2 sudo +Exec=xdg-su -c "/sbin/yast2 sudo" Name=Sudo GenericName=Configure sudo -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/package/yast2-support.ch… ============================================================================== --- trunk/support/package/yast2-support.changes (original) +++ trunk/support/package/yast2-support.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Thu Feb 12 17:52:08 CET 2009 - mzugec(a)suse.cz - set window title (bnc#474618) Modified: trunk/support/src/support.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/support.desktop?rev=… ============================================================================== --- trunk/support/src/support.desktop (original) +++ trunk/support/src/support.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource=support Icon=yast-support -Exec=/sbin/yast2 support +Exec=xdg-su -c "/sbin/yast2 support" Name=Support GenericName=support -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/sysconfig/package/yast2-sysconfig.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/package/yast2-sysconfi… ============================================================================== --- trunk/sysconfig/package/yast2-sysconfig.changes (original) +++ trunk/sysconfig/package/yast2-sysconfig.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Tue Jun 16 14:29:29 CEST 2009 - mvidner(a)suse.cz Modified: trunk/sysconfig/src/sysconfig.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/src/sysconfig.desktop?… ============================================================================== --- trunk/sysconfig/src/sysconfig.desktop (original) +++ trunk/sysconfig/src/sysconfig.desktop Thu Jan 14 11:19:01 2010 @@ -18,9 +18,8 @@ X-SuSE-YaST-AutoInstSchema=sysconfig.rnc Icon=yast-sysconfig -Exec=/sbin/yast2 sysconfig +Exec=xdg-su -c "/sbin/yast2 sysconfig" Name=/etc/sysconfig Editor GenericName=Change settings in /etc/sysconfig configuration files -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/system-profile/package/yast2-system-profile.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/system-profile/package/yast2-sys… ============================================================================== --- trunk/system-profile/package/yast2-system-profile.changes (original) +++ trunk/system-profile/package/yast2-system-profile.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Tue Jan 27 16:25:05 CET 2009 - jdsn(a)suse.de - fixing typo consistently (bnc#441221) Modified: trunk/system-profile/src/system-profile.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/system-profile/src/system-profil… ============================================================================== --- trunk/system-profile/src/system-profile.desktop (original) +++ trunk/system-profile/src/system-profile.desktop Thu Jan 14 11:19:01 2010 @@ -20,9 +20,8 @@ X-SuSE-YaST-AutoInstResource=system-profile Icon=yast-system-profile -Exec=/sbin/yast2 system-profile +Exec=xdg-su -c "/sbin/yast2 system-profile" Name=Smolt Project GenericName=Smolt Project -X-KDE-SubstituteUID=true Modified: trunk/tftp-server/package/yast2-tftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tftp-server/package/yast2-tftp-s… ============================================================================== --- trunk/tftp-server/package/yast2-tftp-server.changes (original) +++ trunk/tftp-server/package/yast2-tftp-server.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Sat Sep 5 06:04:03 CEST 2009 - mvidner(a)suse.cz Modified: trunk/tftp-server/src/tftp-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/tftp-server/src/tftp-server.desk… ============================================================================== --- trunk/tftp-server/src/tftp-server.desktop (original) +++ trunk/tftp-server/src/tftp-server.desktop Thu Jan 14 11:19:01 2010 @@ -18,9 +18,8 @@ X-SuSE-YaST-Keywords=TFTP,server,boot,trivial,file,transfer,protocol Icon=yast-tftp-server -Exec=/sbin/yast2 tftp-server +Exec=xdg-su -c "/sbin/yast2 tftp-server" Name=TFTP Server GenericName=Configure a TFTP server -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/tune/hwinfo/src/hwinfo.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/hwinfo/src/hwinfo.desktop?r… ============================================================================== --- trunk/tune/hwinfo/src/hwinfo.desktop (original) +++ trunk/tune/hwinfo/src/hwinfo.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-hwinfo -Exec=/sbin/yast2 hwinfo +Exec=xdg-su -c "/sbin/yast2 hwinfo" Name=Hardware Information GenericName=View hardware information -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/tune/hwinfo/src/system_settings.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/hwinfo/src/system_settings.… ============================================================================== --- trunk/tune/hwinfo/src/system_settings.desktop (original) +++ trunk/tune/hwinfo/src/system_settings.desktop Thu Jan 14 11:19:01 2010 @@ -17,7 +17,7 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-powertweak -Exec=/sbin/yast2 system_settings +Exec=xdg-su -c "/sbin/yast2 system_settings" Name=Kernel Settings GenericName=Configure Low-Level System Options Modified: trunk/tune/idedma/src/idedma.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/idedma/src/idedma.desktop?r… ============================================================================== --- trunk/tune/idedma/src/idedma.desktop (original) +++ trunk/tune/idedma/src/idedma.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-idedma -Exec=/sbin/yast2 idedma +Exec=xdg-su -c "/sbin/yast2 idedma" Name=IDE DMA Mode GenericName=Configure the DMA mode of IDE devices -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/tune/package/yast2-tune.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/package/yast2-tune.changes?… ============================================================================== --- trunk/tune/package/yast2-tune.changes (original) +++ trunk/tune/package/yast2-tune.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Thu Mar 26 08:33:55 CET 2009 - lslezak(a)suse.cz Modified: trunk/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/package/yast2-tv.changes?rev=… ============================================================================== --- trunk/tv/package/yast2-tv.changes (original) +++ trunk/tv/package/yast2-tv.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Tue Jan 12 09:39:21 UTC 2010 - lslezak(a)suse.cz Modified: trunk/tv/src/tv.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/tv.desktop?rev=60356&r1=6… ============================================================================== --- trunk/tv/src/tv.desktop (original) +++ trunk/tv/src/tv.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-tv -Exec=/sbin/yast2 tv +Exec=xdg-su -c "/sbin/yast2 tv" Name=TV Card GenericName=Configure a TV card -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Tue Sep 8 13:46:06 CEST 2009 - kmachalkova(a)suse.cz Modified: trunk/update/src/config/update.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/config/update.desktop… ============================================================================== --- trunk/update/src/config/update.desktop (original) +++ trunk/update/src/config/update.desktop Thu Jan 14 11:19:01 2010 @@ -17,10 +17,9 @@ X-SuSE-YaST-AutoinstResource= Icon=yast-update -Exec=/sbin/yast2 update +Exec=xdg-su -c "/sbin/yast2 update" Name=FACTORY Update GenericName=Update your system to the newest packages from FACTORY (expert tool) Comment=Update your system to the newest packages from FACTORY (expert tool) -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Tue Dec 8 10:37:37 CET 2009 - jsuchome(a)suse.cz Modified: trunk/users/src/users.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users.desktop?rev=6035… ============================================================================== --- trunk/users/src/users.desktop (original) +++ trunk/users/src/users.desktop Thu Jan 14 11:19:01 2010 @@ -22,9 +22,8 @@ X-SuSE-YaST-Keywords=user,group,authentication,login,password Icon=yast-users -Exec=/sbin/yast2 users +Exec=xdg-su -c "/sbin/yast2 users" Name=User and Group Management GenericName=Add, Edit, Delete Users or User Groups -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/package/yast2-vm.changes?rev=… ============================================================================== --- trunk/vm/package/yast2-vm.changes (original) +++ trunk/vm/package/yast2-vm.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Wed Dec 2 16:23:55 MST 2009 - carnold(a)novell.com Modified: trunk/vm/src/xen.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/xen.desktop?rev=60356&r1=… ============================================================================== --- trunk/vm/src/xen.desktop (original) +++ trunk/vm/src/xen.desktop Thu Jan 14 11:19:01 2010 @@ -16,9 +16,8 @@ X-SuSE-YaST-AutoinstResource= Icon=yast-vm-install -Exec=/sbin/yast2 xen +Exec=xdg-su -c "/sbin/yast2 xen" Name=Install Hypervisor and Tools GenericName=Install Hypervisor and Tools -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Thu Jan 14 11:19:01 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + ------------------------------------------------------------------- Tue Sep 8 13:46:06 CEST 2009 - kmachalkova(a)suse.cz Modified: trunk/wagon/src/config/cd_update.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/config/cd_update.deskt… ============================================================================== --- trunk/wagon/src/config/cd_update.desktop (original) +++ trunk/wagon/src/config/cd_update.desktop Thu Jan 14 11:19:01 2010 @@ -17,9 +17,8 @@ X-SuSE-YaST-AutoInstResource= Icon=yast-cd_update -Exec=/sbin/yast2 wagon PatchCD +Exec=xdg-su -c "/sbin/yast2 wagon PatchCD" Name=Patch CD Update GenericName=Install patches from CD to correct and improve your existing installation -X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?re… ============================================================================== --- trunk/x11/package/yast2-x11.changes (original) +++ trunk/x11/package/yast2-x11.changes Thu Jan 14 11:19:01 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- Thu Jul 30 15:05:58 CEST 2009 - jdsn(a)suse.de - disabled yast2-x11, but keep API Modified: trunk/x11/src/config/x11.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/config/x11.desktop?rev=6… ============================================================================== --- trunk/x11/src/config/x11.desktop (original) +++ trunk/x11/src/config/x11.desktop Thu Jan 14 11:19:01 2010 @@ -20,9 +20,8 @@ X-SuSE-YaST-AutoInstSchema=x11.rnc Icon=yast-x11 -Exec=/sbin/yast2 x11 +Exec=xdg-su -c "/sbin/yast2 x11" Name=Graphics Card and Monitor GenericName=Configure the graphics card and monitor -X-KDE-SubstituteUID=true StartupNotify=true -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60355 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 14 Jan '10

14 Jan '10

Author: aschnell Date: Thu Jan 14 10:58:08 2010 New Revision: 60355 URL: http://svn.opensuse.org/viewcvs/yast?rev=60355&view=rev Log: - fixed nil handling Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Jan 14 10:58:08 2010 @@ -585,7 +585,7 @@ else if( search( device, "/dev/md" )==0 && size(ls)==2 ) { integer pos = search(device, "p"); - if (pos > 0) + if (pos != nil) dlen = pos; else dlen = 7; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60354 - /trunk/core/libycp/src/YCPBuiltinString.cc
by aschnell＠svn.opensuse.org 14 Jan '10

14 Jan '10

Author: aschnell Date: Thu Jan 14 10:53:10 2010 New Revision: 60354 URL: http://svn.opensuse.org/viewcvs/yast?rev=60354&view=rev Log: - fixed documentation Modified: trunk/core/libycp/src/YCPBuiltinString.cc Modified: trunk/core/libycp/src/YCPBuiltinString.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinString… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinString.cc (original) +++ trunk/core/libycp/src/YCPBuiltinString.cc Thu Jan 14 10:53:10 2010 @@ -467,7 +467,7 @@ * @param string STRING1 String * @param string STRING2 Substring * @return integer OFFSET - * If substring is not found find returns `nil'. + * If substring is not found search returns `nil'. * * @description * -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60353 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-lib.ycp
by aschnell＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: aschnell Date: Wed Jan 13 19:25:27 2010 New Revision: 60353 URL: http://svn.opensuse.org/viewcvs/yast?rev=60353&view=rev Log: - fixed importing mount points for cases where the proposal has deleted partitions (bnc #463327) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-lib.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Jan 13 19:25:27 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 13 18:40:58 CET 2010 - aschnell(a)suse.de + +- fixed importing mount points for cases where the proposal has + deleted partitions (bnc #463327) + +------------------------------------------------------------------- Wed Jan 13 14:54:47 CET 2010 - fehr(a)suse.de - set fs to detected fs when format is set to false to prevent Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Wed Jan 13 19:25:27 2010 @@ -273,19 +273,20 @@ void ImportMountPoints() { - map<string,map> od = (map<string,map>)Storage::GetOndiskTarget(); - list<list> fstab = scanAndReadExistingFstab( od ); + Storage::CreateTargetBackup("import"); + Storage::ResetOndiskTarget(); + + map<string, map> target_map = Storage::GetOndiskTarget(); + list<list> fstab = scanAndReadExistingFstab(target_map); y2milestone( "adapt_mp fstab %1", fstab ); - list ti = maplist( list e, fstab, ``(AddFstabToData( od, (list<map>)e)[1]:$[])); + list ti = maplist( list e, fstab, ``(AddFstabToData( target_map, (list<map>)e)[1]:$[])); y2milestone( "adapt_mp ti %1", ti ); integer idx = FstabAddDialog( ti ); if( idx>=0 ) { - od = (map<string,map>)Storage::GetOndiskTarget(); y2milestone( "adapt_mp use fstab idx %1", idx ); - ti = AddFstabToData( od, (list<map>)fstab[idx]:[] ); - Storage::ResetOndiskTarget(); + ti = AddFstabToData( target_map, (list<map>)fstab[idx]:[] ); foreach( string d, map disk, ti[0]:$[], ``{ foreach( map p, disk["partitions"]:[], @@ -299,7 +300,13 @@ } }); }); + Storage::SetTargetMap(ti[0]:$[]); + Storage::DisposeTargetBackup("import"); + } + else + { + Storage::RestoreTargetBackup("import"); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60352 - in /branches/SuSE-Code-11-SP1-Branch/registration: ./ package/ src/clients/ src/modules/
by jdsn＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: jdsn Date: Wed Jan 13 18:59:53 2010 New Revision: 60352 URL: http://svn.opensuse.org/viewcvs/yast?rev=60352&view=rev Log: port changes from Code11 to Code11 SP1 (2.17.26-28) * port webyast API to SLE11 - 2.17.26 * fix XML format for stateless registration API - 2.17.27 * fixes in REST API to prevent server error and loops (bnc#553244) 2.17.28 always reset registration server url (bnc#557194) 2.17.29 Added: branches/SuSE-Code-11-SP1-Branch/registration/package/org.opensuse.yast.modules.ysr.policy Modified: branches/SuSE-Code-11-SP1-Branch/registration/VERSION branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/VERSION Wed Jan 13 18:59:53 2010 @@ -1 +1 @@ -2.17.25 +2.17.29 Added: branches/SuSE-Code-11-SP1-Branch/registration/package/org.opensuse.yast.modules.ysr.policy URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/package/org.opensuse.yast.modules.ysr.policy (added) +++ branches/SuSE-Code-11-SP1-Branch/registration/package/org.opensuse.yast.modules.ysr.policy Wed Jan 13 18:59:53 2010 @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" + "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd"> + +<policyconfig> + <vendor>Novell, Inc.</vendor> + <vendor_url>http://www.novell.com</vendor_url> + + <action id="org.opensuse.yast.modules.ysr.statelessregister"> + <description>Run a registration in stateless context.</description> + <message>Could not run YSR.stateless_register.</message> + <defaults> + <allow_any>no</allow_any> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin_keep_session</allow_active> + </defaults> + </action> + + <action id="org.opensuse.yast.modules.ysr.getregistrationconfig"> + <description>Get registration information.</description> + <message>Could not run YSR.get_registrationConfig.</message> + <defaults> + <allow_any>no</allow_any> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin_keep_session</allow_active> + </defaults> + </action> + + <action id="org.opensuse.yast.modules.ysr.setregistrationconfig"> + <description>Set registration information.</description> + <message>Could not run YSR.set_registrationConfig.</message> + <defaults> + <allow_any>no</allow_any> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin_keep_session</allow_active> + </defaults> + </action> + +</policyconfig> + Modified: branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes Wed Jan 13 18:59:53 2010 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Wed Jan 13 18:26:17 CET 2010 - jdsn(a)suse.de + +- port changes from Code11 to Code11 SP1 (2.17.26-28) + * port webyast API to SLE11 - 2.17.26 + * fix XML format for stateless registration API - 2.17.27 + * fixes in REST API to prevent server error and loops + (bnc#553244) - 2.17.28 +- always reset registration server url (bnc#557194) +- 2.17.29 + +------------------------------------------------------------------- Thu Apr 23 21:14:23 CEST 2009 - jdsn(a)suse.de - check boolean values also for nil to prevent crashes (bnc#516330) Modified: branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp Wed Jan 13 18:59:53 2010 @@ -673,6 +673,8 @@ Register::smt_server_cert = curRegCert; y2milestone("New registration server: %1", curRegURL); y2milestone("New registration server CA certificate location: %1", curRegCert); + // run setup again, make sure settings get reset (maybe registration was already initalized and an error occurred) (bnc#557194) + Register::setupRegistrationServer(nil); status=true; break; } Modified: branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp Wed Jan 13 18:59:53 2010 @@ -280,6 +280,8 @@ */ global symbol setupRegistrationServer(symbol mode) { + // invalidate a previous registration initialization as now settings may change (bnc#557194) + isInitializedSR = false; // in case smt_server is undefined nothing needs to be done if (smt_server == nil || smt_server == "") return `ok; Modified: branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm Wed Jan 13 18:59:53 2010 @@ -2,7 +2,7 @@ # Copyright (c) 2008 SUSE LINUX Products GmbH. All rights reserved. # # Author: Michael Calmer <mc(a)suse.de>, 2008 -# Editor: J. Daniel Schmidt <jdsn(a)suse.de>, 2008 +# Editor: J. Daniel Schmidt <jdsn(a)suse.de>, 2008,2009 # # YSR.pm - interface for YaST to interact with SUSE::SuseRegister # @@ -12,6 +12,9 @@ use strict; use SUSE::SuseRegister; use Data::Dumper; +use XML::Simple; + +use YaPI; our %TYPEINFO; @@ -120,11 +123,11 @@ { if(defined $value && ref($value) eq "HASH" ) { - $global_ctx->{args}->{key} = $value; + $global_ctx->{args}->{$key} = $value; } else { - delete $global_ctx->{args}->{key}; + delete $global_ctx->{args}->{$key}; } } } @@ -179,6 +182,559 @@ } } + +BEGIN { $TYPEINFO{statelessregister} = ["function", [ "map", "string", "any"], ["map", "string", "any"], ["map", "string", "any"]]; } +sub statelessregister +{ + my $self = shift; + my $ctx = shift; + my $arguments = shift; + my $SRregisterFlagFile = '/var/lib/yastws/registration_successful'; + + unless ( defined $ctx && ref($ctx) eq "HASH" ) + { + return { 'error' => 'The context is missing or invalid.', + 'contexterror' => '1' }; + } + + # check if the system is still initialized - otherwise run init_ctx again + unless ( defined $global_ctx && ref($global_ctx) eq "HASH" && exists $global_ctx->{debug} ) + { + # not initialized - need to reinitialize + + # 1. proxy + if ( exists $ctx->{'proxy'} && ref($ctx->{'proxy'}) eq "HASH" ) + { + my $http = $ctx->{'proxy'}{'http_proxy'} || undef; + my $https = $ctx->{'proxy'}{'https_proxy'} || undef; + $self->set_proxy($http, $https); + } + + # 2. registration context + $self->init_ctx($ctx); + my $init_err = $self->get_errorcode(); + + unless ($init_err == 0) + { + # init failed + return { 'error' => 'The initialization of the registration failed.' + ,'initerror' => $init_err + ,'errorcode' => $init_err + }; + } + } + + # set arguments + # must be set one for one, otherwise other data would be overwritten + foreach my $key ( keys %{$arguments} ) + { + ## $self->set_arg( $key, { flag => 'i', value => ${$arguments}{$key} , kind => 'mandatory' } ); + ## $self->set_arg( $key, { value => ${$arguments}{$key} } ); + $self->set_arg( $key, { 'value' => ${$arguments}{$key} } ); + } + + # run registration + my $exitcode = 1; + my $errorcode = 0; + my $readabletext = ''; + my $tasklist = ''; + my $manualurl = ''; + my @log = []; + + my $counter = 0; + do + { + $exitcode = $self->register(); + $counter++; + } while ( $exitcode == 1 && $counter < 5 ); + + $errorcode = $self->get_errorcode(); + $readabletext = $self->get_registerReadableText(); + $manualurl = $self->get_manualURL(); + + + my $regret = { 'exitcode' => $exitcode + ,'errorcode' => $errorcode + ,'readabletext' => $readabletext + ,'manualurl' => $manualurl + }; + + if ( $exitcode == 0 ) + { + # successful registration, so we need to save the last ZMD config + $self->saveLastZmdConfig(); + $tasklist = $self->getTaskList() || {}; + my $ret = $self->changerepos($tasklist); + + if ( ref($ret) eq 'HASH' ) + { + my $rlog = ${$ret}{'log'} || []; + ${$regret}{'repochangeslog'} = XMLout( { 'log' => $rlog}, rootname => 'log' ); + + my $errcount = 0; + foreach my $logline ( @{$rlog} ) + { + $errcount++ if $logline =~ /^ERROR:/; + } + ${$regret}{'repochangeerrors'} = $errcount if $errcount > 0; + } + + ${$regret}{'success'} = 'Successfully ran registration'; + # prepare the tasklist for XML conversion + foreach my $k (keys %{$tasklist}) + { + if ( exists ${${$tasklist}{$k}}{'CATALOGS'} ) + { + ${${$tasklist}{$k}}{'CATALOGS'} = { 'catalog' => ${${$tasklist}{$k}}{'CATALOGS'} }; + } + } + ${$regret}{'tasklist'} = XMLout( {'item' => $tasklist}, rootname => 'tasklist', KeyAttr => { item => "+ALIAS", catalog => "+ALIAS" }, NoAttr => 1); + + # write flagfile for successful registration + open(FLAGFILE, "> $SRregisterFlagFile"); + print FLAGFILE localtime(); + close FLAGFILE; + + # to be on the safe side for a following registration request, we need to delete the context data + $self->del_ctx(); + } + elsif ( $exitcode == 3 ) + { + ${$regret}{'error'} = 'Conflicting registration data'; + ${$regret}{'conflicterror'} = '1'; + } + elsif ( $exitcode == 4 ) + { + ${$regret}{'missinginfo'} = 'Missing Information'; + my $margs = $self->get_args() || {}; + ${$regret}{'missingarguments'} = XMLout($margs, rootname => 'missingarguments'); + } + elsif ( $exitcode == 100 || $exitcode == 101 ) + { + ${$regret}{'error'} = 'No products to register'; + ${$regret}{'noproducterror'} = '1'; + } + else + { + ${$regret}{'error'} = 'Registration was not successful'; + } + + return $regret; +} + + +BEGIN { $TYPEINFO{getregistrationconfig} = ["function", [ "map", "string", "any"] ]; } +sub getregistrationconfig +{ + my $self = shift; + my $SRconf = '/etc/suseRegister.conf'; + my $SRcert = '/etc/ssl/certs/registration-server.pem'; + my $SRcredentials = '/etc/zypp/credentials.d/NCCcredentials'; + my $SRregisterFlagFile = '/var/lib/yastws/registration_successful'; + + my $url = undef; + my $cert = undef; + my $guid = undef; + + # read the registration server url + if ( -e $SRconf ) + { + if (open(CNF, "< $SRconf") ) + { + while(<CNF>) + { + next if($_ =~ /^\s*#/); + + if($_ =~ /^url\s*=\s*(\S*)\s*/ && defined $1 && $1 ne '') + { $url = $1; } + } + close CNF; + } + } + + #read the registration server ca certificate file + if ( -e $SRcert ) + { + my $separator = $/; + local $/ = undef; + if ( open(CERT, "< $SRcert") ) + { + $cert = <CERT>; + close CERT; + } + $/ = $separator; + } + + # read the guid + if ( -e $SRcredentials && -e $SRregisterFlagFile ) + { + if (open(CRED, "< $SRcredentials") ) + { + while(<CRED>) + { + next if($_ =~ /^\s*#/); + + if($_ =~ /^\s*username\s*=\s*(\S*)\s*/ && defined $1 && $1 ne '') + { $guid = $1; } + } + close CRED; + } + } + + $url = '' unless defined $url; + $cert = '' unless defined $cert; + $guid = '' unless defined $guid; + + # delete a flagfile that might be still there if no guid is found + unlink($SRregisterFlagFile) if $guid eq ''; + + return { "regserverurl" => $url, + "regserverca" => $cert, + "guid" => $guid }; +} + + +BEGIN { $TYPEINFO{setregistrationconfig} = ["function", "integer", [ "map", "string", "string"] ]; } +sub setregistrationconfig +{ + my $self = shift; + my $config = shift; + + my $SRconf = '/etc/suseRegister.conf'; + my $SRcertpath = '/etc/ssl/certs/'; + my $SRcert = "$SRcertpath/registration-server.pem"; + my $SRcertnew = "$SRcertpath/registration-server.pem_new"; + + my $url = ${$config}{'regserverurl'} || undef; + my $cert = ${$config}{'regserverca'} || undef; + my $newconfig = ''; + my $success = 0; + + # write the new registration server url to the suseRegister.conf file + if ($url && $url =~ /^https:\/\//) + { + if ( -e $SRconf ) + { + if (open(CNFR, "< $SRconf") ) + { + while(<CNFR>) + { + $_ =~ s/^url\s*=\s*(\S*)\s*/url = $url\n/; + $newconfig .= $_; + } + close CNFR; + + if ( open(CNFW, "> $SRconf") ) + { + print CNFW $newconfig; + close CNFW; + $success += 1; + } + } + } + } + + # write the new certificate and rehash the directory + if ($cert) + { + if ( open(CERT, "> $SRcertnew") ) + { + print CERT $cert; + close CERT; + # writing the file succeeded + $success += 2; + + my @verifyargs = ('openssl', 'x509', '-in', "$SRcertnew", '-text'); + if ( system( @verifyargs ) == 0 ) + { + my @moveargs = ('mv', "$SRcertnew", "$SRcert" ); + if ( system( @moveargs ) == 0 ) + { + # certificate validation succeeded and it was moved to the real file name + $success += 4; + + # rehash the certificate pool + my @rehashargs = ('c_rehash', '/etc/ssl/certs/'); + if ( system( @rehashargs ) == 0 ) + { + # c_rehashing of certificate pool succeeded + $success += 8; + } + } + } + else + { + # delete the *_new file + unlink( $SRcertnew ); + # correct the success status + $success -= 2; + } + } + } + + return $success; +} + +# +# check catalogs +# +# check catalogs of services and apply changes according to the CATALOGS-subhash of the getTaskList hash +# +sub checkcatalogs +{ + my $self = shift; + my $todo = shift; + my $pService = shift; + + return ["Service name is undefined. Can not check the catalogs."] unless ( defined $pService ); + return ["Catalog list is empty. No catalogs to check."] unless ( defined $todo && ref($todo) eq 'HASH' ); + + my @log = []; + my ($catalog, $pAny); + + foreach $catalog (keys %{$todo}) + { + $pAny = ${$todo}{$catalog}; + if ( not defined $catalog || $catalog eq '' ) + { + push @log, "A catalog returned by SuseRegister has no or an invalid name."; + } + elsif ( not defined $pAny || ref($pAny) ne 'HASH' ) + { + push @log, "A catalog returned by SuseRegister did not contain any details: $catalog"; + } + else + { + if ( not exists ${$pAny}{'ALIAS'} || not defined ${$pAny}{'ALIAS'} || ${$pAny}{'ALIAS'} eq '' ) + { + push @log, "A catalog returned by SuseRegister has no or an invalid alias name."; + } + else + { + if ( not exists ${$pAny}{'TASK'} || not defined ${$pAny}{'TASK'} || ${$pAny}{'TASK'} eq '' ) + { + push @log, "A catalog returned by SuseRegister has an invalid task: $catalog ($pService)"; + } + elsif ( ${$pAny}{"TASK"} eq 'le' || ${$pAny}{"TASK"} eq 'ld') + { + push @log, "According to SuseRegister a catalog does not need to be changed: $catalog ($pService)"; + } + elsif ( ${$pAny}{"TASK"} eq 'a' ) + { + push @log, "According to SuseRegister a catalog has to be enabled: $catalog ($pService)"; + my @zCMD = ('zypper', '--non-interactive', 'modifyrepo', '--enable', "${$pAny}{'ALIAS'}"); + if ( system(@zCMD) == 0 ) + { + push @log, "Enabled catalog: ${$pAny}{'ALIAS'} ($pService)"; + } + else + { + push @log, "ERROR: Could not enable catalog: ${$pAny}{'ALIAS'} ($pService)"; + } + } + elsif ( ${$pAny}{"TASK"} eq 'd' ) + { + push @log, "According to SuseRegister a service has to be disabled: $catalog ($pService)"; + my @zCMD = ('zypper', '--non-interactive', 'modifyrepo', '--disable', ${$pAny}{'ALIAS'}); + if ( system(@zCMD) == 0 ) + { + push @log, "Disabled catalog: ${$pAny}{'ALIAS'} ($pService)"; + } + else + { + push @log, "ERROR: Could not enable catalog: ${$pAny}{'ALIAS'} ($pService)"; + } + } + } + } + } + + return @log; +} + + +# +# change repos according to todo-list +# +# takes the resulting hash of getTaskList +# +BEGIN { $TYPEINFO{changerepos} = ["function", [ "map", "string", "any"], [ "map", "string", "any"] ]; } +sub changerepos +{ + my $self = shift; + my $todo = shift; + my @log = []; + + unless (defined $todo && ref($todo) eq "HASH" && keys %{$todo} > 0) + { + push @log, "No changes need to be done to the package system."; + return { 'log' => @log }; + } + + my ($pService, $pAny); + foreach $pService (keys %{$todo}) + { + $pAny = ${$todo}{$pService}; + + if ( ref($pAny) ne 'HASH' ) + { + push @log, "A service returned by SuseRegister did not contain any details: $pService"; + } + elsif ( not defined $pService || $pService eq '') + { + push @log, "A service returned by SuseRegister has no or an invalid name."; + } + else + { + if ( defined ${$pAny}{'TYPE'} ) + { + if ( ${$pAny}{'TYPE'} eq 'zypp' ) + { + push @log, "Handling a service of the type zypp"; + + if ( not defined ${$pAny}{'TASK'} || ${$pAny}{'TASK'} eq '' ) + { + push @log, "A service returned by SuseRegister has an invalid task: $pService"; + } + elsif ( ${$pAny}{'TASK'} eq 'le' ) + { + push @log, "According to SuseRegister a service does not need to be changed: $pService"; + } + elsif ( ${$pAny}{'TASK'} eq 'a' ) + { + push @log, "According to SuseRegister a service has to be added: $pService"; + my @zCMD = ('zypper', '--non-interactive', 'addrepo', '--name', "${$pAny}{'NAME'}", '--refresh', "${$pAny}{'URL'}", "${$pAny}{'ALIAS'}" ); + my @zCMDopt = ('zypper', '--non-interactive', 'modifyrepo', '--enable', '--refresh', '--priority', defined ${$pAny}{'URL'} ? ${$pAny}{'URL'} : 99 , "${$pAny}{'URL'}"); + if ( system(@zCMD) == 0 && system(@zCMDopt) == 0 ) + { + push @log, "Successfully added a new service: $pService"; + } + else + { + push @log, "ERROR: Adding a new service failed: $pService"; + } + } + elsif ( ${$pAny}{'TASK'} eq 'd' ) + { + push @log, "According to SuseRegister a service has to be deleted: $pService"; + my @zCMD = ('zypper', '--non-interactive', 'removerepo', "$pService"); + if ( system(@zCMD) == 0 ) + { + push @log, "Successfully deleted a service: $pService"; + } + else + { + push @log, "ERROR: Could not delete a service: $pService"; + } + } + + } + elsif ( ${$pAny}{'TYPE'} eq 'nu' ) + { + push @log, "Handling a service of the type nu"; + + if ( not defined ${$pAny}{'TASK'} || ${$pAny}{'TASK'} eq '' ) + { + push @log, "A service returned by SuseRegister has an invalid task: $pService"; + } + elsif ( ${$pAny}{'TASK'} eq 'ld' ) + { + push @log, "According to SuseRegister a service should be left disabled: $pService"; + } + elsif ( ${$pAny}{'TASK'} eq 'le' ) + { + push @log, "According to SuseRegister a service should be left enabled: $pService"; + push @log, "Now checking the catalogs of the service: $pService"; + + my @zCMD = ('zypper', '--non-interactive', 'refresh', '--services'); + if ( system(@zCMD) == 0 ) + { + push @log, "Successfully refreshed service: $pService"; + } + else + { + push @log, "ERROR: Could not refresh service: $pService"; + } + push @log, $self->checkcatalogs( ${$pAny}{'CATALOGS'}, $pService ); + } + elsif ( ${$pAny}{'TASK'} eq 'a' ) + { + push @log, "According to SuseRegister a service has to be added: $pService"; + + my @zCMD = ('zypper', '--non-interactive', 'addservice', ${$pAny}{'URL'}."?credentials=NCCcredentials", ${$pAny}{'ALIAS'}); + if ( system(@zCMD) == 0 ) + { + push @log, "Successfully added a new service: $pService"; + + my @zCMD = ('zypper', '--non-interactive', 'modifyservice', '--refresh', $pService); + if ( system(@zCMD) == 0 ) + { + push @log, "Successfully enabled refreshing for service: $pService"; + } + else + { + push @log, "ERROR: Could not enable refreshing of service: $pService"; + } + + push @log, "Now checking the catalogs of the service: $pService"; + + my @zrCMD = ('zypper', '--non-interactive', 'refresh', '--services'); + if ( system(@zrCMD) == 0 ) + { + push @log, "Successfully refreshed service: $pService"; + } + else + { + push @log, "ERROR: Could not refresh service: $pService"; + } + push @log, $self->checkcatalogs( ${$pAny}{'CATALOGS'}, $pService ); + } + else + { + push @log, "Adding a new service failed: $pService"; + } + } + elsif ( ${$pAny}{'TASK'} eq 'd' ) + { + push @log, "According to SuseRegister a service has to be deleted: $pService"; + + my @zCMD = ('zypper', '--non-interactive', 'removeservice', $pService); + if ( system(@zCMD) ) + { + push @log, "Successfully deleted a service: $pService"; + } + else + { + push @log, "ERROR: Could not delete a service: $pService"; + } + } + } + else + { + push @log, "A service returned by SuseRegister has an unsupported type: $pService (${$pAny}{'TYPE'})"; + } + } # end defined ${$pAny}{'TYPE'} + else + { + push @log, "A service returned by SuseRegister has an invalid type"; + } + } + } # end foreach pService + + my @zCMD = ('zypper', '--non-interactive', 'refresh', '--services'); + if ( system(@zCMD) == 0 ) + { + push @log, "Successfully refreshed all services"; + } + else + { + push @log, "ERROR: Could not refresh all services"; + } + + return { 'log' => @log }; +} + + 1; ############################################################################# Modified: branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in Wed Jan 13 18:59:53 2010 @@ -1,4 +1,22 @@ -@HEADER-COMMENT@ +# +# spec file for package yast2-registration +# +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + @HEADER@ Requires: yast2 >= 2.17.0 @@ -20,6 +38,7 @@ BuildArchitectures: noarch Summary: Configuration of registration +Source1: org.opensuse.yast.modules.ysr.policy %description Performs the Registration @@ -29,11 +48,10 @@ @BUILD@ @INSTALL@ -#%if %sles_version -# rm $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/suse_register.desktop -#%else -# rm $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/customer_center.desktop -#%endif + +mkdir -p $RPM_BUILD_ROOT/usr/share/PolicyKit/policy +install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/ + @CLEAN@ @@ -88,6 +106,9 @@ @fillupdir@/sysconfig.suse_register-yast2-registration @fillupdir@/sysconfig.automatic_online_update-yast2-registration +# policy files +%attr(644,root,root) %config /usr/share/PolicyKit/policy/org.opensuse.yast.modules.*.policy + %files branding-SLE %defattr(-,root,root) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60351 - /trunk/yast2/scripts/save_y2logs
by aschnell＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: aschnell Date: Wed Jan 13 16:49:08 2010 New Revision: 60351 URL: http://svn.opensuse.org/viewcvs/yast?rev=60351&view=rev Log: - include dmesg output in logs Modified: trunk/yast2/scripts/save_y2logs Modified: trunk/yast2/scripts/save_y2logs URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/save_y2logs?rev=60… ============================================================================== --- trunk/yast2/scripts/save_y2logs (original) +++ trunk/yast2/scripts/save_y2logs Wed Jan 13 16:49:08 2010 @@ -49,6 +49,11 @@ LIST="$LIST $( cd /var/log/; ls evms-engine.*)" fi +if [ -x /bin/dmesg ]; then + dmesg > $TMPDIR/dmesg + LIST="$LIST $TMPDIR/dmesg" +fi + if [ -f /var/log/zypp/history ]; then LIST="$LIST $( cd /var/log/; ls zypp/history*)" fi -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60350 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: fehr Date: Wed Jan 13 14:55:23 2010 New Revision: 60350 URL: http://svn.opensuse.org/viewcvs/yast?rev=60350&view=rev Log: set fs to detected fs when format is set to false to prevent invalid fstab options (bnc #457100) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Jan 13 14:55:23 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 13 14:54:47 CET 2010 - fehr(a)suse.de + +- set fs to detected fs when format is set to false to prevent + invalid fstab options (bnc #457100) + +------------------------------------------------------------------- Tue Jan 12 16:51:38 CET 2010 - fehr(a)suse.de - do not forget user modified format options when FormatMount dialog Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Jan 13 14:55:23 2010 @@ -584,11 +584,11 @@ } else if( search( device, "/dev/md" )==0 && size(ls)==2 ) { - integer pos = find(device, "p"); - if (pos == -1) - dlen = 7; - else + integer pos = search(device, "p"); + if (pos > 0) dlen = pos; + else + dlen = 7; } else if( search( device, "/dev/loop" )==0 ) { @@ -1218,9 +1218,11 @@ p["name"] = LibStorage::VolumeInfo::swig_name_get(vinfo); integer t = LibStorage::VolumeInfo::swig_fs_get(vinfo); symbol fs = toSymbol( FileSystems::conv_fs, t ); - p["detected_fs"] = fs; - if( fs != `unknown ) + if( fs!=`unknown ) p["used_fs"] = fs; + t = LibStorage::VolumeInfo::swig_detected_fs_get(vinfo); + fs = toSymbol( FileSystems::conv_fs, t ); + p["detected_fs"] = fs; boolean tbool = LibStorage::VolumeInfo::swig_format_get(vinfo); if( tbool ) p["format"] = true; @@ -1257,7 +1259,7 @@ { p["mkfs_opt"] = tmp; p["fs_options"] = - convertStringToFsOptionMap( tmp, p["detected_fs"]:`unknown, `mkfs ); + convertStringToFsOptionMap( tmp, p["used_fs"]:`unknown, `mkfs ); } else { @@ -1269,7 +1271,7 @@ { p["tunefs_opt"] = tmp; p["fs_options"] = union(p["fs_options"]:$[], - convertStringToFsOptionMap( tmp, p["detected_fs"]:`unknown, `tunefs )); + convertStringToFsOptionMap( tmp, p["used_fs"]:`unknown, `tunefs )); } tmp = LibStorage::VolumeInfo::swig_dtxt_get(vinfo); if( size(tmp)>0 ) @@ -3613,9 +3615,11 @@ (!lvm && DetectHomeFs(ret))) { ret["format"] = false; - ret["used_fs"] = ret["detected_fs"]:`unknown; - if (isempty(fstab_opts)) + if( ret["used_fs"]:`unknown!=ret["detected_fs"]:`unknown ) + { + ret["used_fs"] = ret["detected_fs"]:`unknown; fstab_opts = FileSystems::DefaultFstabOptions(ret); + } } } if( ret["format"]:false && !ret["create"]:false && -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60349 - /tags/branch-Code-11-SP1-2_17_81/yast2/
by lslezak＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: lslezak Date: Wed Jan 13 14:10:16 2010 New Revision: 60349 URL: http://svn.opensuse.org/viewcvs/yast?rev=60349&view=rev Log: Created tag branch-Code-11-SP1-2_17_81 for yast2 Added: tags/branch-Code-11-SP1-2_17_81/yast2/ (props changed) - copied from r60348, branches/SuSE-Code-11-SP1-Branch/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60348 - in /branches/SuSE-Code-11-SP1-Branch/yast2: VERSION library/gpg/src/GPG.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: lslezak Date: Wed Jan 13 14:10:09 2010 New Revision: 60348 URL: http://svn.opensuse.org/viewcvs/yast?rev=60348&view=rev Log: - GPG.ycp - run gpg in C locale (bnc#544680) GPG.ycp - return success/error result in GPG::Init() and GPG::CreateKey() functions (bnc#544682) - 2.17.81 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION branches/SuSE-Code-11-SP1-Branch/yast2/library/gpg/src/GPG.ycp branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/VERSION Wed Jan 13 14:10:09 2010 @@ -1 +1 @@ -2.17.80 +2.17.81 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/gpg/src/GPG.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/gpg/src/GPG.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/gpg/src/GPG.ycp Wed Jan 13 14:10:09 2010 @@ -14,6 +14,7 @@ import "String"; import "Report"; +import "FileUtils"; module "GPG"; @@ -33,8 +34,14 @@ * @param home_dir home directory for gpg (location of the keyring) * @param force unconditionaly clear the key caches */ -global void Init(string home_dir, boolean force) +global boolean Init(string home_dir, boolean force) { + if (FileUtils::IsDirectory(home_dir) != true) + { + y2error("Path %1 is not a directory", home_dir); + return false; + } + if (home_dir != home || force) { // clear the cache, home has been changed @@ -43,6 +50,8 @@ } home = home_dir; + + return true; } /** @@ -67,7 +76,7 @@ map callGPG(string options) { map ret = $[]; - string command = buildGPGcommand(options); + string command = "LC_ALL=C " + buildGPGcommand(options); ret = (map) SCR::Execute(.target.bash_output, command); @@ -241,7 +250,7 @@ * Create a new gpg key. Executes 'gpg --gen-key' in an xterm window (in the QT UI) * or in the terminal window (in the ncurses UI). */ -global void CreateKey() +global boolean CreateKey() { string xterm = "/usr/bin/xterm"; string command = buildGPGcommand("--gen-key"); @@ -249,25 +258,59 @@ y2debug("text_mode: %1", text_mode); + boolean ret = false; + if (!text_mode) { if (SCR::Read(.target.size, xterm) < 0) { // TODO FIXME Report::Error(_("Xterm is missing, install xterm package.")); + return false; } + string exit_file = ((string)SCR::Read(.target.tmpdir)) + "/gpg_tmp_exit_file"; + if (FileUtils::Exists(exit_file)) + { + SCR::Execute(.target.execute, "rm -f " + exit_file); + } + + command = "LC_ALL=C " + xterm + " -e \"" + command + "; echo $? > " + exit_file + "\""; + y2internal("Executing: %1", command); + // in Qt start GPG in a xterm window - SCR::Execute(.target.bash, xterm + " -e " + command); + SCR::Execute(.target.bash, command); + + if (FileUtils::Exists(exit_file)) + { + // read the exit code from file + // (the exit code from the SCR call above is the xterm exit code which is not what we want here) + string exit_code = (string)SCR::Read(.target.string, exit_file); + y2milestone("Read exit code from tmp file %1: %2", exit_file, exit_code); + + ret = exit_code == "0\n"; + } + else + { + y2warning("Exit file is missing, the gpg command has failed"); + ret = false; + } } else { + command = "LC_ALL=C " + command; + y2internal("Executing in terminal: %1", command); // in ncurses use UI::RunInTerminal - UI::RunInTerminal(command); + ret = UI::RunInTerminal(command) == 0; } - // invalidate cache, force reloading - Init(home, true); + if (ret) + { + // invalidate cache, force reloading + Init(home, true); + } + + return ret; } /** Modified: branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Wed Jan 13 14:10:09 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Jan 12 11:15:45 UTC 2010 - lslezak(a)suse.cz + +- GPG.ycp - run gpg in C locale (bnc#544680) +- GPG.ycp - return success/error result in GPG::Init() and + GPG::CreateKey() functions (bnc#544682) +- 2.17.81 + +------------------------------------------------------------------- Thu Jan 7 10:43:13 CET 2010 - mvidner(a)suse.cz - YaST would not start from the GNOME menu (Unknown option -S) bnc#568424. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60347 - /tags/stable-2_19_2/ncurses/
by kmachalkova＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: kmachalkova Date: Wed Jan 13 12:48:37 2010 New Revision: 60347 URL: http://svn.opensuse.org/viewcvs/yast?rev=60347&view=rev Log: Created tag stable-2_19_2 for ncurses Added: tags/stable-2_19_2/ncurses/ - copied from r60346, trunk/ncurses/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60346 - /tags/stable-2_19_2/online-update/
by jsuchome＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: jsuchome Date: Wed Jan 13 09:22:48 2010 New Revision: 60346 URL: http://svn.opensuse.org/viewcvs/yast?rev=60346&view=rev Log: Created tag stable-2_19_2 for online-update Added: tags/stable-2_19_2/online-update/ - copied from r60345, trunk/online-update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60345 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/inst_you.ycp
by jsuchome＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: jsuchome Date: Wed Jan 13 09:22:31 2010 New Revision: 60345 URL: http://svn.opensuse.org/viewcvs/yast?rev=60345&view=rev Log: - inst_you: do not run again if there's no patch left (bnc#515138) - 2.19.2 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/inst_you.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=60345&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Wed Jan 13 09:22:31 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Wed Jan 13 09:22:31 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 13 09:20:17 CET 2010 - jsuchome(a)suse.cz + +- inst_you: do not run again if there's no patch left (bnc#515138) +- 2.19.2 + +------------------------------------------------------------------- Wed Jan 13 08:33:11 CET 2010 - jsuchome(a)suse.cz - call inst_suse_register if no update repo is present (bnc#565094) Modified: trunk/online-update/src/inst_you.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/inst_you.ycp?r… ============================================================================== --- trunk/online-update/src/inst_you.ycp (original) +++ trunk/online-update/src/inst_you.ycp Wed Jan 13 09:22:31 2010 @@ -310,7 +310,16 @@ else if (ret == `restart_same_step) { Popup::Message (OnlineUpdate::restart_message); - SCR::Write (.target.ycp, restarted_path, 1); + if (more_patches_needed) + { + y2milestone ("restarting YaST, expecting another patches in the next YOU run"); + SCR::Write (.target.ycp, restarted_path, 1); + } + else + { + y2milestone ("restarting YaST, but there are no patches for the next YOU run"); + ret = `restart_yast; + } } if (!already_up) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60344 - /tags/stable-2_19_0/ldap-client/
by jsuchome＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: jsuchome Date: Wed Jan 13 09:13:15 2010 New Revision: 60344 URL: http://svn.opensuse.org/viewcvs/yast?rev=60344&view=rev Log: Created tag stable-2_19_0 for ldap-client Added: tags/stable-2_19_0/ldap-client/ - copied from r60343, trunk/ldap-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60343 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp
by jsuchome＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: jsuchome Date: Wed Jan 13 09:12:53 2010 New Revision: 60343 URL: http://svn.opensuse.org/viewcvs/yast?rev=60343&view=rev Log: - use crypt for pam_password if exop is not supported (bnc#546398) - 2.19.0 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=60343&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Wed Jan 13 09:12:53 2010 @@ -1 +1 @@ -2.18.5 +2.19.0 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Wed Jan 13 09:12:53 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 13 09:06:44 CET 2010 - jsuchome(a)suse.cz + +- use crypt for pam_password if exop is not supported (bnc#546398) +- 2.19.0 + +------------------------------------------------------------------- Thu Sep 3 14:11:25 CEST 2009 - jsuchome(a)suse.cz - added keywords to desktop files Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=603… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Wed Jan 13 09:12:53 2010 @@ -682,6 +682,17 @@ nss_base_group = ReadLdapConfEntry ("nss_base_group", base_dn); pam_password = ReadLdapConfEntry ("pam_password", "exop"); + // check if Password Modify extenstion is supported (bnc#546398, c#6) + if (pam_password == "exop") + { + if (0 == SCR::Execute (.target.bash, "ldapsearch -x -b '' -s base") && // LDAP server accessible + 0 != SCR::Execute (.target.bash, + "ldapsearch -x -b '' -s base supportedExtension | grep -i '^supportedExtension:[[:space:]]*1.3.6.1.4.1.4203.1.11.1'")) + { + y2warning ("'exop' value not supported on server, using 'crypt'"); + pam_password = "crypt"; + } + } // read sysconfig values base_config_dn = (string)SCR::Read (.sysconfig.ldap.BASE_CONFIG_DN); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60342 - /tags/stable-2_19_1/online-update/
by jsuchome＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: jsuchome Date: Wed Jan 13 09:00:43 2010 New Revision: 60342 URL: http://svn.opensuse.org/viewcvs/yast?rev=60342&view=rev Log: Created tag stable-2_19_1 for online-update Added: tags/stable-2_19_1/online-update/ - copied from r60341, trunk/online-update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60341 - /tags/branch-Code-11-SP1-2_17_21/online-update/
by jsuchome＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: jsuchome Date: Wed Jan 13 09:00:41 2010 New Revision: 60341 URL: http://svn.opensuse.org/viewcvs/yast?rev=60341&view=rev Log: Created tag branch-Code-11-SP1-2_17_21 for online-update Added: tags/branch-Code-11-SP1-2_17_21/online-update/ (props changed) - copied from r60340, branches/SuSE-Code-11-SP1-Branch/online-update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60340 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/online_update.ycp
by jsuchome＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: jsuchome Date: Wed Jan 13 09:00:35 2010 New Revision: 60340 URL: http://svn.opensuse.org/viewcvs/yast?rev=60340&view=rev Log: - call inst_suse_register if no update repo is present (bnc#565094) - 2.19.1 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/online_update.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=60340&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Wed Jan 13 09:00:35 2010 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Wed Jan 13 09:00:35 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 13 08:33:11 CET 2010 - jsuchome(a)suse.cz + +- call inst_suse_register if no update repo is present (bnc#565094) +- 2.19.1 + +------------------------------------------------------------------- Wed Dec 16 13:22:57 CET 2009 - jsuchome(a)suse.cz - better message for telling user to reboot, show list of patches Modified: trunk/online-update/src/online_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/online_update.… ============================================================================== --- trunk/online-update/src/online_update.ycp (original) +++ trunk/online-update/src/online_update.ycp Wed Jan 13 09:00:35 2010 @@ -108,7 +108,9 @@ if (!is_available && Popup::YesNo (_("No update repository configured yet. Run configuration workflow now?"))) { - any res = WFM::CallFunction ("online_update_configuration", []); + // inst_suse_register is still able to configure update repo, + // however this will change in future (see bnc#565094) + any res = WFM::CallFunction ("inst_suse_register", []); if (res != `next && res != `finish) { Wizard::CloseDialog(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60339 - in /branches/SuSE-Code-11-SP1-Branch/online-update: VERSION package/yast2-online-update.changes src/online_update.ycp
by jsuchome＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: jsuchome Date: Wed Jan 13 09:00:27 2010 New Revision: 60339 URL: http://svn.opensuse.org/viewcvs/yast?rev=60339&view=rev Log: - call inst_suse_register if no update repo is present (bnc#565094) - 2.17.21 Modified: branches/SuSE-Code-11-SP1-Branch/online-update/VERSION branches/SuSE-Code-11-SP1-Branch/online-update/package/yast2-online-update.changes branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update.ycp Modified: branches/SuSE-Code-11-SP1-Branch/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/onlin… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/online-update/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/online-update/VERSION Wed Jan 13 09:00:27 2010 @@ -1 +1 @@ -2.17.20 +2.17.21 Modified: branches/SuSE-Code-11-SP1-Branch/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/onlin… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/online-update/package/yast2-online-update.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/online-update/package/yast2-online-update.changes Wed Jan 13 09:00:27 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 13 08:33:56 CET 2010 - jsuchome(a)suse.cz + +- call inst_suse_register if no update repo is present (bnc#565094) +- 2.17.21 + +------------------------------------------------------------------- Wed Dec 16 13:24:49 CET 2009 - jsuchome(a)suse.cz - better message for telling user to reboot, show list of patches Modified: branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/onlin… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/online-update/src/online_update.ycp Wed Jan 13 09:00:27 2010 @@ -91,13 +91,17 @@ break; } }); - // continue/cancel message - if (!is_available && Popup::YesNo (_("No active update repository available. -Exit Online Update now? -"))) + if (!is_available && Popup::YesNo (_("No update repository +configured yet. Run configuration workflow now?"))) { - Wizard::CloseDialog(); - return `abort; + // inst_suse_register is still able to configure update repo, + // however this will change in future (see bnc#565094) + any res = WFM::CallFunction ("inst_suse_register", []); + if (res != `next && res != `finish) + { + Wizard::CloseDialog(); + return `abort; + } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60338 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes src/NCstring.cc
by kmachalkova＠svn.opensuse.org 12 Jan '10

12 Jan '10

Author: kmachalkova Date: Tue Jan 12 19:49:52 2010 New Revision: 60338 URL: http://svn.opensuse.org/viewcvs/yast?rev=60338&view=rev Log: Improved && un-escaping (bnc#559226) Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/NCstring.cc Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=60338&r1=603… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Tue Jan 12 19:49:52 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Tue Jan 12 19:49:52 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 11 19:31:20 CET 2010 - kmachalkova(a)suse.cz + +- Improved algorithm for double '&&' escaping (this one hopefully + does not "eat" chars in some Frames anymore - still bnc#559226) +- V 2.19.2 + +------------------------------------------------------------------- Fri Dec 18 12:55:49 CET 2009 - ma(a)suse.de - Work around 32768 lines limit in ncurses table. (bnc #550733) Modified: trunk/ncurses/src/NCstring.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCstring.cc?rev=6033… ============================================================================== --- trunk/ncurses/src/NCstring.cc (original) +++ trunk/ncurses/src/NCstring.cc Tue Jan 12 19:49:52 2010 @@ -315,47 +315,67 @@ void NCstring::getHotkey( ) const -{ - +{ + hotp = wstring::npos; const wchar_t shortcutMarker = L'&'; - // strip hotkey from wstr and convert &&s - wstring::size_type tpos = 0; - wstring::size_type pos = tpos; - - // borrowed from libyui (libyui inserts "&"s if none is there, - // but fortunately it keeps "&&" in place) - while ( ( pos = wstr.find( shortcutMarker, pos ) ) != wstring::npos ) + const wchar_t replacementShortcutMarker = L'_'; + + // I'm not really happy with using replacement markers and copying the string + // but is there an other way? + // If hotkey is looked up before un-escaping, its position won't be up-to-date anymore + // as chars got deleted from the string + // And vice versa: if un-escaping is done before looking up hotkey position, it's no + // longer possible to tell hotkey marker and regular & (previous &&) apart (this is + // the 'Foo&&Bar&Geeez' case) fB. + + bool have_shortcut = false; + wstring::size_type len = wstr.length(); + wstring newstr; + newstr.reserve( len ); + + for (wstring::iterator it = wstr.begin(); it != wstr.end(); it++) { + if ( *it == shortcutMarker && + (it + 1 != wstr.end()) ) { + + // double && un-escaping - bnc#559226 + // foo&&bar => foo&bar + if ( *(it+1) == shortcutMarker) { + newstr += shortcutMarker; // add only one & + it++; // .. and jump forth to skip the 2nd one + } + // regular hotkey &X + else { + // take the first one only (we can't do multiple hotkeys per 1 line + // so we just discard the rest, argh) + if ( !have_shortcut) { + newstr += replacementShortcutMarker; + have_shortcut = true; + } + } + } + else + newstr += *it; + } + + wstr = newstr; + + wstring::size_type tpos = wstr.find_first_of( replacementShortcutMarker ); + + if ( tpos != wstring::npos && tpos != wstr.size() - 1 ) { - if ( pos+1 < wstr.length() ) - { - // regular hotkey ( "&P" ) - if ( wstr[ pos+1 ] != shortcutMarker ) - tpos = pos; - // escape marker ("&&" ) - else - wstr.erase(pos,1); // make it only one & - - pos += 1; // and search for more - } - else - { - // A pathological case: The string ends with '& '. - // This is invalid anyway, but prevent endless loop even in this case. - pos = string::npos; - } + size_t realpos = 0, t; + + for ( t = 0; t < tpos; t++ ) + realpos += wcwidth( wstr[t] ); + + wstr.erase( tpos, 1 ); + + hotk = wstr[tpos]; + + hotp = realpos; } - - size_t realpos = 0, t; - - for ( t = 0; t < tpos; t++ ) - realpos += wcwidth( wstr[t] ); - - wstr.erase( tpos, 1 ); - - hotk = wstr[tpos]; - - hotp = realpos; + } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60337 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_lib.ycp
by fehr＠svn.opensuse.org 12 Jan '10

12 Jan '10

Author: fehr Date: Tue Jan 12 16:55:40 2010 New Revision: 60337 URL: http://svn.opensuse.org/viewcvs/yast?rev=60337&view=rev Log: do not forget user modified format options when FormatMount dialog is entered more than once (bnc #467889) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_lib.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Jan 12 16:55:40 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 12 16:51:38 CET 2010 - fehr(a)suse.de + +- do not forget user modified format options when FormatMount dialog + is entered more than once (bnc #467889) + +------------------------------------------------------------------- Tue Jan 12 12:51:14 CET 2010 - aschnell(a)suse.de - avoid two error popups concerning swap in sequence (bnc #387242) @@ -7,7 +13,7 @@ Mon Jan 11 18:55:11 CET 2010 - fehr(a)suse.de - do not propose root partitions smaller than 512MB even in - desperate mode (#457092) + desperate mode (bnc #457092) ------------------------------------------------------------------- Mon Jan 11 16:11:00 CET 2010 - fehr(a)suse.de Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Tue Jan 12 16:55:40 2010 @@ -736,9 +736,9 @@ string fstopt = FileSystems::DefaultFstabOptions( new ); if( size(fstopt)>0 && size(new["fstopt"]:"")==0 ) new["fstopt"] = fstopt; - new["fs_options"] = FileSystems::DefaultFormatOptions(new); if( !init ) { + new["fs_options"] = FileSystems::DefaultFormatOptions(new); new["fstopt"] = fstopt; integer max_len = FileSystems::LabelLength( used_fs ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60336 - in /trunk/yast2: library/gpg/src/GPG.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 12 Jan '10

12 Jan '10

Author: lslezak Date: Tue Jan 12 15:18:15 2010 New Revision: 60336 URL: http://svn.opensuse.org/viewcvs/yast?rev=60336&view=rev Log: - GPG.ycp - return success/error result in GPG::Init() and GPG::CreateKey() functions (bnc#544682) Modified: trunk/yast2/library/gpg/src/GPG.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/gpg/src/GPG.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/gpg/src/GPG.ycp?re… ============================================================================== --- trunk/yast2/library/gpg/src/GPG.ycp (original) +++ trunk/yast2/library/gpg/src/GPG.ycp Tue Jan 12 15:18:15 2010 @@ -14,6 +14,7 @@ import "String"; import "Report"; +import "FileUtils"; module "GPG"; @@ -33,8 +34,14 @@ * @param home_dir home directory for gpg (location of the keyring) * @param force unconditionaly clear the key caches */ -global void Init(string home_dir, boolean force) +global boolean Init(string home_dir, boolean force) { + if (FileUtils::IsDirectory(home_dir) != true) + { + y2error("Path %1 is not a directory", home_dir); + return false; + } + if (home_dir != home || force) { // clear the cache, home has been changed @@ -43,6 +50,8 @@ } home = home_dir; + + return true; } /** @@ -241,7 +250,7 @@ * Create a new gpg key. Executes 'gpg --gen-key' in an xterm window (in the QT UI) * or in the terminal window (in the ncurses UI). */ -global void CreateKey() +global boolean CreateKey() { string xterm = "/usr/bin/xterm"; string command = buildGPGcommand("--gen-key"); @@ -249,25 +258,59 @@ y2debug("text_mode: %1", text_mode); + boolean ret = false; + if (!text_mode) { if (SCR::Read(.target.size, xterm) < 0) { // TODO FIXME Report::Error(_("Xterm is missing, install xterm package.")); + return false; } + string exit_file = ((string)SCR::Read(.target.tmpdir)) + "/gpg_tmp_exit_file"; + if (FileUtils::Exists(exit_file)) + { + SCR::Execute(.target.execute, "rm -f " + exit_file); + } + + command = "LC_ALL=C " + xterm + " -e \"" + command + "; echo $? > " + exit_file + "\""; + y2internal("Executing: %1", command); + // in Qt start GPG in a xterm window - SCR::Execute(.target.bash, "LC_ALL=C " + xterm + " -e " + command); + SCR::Execute(.target.bash, command); + + if (FileUtils::Exists(exit_file)) + { + // read the exit code from file + // (the exit code from the SCR call above is the xterm exit code which is not what we want here) + string exit_code = (string)SCR::Read(.target.string, exit_file); + y2milestone("Read exit code from tmp file %1: %2", exit_file, exit_code); + + ret = exit_code == "0\n"; + } + else + { + y2warning("Exit file is missing, the gpg command has failed"); + ret = false; + } } else { + command = "LC_ALL=C " + command; + y2internal("Executing in terminal: %1", command); // in ncurses use UI::RunInTerminal - UI::RunInTerminal(command); + ret = UI::RunInTerminal(command) == 0; } - // invalidate cache, force reloading - Init(home, true); + if (ret) + { + // invalidate cache, force reloading + Init(home, true); + } + + return ret; } /** Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Jan 12 15:18:15 2010 @@ -2,6 +2,8 @@ Tue Jan 12 11:15:45 UTC 2010 - lslezak(a)suse.cz - GPG.ycp - run gpg in C locale (bnc#544680) +- GPG.ycp - return success/error result in GPG::Init() and + GPG::CreateKey() functions (bnc#544682) ------------------------------------------------------------------- Thu Jan 7 14:26:21 CET 2010 - jsrain(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60335 - /trunk/storage/storage/src/include/ep-hd.ycp
by aschnell＠svn.opensuse.org 12 Jan '10

12 Jan '10

Author: aschnell Date: Tue Jan 12 14:04:56 2010 New Revision: 60335 URL: http://svn.opensuse.org/viewcvs/yast?rev=60335&view=rev Log: - do not show "Used Devices" tab for normal hard disks Modified: trunk/storage/storage/src/include/ep-hd.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Tue Jan 12 14:04:56 2010 @@ -369,8 +369,8 @@ // helptext string helptext = _("This view shows all devices used by the -selected hard disk. The table is non-empty only for BIOS RAIDs and Multipath -Disks."); +selected hard disk. The view is only available for BIOS RAIDs, partitioned +software RAIDs and Multipath Disks."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -391,19 +391,27 @@ `devices : $[ `create : CreateHdDiskDevicesTab, `user_data : user_data ] ]; + symbol ctype = target_map[device, "type"]:`CT_DISK; + + list<term> tabs = [ + // tab heading + `item(`id(`overview), _("&Overview")), + // tab heading + `item(`id(`partitions), _("&Partitions")) + ]; + + if (contains([ `CT_DMRAID, `CT_DMMULTIPATH, `CT_MDPART ], ctype)) + { + // tab heading + tabs = add(tabs, `item(`id(`devices), _("&Used Devices"))); + } + UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( // heading `IconAndHeading(sformat(_("Hard Disk: %1"), device), StorageIcons::hd_icon), - `DumbTab(`id(`tab), [ - // tab heading - `item(`id(`overview), _("&Overview")), - // tab heading - `item(`id(`partitions), _("&Partitions")), - // tab heading - `item(`id(`devices), _("&Used Devices")) - ], + `DumbTab(`id(`tab), tabs, `ReplacePoint(`id(`tab_panel), TabPanel::empty_panel) ) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0