Hello community,
here is the log from the commit of package yast2-ca-management
checked in at Tue Feb 19 00:01:15 CET 2008.
--------
--- yast2-ca-management/yast2-ca-management.changes 2007-12-17 12:11:04.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-ca-management/yast2-ca-management.changes 2008-02-18 16:36:58.316248000 +0100
@@ -1,0 +2,6 @@
+Mon Feb 18 16:27:36 CET 2008 - jdsn@suse.de
+
+- version 2.16.5
+- merged exportCRL.pl support to trunk
+
+-------------------------------------------------------------------
Old:
----
yast2-ca-management-2.16.4.tar.bz2
New:
----
yast2-ca-management-2.16.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ca-management.spec ++++++
--- /var/tmp/diff_new_pack.Y23966/_old 2008-02-18 23:58:38.000000000 +0100
+++ /var/tmp/diff_new_pack.Y23966/_new 2008-02-18 23:58:38.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-ca-management (Version 2.16.4)
+# spec file for package yast2-ca-management (Version 2.16.5)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,13 +10,14 @@
# norootforbuild
+
Name: yast2-ca-management
-Version: 2.16.4
+Version: 2.16.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ca-management-2.16.4.tar.bz2
+Source0: yast2-ca-management-2.16.5.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets dosfstools doxygen libxslt limal-ca-mgm-perl limal-perl perl-Date-Calc perl-URI perl-X500-DN perl-XML-Writer pkg-config update-desktop-files yast2 yast2-core yast2-devtools
Requires: yast2 perl perl-gettext yast2-perl-bindings perl-X500-DN perl-Date-Calc limal-perl perl-Config-IniFiles perl-URI
@@ -30,7 +31,7 @@
%prep
-%setup -n yast2-ca-management-2.16.4
+%setup -n yast2-ca-management-2.16.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,109 +75,113 @@
/usr/share/YaST2/schema/autoyast/rnc/ca_mgm.rnc
%doc %{prefix}/share/doc/packages/yast2-ca-management
/usr/bin/generateCRL.pl
+/usr/bin/exportCRL.pl
%attr(600, root, root) %config(noreplace) /etc/generateCRL.conf
%changelog
-* Mon Dec 17 2007 - mc@suse.de
+* Mon Feb 18 2008 jdsn@suse.de
+- version 2.16.5
+- merged exportCRL.pl support to trunk
+* Mon Dec 17 2007 mc@suse.de
- version 2.16.4
- do not query not existing widgets [#348465]
-* Tue Nov 06 2007 - mc@suse.de
+* Tue Nov 06 2007 mc@suse.de
- version 2.16.3
- Ask for a password during import CA [#337524]
-* Mon Oct 29 2007 - mc@suse.de
+* Mon Oct 29 2007 mc@suse.de
- merge SP1 changes to trunk
* detect existing default Root CA during installation (#238754)
- popup password dialog if root password cannot be read
-* Mon Oct 29 2007 - mc@suse.de
+* Mon Oct 29 2007 mc@suse.de
- version 2.16.2
- support cloning for autoyast
-* Fri Oct 12 2007 - mc@suse.de
+* Fri Oct 12 2007 mc@suse.de
- add email for subject_alt_name in special cases
- enhance filter list for browser window
-* Wed Oct 10 2007 - mc@suse.de
+* Wed Oct 10 2007 mc@suse.de
- version 2.16.1
- fix logging [#332002]
-* Mon Oct 08 2007 - mc@suse.de
+* Mon Oct 08 2007 mc@suse.de
- version 2.16.0
- fix addRequest call. [#326465]
- implement support for MS-UPN and Krb5PrincipalName in
SubjectAlternativeName Extension
-* Tue Aug 14 2007 - jsuchome@suse.cz
+* Tue Aug 14 2007 jsuchome@suse.cz
- minimal support for command line interface (#300183)
- 2.15.2
-* Mon Jul 09 2007 - mc@suse.de
+* Mon Jul 09 2007 mc@suse.de
- update Version to 2.15.1
- fix always disabled Export Button [#231434]
-* Wed Apr 25 2007 - mc@suse.de
+* Wed Apr 25 2007 mc@suse.de
- update Version to 2.15.0
-* Mon Mar 19 2007 - jdsn@suse.de
+* Mon Mar 19 2007 jdsn@suse.de
- inserted rnc schema file reference into desktop file (#220816)
- 2.14.5
-* Wed Mar 14 2007 - jdsn@suse.de
+* Wed Mar 14 2007 jdsn@suse.de
- added ca_mgm autoyast rnc schema file (#220816)
- 2.14.4
-* Thu Feb 15 2007 - mc@suse.de
+* Thu Feb 15 2007 mc@suse.de
- use linux.site as fallback when the hostname command
returns nothing [#245604]
-* Fri Oct 06 2006 - mc@suse.de
+* Fri Oct 06 2006 mc@suse.de
- version 2.14.3
- merge proofreading results
-* Tue Sep 19 2006 - mc@suse.de
+* Tue Sep 19 2006 mc@suse.de
- Better error message for invalid destinationFile(#205386)
-* Fri Jul 21 2006 - mc@suse.de
+* Fri Jul 21 2006 mc@suse.de
- Version 2.14.2
-* Thu Jun 29 2006 - mc@suse.de
+* Thu Jun 29 2006 mc@suse.de
- implement new exception handling(backward compatible)
- limal-ca-mgm requires caPasswd for all actions in a CA
-* Mon Jun 19 2006 - mc@suse.de
+* Mon Jun 19 2006 mc@suse.de
- fix unlocalized error messages [#182066]
- fix unlocalized Certificates Status [#182371]
-* Thu Jun 01 2006 - mc@suse.de
+* Thu Jun 01 2006 mc@suse.de
- fix unlocalised text when you edit the default values of a CA
[#179787]
-* Wed May 10 2006 - mc@suse.de
+* Wed May 10 2006 mc@suse.de
- add AuthorityInfoAccess for CA and Certificates again
[#137982]
-* Mon May 08 2006 - schubi@suse.de
+* Mon May 08 2006 schubi@suse.de
- basicConstraints pathlen works in cerfificate defaults Bug 137984
- enlarged RichText widget in signRequest Bug 137983
- Removed AuthorityInfoAccess Bug 137982
-* Thu May 04 2006 - mc@suse.de
+* Thu May 04 2006 mc@suse.de
- version 2.13.22
- merge proofreaded text
-* Wed May 03 2006 - mc@suse.de
+* Wed May 03 2006 mc@suse.de
- version 2.13.21
- fix text for missing root password [#171413]
-* Fri Apr 28 2006 - varkoly@suse.de
+* Fri Apr 28 2006 varkoly@suse.de
- version 2.13.20
- fix checking string if it is nil befor spliting [#165820]
-* Thu Mar 30 2006 - mc@suse.de
+* Thu Mar 30 2006 mc@suse.de
- version 2.13.19
- fix misspelled funtions in ExportCRLToLDAP() [#162194]
-* Mon Mar 20 2006 - mc@suse.de
+* Mon Mar 20 2006 mc@suse.de
- version 2.13.18
- use timezone data to find country [#152414]
-* Thu Mar 09 2006 - mc@suse.de
+* Thu Mar 09 2006 mc@suse.de
- version 2.13.17
- fxing the parameter checking [Bug #153300]
- version 2.13.16
- merge proofread text
-* Mon Mar 06 2006 - mc@suse.de
+* Mon Mar 06 2006 mc@suse.de
- version 2.13.15
-* Mon Mar 06 2006 - varkoly@suse.de
+* Mon Mar 06 2006 varkoly@suse.de
- only if the settings were written sucessfully
set CaMgm::prop_settingsWritten to true
- fxing the parameter checking [Bug #153300]
-* Mon Feb 20 2006 - mc@suse.de
+* Mon Feb 20 2006 mc@suse.de
- replace yast2-devel-packages with more specific BuildRequires
- fix Summary string [Bug #150155]
-* Thu Feb 09 2006 - mc@suse.de
+* Thu Feb 09 2006 mc@suse.de
- Better error message when providing a wrong password
- add textdomain call to caUtils.pm
-* Wed Feb 08 2006 - mc@suse.de
+* Wed Feb 08 2006 mc@suse.de
- version 2.13.13
- LIMAL::CaMgm::StringList was renamed to LIMAL::StringList
(part of fix for [#149073])
-* Fri Feb 03 2006 - mc@suse.de
+* Fri Feb 03 2006 mc@suse.de
- version 2.13.12
- common_cert.desktop:
* remove last space in Name attribute to make our translation
@@ -184,122 +189,122 @@
- common_cert.desktop, ca_mgm.desktop:
* remove german translation; will be re added from our
translation process
-* Fri Feb 03 2006 - mc@suse.de
+* Fri Feb 03 2006 mc@suse.de
- version 2.13.11
- If resetting the CA the old CA will be deleted
-* Fri Jan 27 2006 - mc@suse.de
+* Fri Jan 27 2006 mc@suse.de
- version 2.13.10
- change the CA during installation
-* Fri Jan 27 2006 - mls@suse.de
+* Fri Jan 27 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Tue Jan 24 2006 - mc@suse.de
+* Tue Jan 24 2006 mc@suse.de
- version 2.13.9
- merge proofreaded texts
-* Mon Jan 23 2006 - mc@suse.de
+* Mon Jan 23 2006 mc@suse.de
- version 2.13.8
- add perl-URI to Requires:
- remove FileLogger initialization from CaManagement.pm
YaST has direct support for limal logging framework
-* Mon Jan 23 2006 - mc@suse.de
+* Mon Jan 23 2006 mc@suse.de
- version 2.13.7
- use sprintf for splitted translation strings
- remove useless translation tag in _auto file
-* Mon Jan 16 2006 - varkoly@suse.de
+* Mon Jan 16 2006 varkoly@suse.de
- Fixing bug #64635
-* Fri Jan 13 2006 - mc@suse.de
+* Fri Jan 13 2006 mc@suse.de
- version 2.13.6
- limal-ca-mgm renamed a method
-* Mon Jan 09 2006 - visnov@suse.cz
+* Mon Jan 09 2006 visnov@suse.cz
- version 2.13.5
- remove useless Require import
-* Wed Jan 04 2006 - mc@suse.de
+* Wed Jan 04 2006 mc@suse.de
- version 2.13.4
- use new limal methods for SubjectAlternativeNameExt
- fix ReadCertificateDefaults: DN has to be a map
- fix error popup; use plainText option instead of <pre>
-* Mon Dec 19 2005 - mc@suse.de
+* Mon Dec 19 2005 mc@suse.de
- 2.13.3
- use ByteBuffer as Object, no direct transformation
-* Thu Dec 15 2005 - mc@suse.de
+* Thu Dec 15 2005 mc@suse.de
- 2.13.2
- ignore Logger Exception when creating Logger as none root
-* Mon Dec 12 2005 - mc@suse.de
+* Mon Dec 12 2005 mc@suse.de
- 2.13.1
- fix root check in testcase
-* Mon Dec 12 2005 - mc@suse.de
+* Mon Dec 12 2005 mc@suse.de
- 2.13.0
- rewrite YaPI to use limal-ca-mgm
- remove unsued dependencies, agents and configfiles
-* Mon Jul 04 2005 - schubi@suse.de
+* Mon Jul 04 2005 schubi@suse.de
- typo fixed Bug 79209
-* Mon May 16 2005 - jsrain@suse.cz
+* Mon May 16 2005 jsrain@suse.cz
- renamed 'default' variable
- 2.12.0
-* Wed Mar 30 2005 - schubi@suse.de
+* Wed Mar 30 2005 schubi@suse.de
- Bug 63125 - yast2-ca-mgm: hierarchical display of CAs would be
appreciated
-* Wed Mar 30 2005 - schubi@suse.de
+* Wed Mar 30 2005 schubi@suse.de
- Bug 62544 - CA Management: search for more then one eMailAddress
in ReadLDAPExportDefaults
-* Tue Mar 29 2005 - schubi@suse.de
+* Tue Mar 29 2005 schubi@suse.de
- Add autoyast functions
- Bug 73848 - ca-mgm: wrong text
- Bug 73846 - ca-mgm: "generate CRL" does not take care of the default
-* Mon Mar 21 2005 - mc@suse.de
+* Mon Mar 21 2005 mc@suse.de
- add "digitalSignature" extension to keyusage in server_v3 section
[#73859]
- mark openssl.cnf.templ as %%config
-* Tue Nov 30 2004 - schubi@suse.de
+* Tue Nov 30 2004 schubi@suse.de
- Fixes for new yast intepreter
-* Thu Nov 25 2004 - schubi@suse.de
+* Thu Nov 25 2004 schubi@suse.de
- Bug 47672 - disable X509 extension subjectAltName and issuerAltName if these
-* Thu Aug 19 2004 - schubi@suse.de
+* Thu Aug 19 2004 schubi@suse.de
- Checking for KDE session before starting kfiledialog
-* Thu Aug 12 2004 - schubi@suse.de
+* Thu Aug 12 2004 schubi@suse.de
- translation flags added
-* Tue Aug 10 2004 - schubi@suse.de
+* Tue Aug 10 2004 schubi@suse.de
- Removed wrong include files
-* Tue Aug 10 2004 - schubi@suse.de
+* Tue Aug 10 2004 schubi@suse.de
- Bugfix in sign request ( missing description)
-* Mon Aug 09 2004 - schubi@suse.de
+* Mon Aug 09 2004 schubi@suse.de
- Added signing requests and handling crl defaults
-* Mon Jun 14 2004 - mc@suse.de
+* Mon Jun 14 2004 mc@suse.de
- #41994; fix wrong CRL Distribution Point
-* Mon Jun 07 2004 - schubi@suse.de
+* Mon Jun 07 2004 schubi@suse.de
- Bug 41533 - wrong suse logo in some yast2 modules
-* Wed May 26 2004 - schubi@suse.de
+* Wed May 26 2004 schubi@suse.de
- integrated running testsuite
-* Wed May 26 2004 - schubi@suse.de
+* Wed May 26 2004 schubi@suse.de
- Better layout in proposal
-* Mon May 24 2004 - mc@suse.de
+* Mon May 24 2004 mc@suse.de
- "-" as first or last character of caName if forbidden. (#40867)
-* Mon May 24 2004 - schubi@suse.de
+* Mon May 24 2004 schubi@suse.de
- Bug 40839 - Installation - Service Configuration - Illogical workflow
-* Wed May 19 2004 - schubi@suse.de
+* Wed May 19 2004 schubi@suse.de
- Bug 40862 - CA Management - Create Root CA - Wrong SetFocus
- Bug 40860 - CA Management - Create New CA - No ValidChars Defined
- Bug 40859 - CA Management - Creating New CA - Advanced Options
-* Tue May 18 2004 - mc@suse.de
+* Tue May 18 2004 mc@suse.de
- use LDAPInit to initilize the ldap connection. (#40366)
- fixed gettext handling (#40160)
-* Fri May 14 2004 - schubi@suse.de
+* Fri May 14 2004 schubi@suse.de
- Bug 40521 - ca suggests to change root password
-* Thu May 13 2004 - schubi@suse.de
+* Thu May 13 2004 schubi@suse.de
- manage use_tls in the right way (#37393)
- create base_config_dn with ldap-client (#40366)
-* Tue May 11 2004 - schubi@suse.de
+* Tue May 11 2004 schubi@suse.de
- Bug 40061 - CA: no key work in ncurses UI
-* Mon May 10 2004 - schubi@suse.de
+* Mon May 10 2004 schubi@suse.de
- add default_md=sha1 to req section. This is needed to create rootCAs
also with sha1 hashing algorithm (#40119)
- New translation function: change _() to __() (#40160)
-* Mon May 10 2004 - schubi@suse.de
+* Mon May 10 2004 schubi@suse.de
- sorting language selection box Bug #39928
- Bug 39930 fixed - CA settings dialog looks bad in ncurses
-* Thu May 06 2004 - schubi@suse.de
+* Thu May 06 2004 schubi@suse.de
- Better description Bug#39966
- exporting common server certificate added
-* Mon May 03 2004 - schubi@suse.de
+* Mon May 03 2004 schubi@suse.de
- Bufixes while writing default settings
- Bug #39360. Help text for password changed.
- Bug #39689. Headline changed.
@@ -310,20 +315,20 @@
- Importing CA/Certificate from disk while installation
- Using /bin/hostname for evaluating the hostname and the domain
name
-* Fri Apr 30 2004 - schubi@suse.de
+* Fri Apr 30 2004 schubi@suse.de
- Icon changed
-* Thu Apr 29 2004 - schubi@suse.de
+* Thu Apr 29 2004 schubi@suse.de
- Import CA/Certificate via floppy
- Bugfixing
- Proposal test
-* Fri Apr 23 2004 - schubi@suse.de
+* Fri Apr 23 2004 schubi@suse.de
- finished proposal
- Import of common server certificate
- Moving CA repository to /var/lib/CAM
- Bugfixes
-* Fri Apr 16 2004 - mc@suse.de
+* Fri Apr 16 2004 mc@suse.de
- add proposal files to spec
-* Fri Apr 16 2004 - mc@suse.de
+* Fri Apr 16 2004 mc@suse.de
- remove Execute .status from ag_ca_tools; is now in ag_openssl
- first version of a proposal implemented
- basicconstraits accept none
@@ -331,7 +336,7 @@
- At DeleteCertificate remove the certificate entry from cam.txt
- add "use_tls" to ldap init.
- some other smal bugfixes
-* Fri Apr 02 2004 - schubi@suse.de
+* Fri Apr 02 2004 schubi@suse.de
- fist complete working version
-* Thu Mar 25 2004 - schubi@suse.de
+* Thu Mar 25 2004 schubi@suse.de
- initial; CA Management module
++++++ yast2-ca-management-2.16.4.tar.bz2 -> yast2-ca-management-2.16.5.tar.bz2 ++++++
++++ 3171 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.16.4/configure.in new/yast2-ca-management-2.16.5/configure.in
--- old/yast2-ca-management-2.16.4/configure.in 2007-12-17 11:58:58.000000000 +0100
+++ new/yast2-ca-management-2.16.5/configure.in 2008-02-18 16:30:07.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ca-management, 2.16.4, http://bugs.opensuse.org/, yast2-ca-management)
+AC_INIT(yast2-ca-management, 2.16.5, http://bugs.opensuse.org/, yast2-ca-management)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,9 +17,9 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.16.4"
+VERSION="2.16.5"
RPMNAME="yast2-ca-management"
-MAINTAINER="Michael Calmer "
+MAINTAINER="Michael Calmer , J. Daniel Schmidt "
dnl pkgconfig honors lib64
pkgconfigdir=\${libdir}/pkgconfig
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.16.4/MAINTAINER new/yast2-ca-management-2.16.5/MAINTAINER
--- old/yast2-ca-management-2.16.4/MAINTAINER 2007-04-27 11:05:09.000000000 +0200
+++ new/yast2-ca-management-2.16.5/MAINTAINER 2008-02-04 16:01:17.000000000 +0100
@@ -1 +1 @@
-Michael Calmer
+Michael Calmer , J. Daniel Schmidt
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.16.4/scripts/exportCRL.pl new/yast2-ca-management-2.16.5/scripts/exportCRL.pl
--- old/yast2-ca-management-2.16.4/scripts/exportCRL.pl 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ca-management-2.16.5/scripts/exportCRL.pl 2008-02-08 17:42:22.000000000 +0100
@@ -0,0 +1,155 @@
+#! /usr/bin/perl -w
+
+BEGIN {
+ push @INC, '/usr/share/YaST2/modules/';
+}
+
+use strict;
+use Getopt::Long;
+use YaPI::CaManagement;
+
+
+my $err = undef;
+my $msg = undef;
+my $res = undef;
+my $config = undef;
+my $help = undef;
+my %conf = ();
+
+
+Getopt::Long::Configure("no_ignore_case", "no_auto_abbrev");
+my $result = GetOptions ("config|c=s" => \$config,
+ "help|?|h" => \$help);
+
+if($help || !$result) {
+ print "usage: $0 -c <config-file> \n";
+ print "\n";
+ print "-c, --config Path to configfile\n";
+ print "-?, --help, -h This help\n";
+ exit;
+}
+
+if (!$config) {
+ print "Can not operate without a configfile. See '$0 -h' for help\n";
+ exit 1;
+}
+
+if (! -e $config) {
+ print "Configuration file $config does not exist.";
+ exit 1;
+}
+
+
+#
+# read config file
+#
+if (! open(CONF,"< $config"))
+{
+ print "Can not open configuration file $config .";
+ exit 1;
+}
+
+while (<CONF>)
+{
+ if ($_ =~ /^\s*([a-zA-Z0-9_-]+)\s*=\s*(\S*)\s*$/)
+ {
+ if (defined $1 && $1 ne '')
+ {
+ if (not defined $2) {$2 = "";}
+ $conf{"$1"}="$2";
+ }
+ }
+}
+close CONF;
+
+if ( not exists $conf{"caname"} ||
+ not exists $conf{"capassword"}
+ )
+{
+ print "CA information (name or password) is missing in config file $config .";
+ exit 1;
+}
+
+if ($conf{"ldap_port"} eq "") { $conf{"ldap_port"} = 389; }
+
+
+
+#
+# reading default values for specified CRL
+#
+$res = YaPI::CaManagement->ReadCRLDefaults({'caName' => $conf{"caname"}, 'caPasswd' => $conf{"capassword"} });
+if( not defined $res ) {
+ $err = YaPI::CaManagement->Error();
+ $msg = $err->{summary};
+ $msg .= "[".$err->{description}."]" if(defined $err->{description});
+ print $msg;
+}
+
+
+#
+# generating new CRL
+#
+my $data = {
+ 'caName' => $conf{"caname"},
+ 'caPasswd' => $conf{"capassword"},
+ 'days' => $res->{"days"}
+ };
+if (! defined ${$data}{"days"} || ${$data}{"days"} eq '') { ${$data}{"days"} = 30; }
+
+$res = YaPI::CaManagement->AddCRL($data);
+if( not defined $res ) {
+ $err = YaPI::CaManagement->Error();
+ $msg = $err->{summary};
+ $msg .= "[".$err->{description}."]" if(defined $err->{description});
+ print $msg;
+}
+
+#
+# export new CRL to LDAP if configured
+#
+if ($conf{"export_ldap"} eq "true")
+{
+ $data = {
+ 'caName' => $conf{"caname"},
+ 'ldapHostname' => $conf{"ldap_hostname"},
+ 'ldapPort' => $conf{"ldap_port"},
+ 'destinationDN' => $conf{"ldap_dn"},
+ 'BindDN' => $conf{"ldap_binddn"},
+ 'ldapPasswd' => $conf{"ldap_password"}
+ };
+
+ $res = YaPI::CaManagement->ExportCRLToLDAP($data);
+ if( not defined $res ) {
+ $err = YaPI::CaManagement->Error();
+ $msg = $err->{summary};
+ $msg .= "[".$err->{description}."]" if(defined $err->{description});
+ print $msg;
+ }
+}
+
+
+#
+# export new CRL to file if configured
+#
+if ($conf{"export_file"} eq "true")
+{
+ $data = {
+ 'caName' => $conf{"caname"},
+ 'caPasswd' => $conf{"capassword"},
+ 'exportFormat' => uc($conf{"crlfileformat"}),
+ 'destinationFile' => $conf{"crlfilename"}
+ };
+
+ $res = YaPI::CaManagement->ExportCRL($data);
+ if( not defined $res ) {
+ $err = YaPI::CaManagement->Error();
+ $msg = $err->{summary};
+ $msg .= "[".$err->{description}."]" if(defined $err->{description});
+ print $msg;
+ }
+}
+
+if (not defined $msg)
+{ exit 0; }
+else
+{ exit 1; }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.16.4/scripts/generateCRL.pl new/yast2-ca-management-2.16.5/scripts/generateCRL.pl
--- old/yast2-ca-management-2.16.4/scripts/generateCRL.pl 2007-04-27 11:05:09.000000000 +0200
+++ new/yast2-ca-management-2.16.5/scripts/generateCRL.pl 2008-02-08 17:42:22.000000000 +0100
@@ -34,7 +34,7 @@
@toDo = $cfg->Sections();
foreach my $gencrl (@toDo) {
-
+
print "Process '$gencrl' ... ";
my $ret = doit($gencrl);
if($ret eq "") {
@@ -47,7 +47,7 @@
sub doit {
my $caName = shift;
-
+
my $caPasswd = $cfg->val($caName, "caPasswd");
my $host = $cfg->val($caName, "ldapHostname");
my $port = $cfg->val($caName, "ldapPort", 389);
@@ -57,7 +57,7 @@
my $err;
my $msg;
- my $res = YaPI::CaManagement->ReadCRLDefaults({caName => $caName});
+ my $res = YaPI::CaManagement->ReadCRLDefaults({'caName' => $caName, 'caPasswd' => $caPasswd});
if( not defined $res ) {
$err = YaPI::CaManagement->Error();
$msg = $err->{summary};
@@ -70,7 +70,7 @@
'caPasswd' => $caPasswd,
'days' => $res->{days}
};
-
+
$res = YaPI::CaManagement->AddCRL($data);
if( not defined $res ) {
$err = YaPI::CaManagement->Error();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.16.4/scripts/Makefile.am new/yast2-ca-management-2.16.5/scripts/Makefile.am
--- old/yast2-ca-management-2.16.4/scripts/Makefile.am 2007-04-27 11:05:09.000000000 +0200
+++ new/yast2-ca-management-2.16.5/scripts/Makefile.am 2008-02-04 20:09:28.000000000 +0100
@@ -5,7 +5,7 @@
bindir = ${exec_prefix}/bin
sysconfdir = /etc
-bin_SCRIPTS = generateCRL.pl
+bin_SCRIPTS = generateCRL.pl exportCRL.pl
sysconf_DATA = generateCRL.conf
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.16.4/src/crlExport.ycp new/yast2-ca-management-2.16.5/src/crlExport.ycp
--- old/yast2-ca-management-2.16.4/src/crlExport.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ca-management-2.16.5/src/crlExport.ycp 2008-02-07 21:47:21.000000000 +0100
@@ -0,0 +1,424 @@
+/**
+ *
+ * File:
+ * crlExport.ycp
+ *
+ * Module:
+ * CA Management
+ *
+ * Summary:
+ * Export a CRL to a local file or an LDAP directory.
+ * Possibility to setup a cron job to do this automatically.
+ *
+ * Authors:
+ * J. Daniel Schmidt
+ *
+ * $Id: crlExport.ycp 1 2007-11-20 12:15:18Z jdsn $
+ *
+ * Export a CRL for a selected CA
+ *
+ */
+
+
+{
+
+textdomain "ca-management";
+
+import "CaMgm";
+import "Wizard";
+import "Label";
+import "Popup";
+import "YaPI::CaManagement";
+include "ca-management/util.ycp";
+include "ca-management/new_cert_callbacks.ycp";
+
+map uiInfo = UI::GetDisplayInfo();
+boolean textmode = (boolean) uiInfo["TextMode"]:nil;
+
+float hspace = textmode ? 4 : 3;
+float vspace = textmode ? 0 : 1;
+boolean seenSecurityInfo = false;
+
+// here are our settings for the CRL of this CA
+boolean periodic = false; // default off
+boolean file_active = true; // default on
+boolean ldap_active = false; // default off
+symbol fileformat = `ffpem; // default is pem
+string crlfile = ""; // is set from inside the export function
+integer intervalAtHour = 0;
+integer intervalHours = 0;
+map ldapCred = $[ "hostname":"", "port":"", "dn":"",
+ "binddn":"", "password":"" ];
+
+
+map crlConfFormat = $[ "options" : [ "line_can_continue", "global_values", "join_multiline", "comments_last", "flat" ],
+ "comments": [ "^[ \t]*#.*$", "^[ \t]*$" ],
+ "params" : [ $[ "match" : [ "([a-zA-Z0-9_-]+)[ \t]*=[ \t]*([^ \t]*)", "%s = %s" ] ] ]
+ ];
+
+
+define void showSecurityInfo()
+{
+ Popup::LongText(
+ // Translators: window caption
+ _("Security Information"),
+ // Translators: long help text - security information
+ `RichText(_("Warning!<br>Activating the automatic creation and export of a CRL will write the CA password to a configuration file on disk. The password will be stored there in plain text as it is needed to create a CRL. The file will only be readable for the root user.")),
+ 50, 12
+ );
+ seenSecurityInfo = true;
+}
+
+
+define void updateEnabled()
+{
+ periodic = (boolean) UI::QueryWidget(`id(`mode_periodically), `Value);
+ file_active = (boolean) UI::QueryWidget(`id(`exportFile), `Value);
+ ldap_active = (boolean) UI::QueryWidget(`id(`exportLDAP), `Value);
+ UI::ChangeWidget(`id(`periodicInterval), `Enabled, periodic);
+ UI::ChangeWidget(`id(`fileSettings), `Enabled, file_active);
+ UI::ChangeWidget(`id(`ldapSettings), `Enabled, ldap_active);
+ if (periodic && !seenSecurityInfo) { showSecurityInfo(); }
+}
+
+
+
+define void setSettings()
+{
+ // write settings to the UI
+ UI::ChangeWidget(`id(`mode_periodically), `Value, periodic);
+ UI::ChangeWidget(`id(`periodicInterval), `Enabled, periodic);
+ UI::ChangeWidget(`id(`interval_athour), `Value, intervalAtHour);
+ UI::ChangeWidget(`id(`interval_hours), `Value, intervalHours);
+ UI::ChangeWidget(`id(`atHourSetting), `Enabled, intervalHours == 24 ? true:false);
+
+ UI::ChangeWidget(`id(`exportFile), `Value, file_active);
+ UI::ChangeWidget(`id(`exportLDAP), `Value, ldap_active);
+
+ UI::ChangeWidget(`id(`ffpem), `Value, fileformat == `ffpem ? true:false);
+ UI::ChangeWidget(`id(`ffder), `Value, fileformat == `ffder ? true:false);
+ UI::ChangeWidget(`id(`crlfile), `Value, crlfile);
+
+ UI::ChangeWidget(`id(`hostname), `Value, ldapCred["hostname"]:"");
+ UI::ChangeWidget(`id(`port), `Value, ldapCred["port"]:"");
+ UI::ChangeWidget(`id(`dn), `Value, ldapCred["dn"]:"");
+ UI::ChangeWidget(`id(`binddn), `Value, ldapCred["binddn"]:"");
+ UI::ChangeWidget(`id(`ldapPassword),`Value, ldapCred["password"]:"");
+}
+
+
+
+define void cleanLdapCred()
+{
+ // cleanup ldap credetials hash ... remove nil values
+ foreach (string key, string val, ldapCred, {
+ if (val == nil) ldapCred[key]="";
+ });
+}
+
+
+define void readSettings(string ca)
+{
+ string crlConf = sformat("/var/lib/CAM/%1/exportcrl.conf", deletechars(ca, " "));
+ if (SCR::Execute(.target.bash, sformat("[ -f %1 ]", crlConf) ) == 0 )
+ {
+ SCR::RegisterAgent( .temp_crlexport_agent, `ag_ini(
+ `IniAgent( crlConf, crlConfFormat )) );
+
+ periodic = SCR::Read(.temp_crlexport_agent.periodic) == "true" ? true:false;
+ if (periodic) seenSecurityInfo = true;
+ integer getAtHour = tointeger( (string)SCR::Read(.temp_crlexport_agent.interval_athour));
+ intervalAtHour = getAtHour != nil ? getAtHour:intervalAtHour;
+ integer getHours = tointeger( (string)SCR::Read(.temp_crlexport_agent.interval_hours));
+ intervalHours = getHours != nil ? getHours:intervalHours;
+ if (intervalHours != 24) intervalAtHour = 0;
+
+ file_active = SCR::Read(.temp_crlexport_agent.export_file) == "true" ? true:false;
+ ldap_active = SCR::Read(.temp_crlexport_agent.export_ldap) == "true" ? true:false;
+ string getCrlfile = (string) SCR::Read(.temp_crlexport_agent.crlfilename);
+ if (getCrlfile != nil && getCrlfile != "") crlfile = getCrlfile;
+ fileformat = SCR::Read(.temp_crlexport_agent.crlfileformat) == "der" ? `ffder:`ffpem;
+ ldapCred["hostname"] = (string) SCR::Read(.temp_crlexport_agent.ldap_hostname);
+ ldapCred["port"] = (string) SCR::Read(.temp_crlexport_agent.ldap_port);
+ ldapCred["dn"] = (string) SCR::Read(.temp_crlexport_agent.ldap_dn);
+ ldapCred["binddn"] = (string) SCR::Read(.temp_crlexport_agent.ldap_binddn);
+ ldapCred["password"] = (string) SCR::Read(.temp_crlexport_agent.ldap_password);
+ if (! ldap_active) ldapCred = $[];
+ cleanLdapCred();
+
+ SCR::UnregisterAgent(.temp_crlexport_agent);
+ y2milestone("Found config file for automatic CRL export of CA %1 and read settings.", ca);
+ }
+ else
+ {
+ y2milestone("No config file found for automatic CRL export of CA %1", ca);
+ }
+}
+
+
+
+define void writeSettings(string ca)
+{
+ string crlConf = sformat("/var/lib/CAM/%1/exportcrl.conf", deletechars(ca, " "));
+ if (! (SCR::Execute(.target.bash, sformat("[ -f %1 ]", crlConf) ) == 0))
+ {
+ SCR::Execute(.target.bash, sformat("umask 0077 && touch %1", crlConf) );
+ }
+
+ SCR::RegisterAgent( .temp_crlexport_agent, `ag_ini(
+ `IniAgent( crlConf, crlConfFormat )) );
+
+ SCR::Write(.temp_crlexport_agent.caname, ca);
+ SCR::Write(.temp_crlexport_agent.periodic, periodic ? "true":"false");
+ SCR::Write(.temp_crlexport_agent.capassword, periodic ? getPassword(ca):"" );
+
+ SCR::Write(.temp_crlexport_agent.interval_athour, intervalHours == 24 ? "0":sformat("%1", intervalAtHour));
+ SCR::Write(.temp_crlexport_agent.interval_hours, sformat("%1", intervalHours));
+
+ SCR::Write(.temp_crlexport_agent.export_file, file_active == true ? "true":"false");
+ SCR::Write(.temp_crlexport_agent.export_ldap, ldap_active == true ? "true":"false");
+
+ SCR::Write(.temp_crlexport_agent.crlfilename, file_active ? crlfile:"");
+ SCR::Write(.temp_crlexport_agent.crlfileformat, fileformat == `ffder ? "der":"pem");
+
+ if (! ldap_active) ldapCred = $[];
+ SCR::Write(.temp_crlexport_agent.ldap_hostname, ldapCred["hostname"]:"");
+ SCR::Write(.temp_crlexport_agent.ldap_port, ldapCred["port"]:"");
+ SCR::Write(.temp_crlexport_agent.ldap_dn, ldapCred["dn"]:"");
+ SCR::Write(.temp_crlexport_agent.ldap_binddn, ldapCred["binddn"]:"");
+ SCR::Write(.temp_crlexport_agent.ldap_password, ldapCred["password"]:"");
+
+ SCR::UnregisterAgent(.temp_crlexport_agent);
+
+ y2milestone("Written settings for automatic CRL export to conf file %1", crlConf);
+}
+
+
+/**
+* Editing CRL defaults of a selected CA
+* @param selected CA
+*/
+define void exportCRL (string ca) {
+
+ map ret = (map) YaPI::CaManagement::ReadCRLDefaults ($["caName":ca, "caPasswd":getPassword(ca)]);
+ y2milestone ("ReadCRLDefaults(%1) return %2", $["caName":ca], ret );
+
+ string caption = _("Export CRL");
+ // this default can only be set inside this function
+ crlfile = sformat("/var/lib/CAM/%1/crl/crl.pem", deletechars(ca, " "));
+
+
+ string help_para1 = sformat("<p><b>%1</b></p>", caption);
+ string help_para2 = _("<p>Export the CRL of this CA once by selecting <b>Export once</b>.</p>");
+ string help_para3 = _("<p>To setup a repeated recreation of the CRL select <b>Repeated recreation and export</b>. In this case set the interval for the recreation in <b>Periodic interval</b>. If you set the interval to 24 hours you can additionally select the hour when the export should happen. Please make sure you read and understood the <b>Security Information</b>.</p>");
+ string help_para4 = _("<p>You can activate an export of the CRL to a local file or to a LDAP server or both. Setup the respective parameters in <b>Export to local file</b> and <b>Export to LDAP</b>.</p>");
+
+ string helptext = help_para1 + help_para2 + help_para3 + help_para4;
+
+ term cradiobuttons = `VBox (
+ `RadioButtonGroup( `id(`export_mode),`VBox(
+ `Left( `RadioButton(`id(`mode_once), `opt(`notify), _("Export once"), true )),
+ `Left( `RadioButton(`id(`mode_periodically), `opt(`notify), _("Repeated recreation and export") ))
+ ))
+ );
+
+ term cldapsettings = `VBox ( `id(`ldapSettings),
+ `TextEntry( `id(`hostname), _("&Host Name:"), ""),
+ `TextEntry( `id(`port), _("&Port:"), ""),
+ //`HBox (`HWeight (1, `ComboBox( `id(`dn), `opt(`editable), _("&DN:"), []))),
+ `TextEntry( `id(`dn), _("&DN:")),
+ `TextEntry( `id(`binddn), _("&Bind DN:"), ""),
+ `Password( `id(`ldapPassword), _("Pass&word"))
+ ) ;
+
+ term cfilesettings = `VBox( `id(`fileSettings), `HBox(
+ `TextEntry(`id(`crlfile), _("Save &as"), crlfile ),
+ `VBox(`VSpacing(1), `PushButton(`id(`askFile), Label::BrowseButton() ))
+ ),
+ `Left( `RadioButtonGroup(`id(`fileformat),
+ `HBox(
+ `Label(_("Export Format")),
+ `RadioButton(`id(`ffpem), `opt(`notify), _("PEM Format"), true ),
+ `RadioButton(`id(`ffder), `opt(`notify), _("DER Format") )
+ )
+ ))
+ );
+
+ term cinterval = `Left( `id(`periodicInterval),
+ `HBox(
+ `VBox(`Label(_("Periodic interval")), `VSpacing(1)),
+ `HSpacing(3),
+ //`HSquash( `IntField( `id(`interval_days), "&days", 0, 100, 30 )),
+ // Translators: this is used to express a setting of "every XX hour(s)"
+ `Label(_("every")),
+ `HSquash( `IntField( `id(`interval_hours), `opt(`notify), "&hour(s)", 1, 24, 12 )),
+ // Translators: in case "every XX hour(s)" is set to 24, the user can set "at XX o'clock"
+ `HBox(`id(`atHourSetting), `Label(_("at")),
+ `HSquash( `IntField( `id(`interval_athour), "&o'clock", 0, 23, 3 ))),
+ `HSpacing(3),
+ `VBox( `VSpacing(1), `PushButton(`id(`securityInfo), _("&Security Information")) )
+ )
+ );
+
+ term contents = `HBox( `HSpacing(1),
+ `VBox( `Left( `Heading(_("CA Name: ") + CaMgm::currentCA) ),
+ cradiobuttons,
+ `HBox(
+ `HSpacing(3),
+ `VBox(
+ `VSpacing(vspace),
+ `Left( `CheckBox(`id(`exportFile), `opt(`notify), _("Export to file"), true )),
+ `HBox( `HSpacing(hspace), cfilesettings ),
+ `VSpacing(vspace),
+ `Left( `CheckBox(`id(`exportLDAP), `opt(`notify), _("Export to LDAP"), false )),
+ `HBox( `HSpacing(hspace), cldapsettings ),
+ `VSpacing(vspace),
+ cinterval
+ )
+ )
+ ),
+ `HSpacing(1)
+ );
+
+ Wizard::CreateDialog();
+ Wizard::SetContentsButtons ( _("Export CRL"), contents, helptext, Label::BackButton (), Label::OKButton ());
+ Wizard::DisableBackButton();
+
+ // fill UI with settings
+ readSettings(ca); // read conf file if exists
+ setSettings(); // push data to UI
+ updateEnabled(); // gray out or ungray UI elements
+
+ symbol ui = nil;
+
+ repeat
+ {
+ ui = (symbol) UI::UserInput ();
+
+ if (ui == `add)
+ {
+ string add_advanced_issuer_alt_name="test";
+ }
+ if (ui == `askFile)
+ {
+ string fformat = "*.pem";
+ if (fileformat == `ffder) fformat = "*.der";
+ string newcrlfile = UI::AskForSaveFileName( crlfile, fformat, _("Save as") );
+ if (newcrlfile != nil && newcrlfile != "") crlfile = newcrlfile;
+ }
+ if ( contains([`mode_once, `mode_periodically, `exportFile, `exportLDAP], ui ))
+ {
+ updateEnabled();
+ }
+ if (ui == `ffpem || ui == `ffder)
+ {
+ fileformat = (symbol) UI::QueryWidget(`id(`fileformat), `Value);
+ string formatstr = "";
+ string outputstr = "";
+ if (fileformat == `ffpem)
+ {
+ formatstr = "^(.*\.)der$";
+ outputstr = "\\1pem";
+ }
+ else if (fileformat == `ffder)
+ {
+ formatstr = "^(.*\.)pem$";
+ outputstr = "\\1der";
+ }
+ string newfile = regexpsub(crlfile, formatstr, outputstr);
+ if (newfile != nil && newfile != "") crlfile = newfile;
+ }
+ if (ui == `interval_hours || ui == `interval_athour)
+ {
+ intervalHours = (integer) UI::QueryWidget(`id(`interval_hours), `Value);
+ intervalAtHour= (integer) UI::QueryWidget(`id(`interval_athour), `Value);
+ }
+ if (ui == `securityInfo)
+ {
+ showSecurityInfo();
+ }
+ if (ui == `next)
+ {
+ updateEnabled();
+ fileformat = (symbol) UI::QueryWidget(`id(`fileformat), `Value);
+ crlfile = (string) UI::QueryWidget(`id(`crlfile), `Value);
+ intervalAtHour= (integer) UI::QueryWidget(`id(`interval_athour), `Value);
+ intervalHours = (integer) UI::QueryWidget(`id(`interval_hours), `Value);
+ ldapCred["hostname"] = (string) UI::QueryWidget(`id(`hostname), `Value);
+ ldapCred["port"] = (string) UI::QueryWidget(`id(`port), `Value);
+ ldapCred["dn"] = (string) UI::QueryWidget(`id(`dn), `Value);
+ ldapCred["binddn"] = (string) UI::QueryWidget(`id(`binddn), `Value);
+ ldapCred["password"] = (string) UI::QueryWidget(`id(`ldapPassword), `Value);
+ cleanLdapCred();
+ writeSettings(ca);
+
+ string cronConfFile = sformat("/etc/cron.d/yast2-ca-mgm-exportcrl-%1",ca);
+
+ if (!periodic)
+ {
+ if (file_active)
+ {
+ string exportFormat = "PEM";
+ if (fileformat == `ffder) exportFormat = "DER";
+ string strret = (string) YaPI::CaManagement::ExportCRL ($[ "caName": ca, "caPasswd" : getPassword(ca),
+ "exportFormat" : exportFormat, "destinationFile" : crlfile]);
+ y2milestone ("ExportCRL(%1) returned %2", $["caName": ca, "exportFormat" : exportFormat, "destinationFile" : crlfile], ret);
+ if (strret == nil || strret != "1")
+ {
+ if ( Popup::YesNoHeadline(_("Export to file failed"), _("Do you want to retry?")) )
+ {
+ ui = `retry;
+ }
+ }
+ else { Popup::Message(_("Saved to file successfully")); }
+ }
+
+ if (ldap_active)
+ {
+ boolean boolret = (boolean) YaPI::CaManagement::ExportCRLToLDAP ($[ "caName": ca,
+ "ldapHostname" : ldapCred["hostname"]:"", "ldapPort" : ldapCred["port"]:"",
+ "destinationDN" : ldapCred["dn"]:"", "BindDN" : ldapCred["binddn"]:"",
+ "ldapPasswd" : ldapCred["ldap_password"]:"" ]);
+ if (boolret)
+ {
+ Popup::Message(_("Saved to LDAP successfully."));
+ }
+ else
+ {
+ if ( Popup::YesNoHeadline(_("Export to LDAP failed"), _("Do you want to retry?")) )
+ {
+ ui = `retry;
+ }
+ }
+ }
+
+ // Remove the cronjob if the setting was reset
+ SCR::Execute(.target.remove, cronConfFile);
+ }
+ else
+ {
+ string configString = sformat("## Configuration of a cron job to export the CRL of the CA: %1", ca);
+ configString = configString + "\n##";
+ configString = configString + "\n## Created by yast2-ca-management";
+ configString = configString + "\n## Changes to this file will be overwritten by yast2-ca-management";
+ configString = configString + sformat("\n## Either use yast or change settings here AND in /var/lib/CAM/%1/exportcrl.conf", deletechars(ca, " "));
+ configString = configString + "\n\n\n";
+ string hourset = intervalHours == 24 ? sformat("%1",intervalAtHour) : sformat("*/%1",intervalHours);
+ configString = configString + sformat("* %1 * * * root /usr/bin/exportCRL.pl -c /var/lib/CAM/%2/exportcrl.conf", hourset, deletechars(ca, " "));
+ if ( SCR::Write(.target.string, cronConfFile, configString) )
+ y2milestone("Setup cron job for periodic recreation and export of CRLs of CA %1", ca);
+ else
+ y2error("Failed to set up a cron job for periodic recreation and export of CRLs of CA %1", ca);
+ }
+
+ }
+ setSettings();
+
+ }
+ until (contains ([`next, `abort], ui));
+
+ UI::CloseDialog();
+}
+
+
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.16.4/src/crl.ycp new/yast2-ca-management-2.16.5/src/crl.ycp
--- old/yast2-ca-management-2.16.4/src/crl.ycp 2007-04-27 11:05:09.000000000 +0200
+++ new/yast2-ca-management-2.16.5/src/crl.ycp 2008-02-08 18:09:04.000000000 +0100
@@ -7,12 +7,12 @@
* CA Management
*
* Summary:
- *
+ *
*
* Authors:
* Stefan Schubert
*
- * $Id: crl.ycp 31720 2006-06-29 14:41:46Z mc $
+ * $Id: crl.ycp 44311 2008-02-08 17:09:04Z jdsn $
*
* CRL of a selected CA
*
@@ -21,10 +21,11 @@
textdomain "ca-management";
import "Label";
- import "CaMgm";
+ import "CaMgm";
import "YaPI::CaManagement";
-
+
include "ca-management/crlDefault.ycp";
+ include "ca-management/crlExport.ycp";
// help text 1/4
string CRLHelptext = _("<p>Here, see the most important values of the CRL.</p>");
@@ -34,14 +35,14 @@
CRLHelptext = CRLHelptext + _("<p><b>View</b> shows a complete description.</p>");
// help text 4/4
CRLHelptext = CRLHelptext + _("<p>You can <b>Export</b> the CRL to a file or LDAP Directory.</p>");
-
+
/**
* createCRL - creating new CRL
* @param CA name
* @return `again
*/
-
+
define symbol createCRL(string CAname)``{
map ret = (map) YaPI::CaManagement::ReadCRLDefaults ($["caName":CAname, "caPasswd":getPassword(CAname)]);
y2milestone ("ReadCRLDefaults(%1) return %2",
@@ -71,7 +72,7 @@
UI::SetFocus (`id(`entry));
symbol ui = nil;
repeat
- {
+ {
ui = (symbol) UI::UserInput ();
integer days = (integer) UI::QueryWidget(`id(`entry), `Value);
if (ui == `ok)
@@ -90,7 +91,7 @@
}
until (contains ([`ok, `cancel], ui));
UI::CloseDialog ();
-
+
return `again;
}
@@ -199,12 +200,14 @@
`PushButton (`id (`view) , _("&View")),
`PushButton (`id (`defaults) , _("&Default")),
`HStretch(),
- `MenuButton (_("Export"),
- [
- `item(`id(`exportFile), _("to &File") ),
- `item(`id(`exportLDAP), _("to &LDAP"))
- ]
- ),
+ // Fate (#2613)
+ `PushButton (`id (`exportDialog) , _("Export")),
+ //`MenuButton (_("Export"),
+ // [
+ // `item(`id(`exportFile), _("to &File") ),
+ // `item(`id(`exportLDAP), _("to &LDAP"))
+ // ]
+ // ),
`HSpacing (1)
)
);
@@ -223,7 +226,7 @@
* Handle events in a tab of a dialog
*/
symbol handleCRLTab (map event) {
- any ui = event["ID"]:nil;
+ any ui = event["ID"]:nil;
if (ui == `gererateCRL)
{
createCRL (CaMgm::currentCA);
@@ -232,20 +235,24 @@
if (ui == `view)
{
showLongCRLDescription (CaMgm::currentCA);
- }
- if (ui == `exportLDAP)
- {
- exportToLDAP ("CRL", CaMgm::currentCA, "" ,"", "", "");
- }
- if (ui == `exportFile)
- {
- exportCRLtoFile (CaMgm::currentCA);
}
+// if (ui == `exportLDAP)
+// {
+// exportToLDAP ("CRL", CaMgm::currentCA, "" ,"", "", "");
+// }
+// if (ui == `exportFile)
+// {
+// exportCRLtoFile (CaMgm::currentCA);
+// }
+ if (ui == `exportDialog) // (Fate #2613)
+ {
+ exportCRL(CaMgm::currentCA);
+ }
if (ui == `defaults)
{
- editCRLDefaults (CaMgm::currentCA);
- }
- return (symbol) ui;
+ editCRLDefaults (CaMgm::currentCA);
+ }
+ return (symbol) ui;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.16.4/src/Makefile.am new/yast2-ca-management-2.16.5/src/Makefile.am
--- old/yast2-ca-management-2.16.4/src/Makefile.am 2007-05-29 17:43:38.000000000 +0200
+++ new/yast2-ca-management-2.16.5/src/Makefile.am 2008-02-04 22:28:30.000000000 +0100
@@ -20,6 +20,7 @@
signRequest.ycp \
certDefault.ycp \
crlDefault.ycp \
+ crlExport.ycp \
dialog-ca.ycp \
commandline.ycp \
wizards.ycp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ca-management-2.16.4/VERSION new/yast2-ca-management-2.16.5/VERSION
--- old/yast2-ca-management-2.16.4/VERSION 2007-12-17 11:58:30.000000000 +0100
+++ new/yast2-ca-management-2.16.5/VERSION 2008-02-18 16:26:53.000000000 +0100
@@ -1 +1 @@
-2.16.4
+2.16.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org