/[smeserver]/rpms/e-smith-base/sme7/e-smith-base-4.18.0-commonname.patch
ViewVC logotype

Annotation of /rpms/e-smith-base/sme7/e-smith-base-4.18.0-commonname.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Tue Jun 12 15:16:00 2007 UTC (17 years, 4 months ago) by slords
Branch: MAIN
CVS Tags: e-smith-base-4_18_0-66_el4_sme, e-smith-base-4_18_0-78_el4_sme, e-smith-base-4_18_0-102_el4_sme, e-smith-base-4_18_0-98_el4_sme, e-smith-base-4_18_0-92_el4_sme, e-smith-base-4_18_0-99_el4_sme, e-smith-base-4_18_0-103_el4_sme, e-smith-base-4_18_0-89_el4_sme, e-smith-base-4_18_0-82_el4_sme, e-smith-base-4_18_0-63_el4_sme, e-smith-base-4_18_0-101_el4_sme, e-smith-base-4_18_0-76_el4_sme, e-smith-base-4_18_0-62_el4_sme, e-smith-base-4_18_0-61_el4_sme, e-smith-base-4_18_0-77_el4_sme, e-smith-base-4_18_0-69_el4_sme, e-smith-base-4_18_0-58_el4_sme, e-smith-base-4_18_0-88_el4_sme, e-smith-base-4_18_0-75_el4_sme, e-smith-base-4_18_0-73_el4_sme, e-smith-base-4_18_0-67_el4_sme, e-smith-base-4_18_0-90_el4_sme, e-smith-base-4_18_0-94_el4_sme, e-smith-base-4_18_0-59_el4_sme, e-smith-base-4_18_0-71_el4_sme, e-smith-base-4_18_0-60_el4_sme, e-smith-base-4_18_0-100_el4_sme, e-smith-base-4_18_0-72_el4_sme, e-smith-base-4_18_0-81_el4_sme, e-smith-base-4_18_0-79_el4_sme, e-smith-base-4_18_0-64_el4_sme, e-smith-base-4_18_0-87_el4_sme, e-smith-base-4_18_0-83_el4_sme, e-smith-base-4_18_0-104_el4_sme
Import on branch sme7 of package e-smith-base-4.18.0-58.el4.sme.src.rpm

1 slords 1.1 diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.0/root/etc/e-smith/templates/home/e-smith/ssl.crt mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/templates/home/e-smith/ssl.crt
2     --- e-smith-base-4.18.0/root/etc/e-smith/templates/home/e-smith/ssl.crt 2007-01-19 14:33:22.000000000 -0700
3     +++ mezzanine_patched_e-smith-base-4.18.0/root/etc/e-smith/templates/home/e-smith/ssl.crt 2007-03-07 11:59:18.000000000 -0700
4     @@ -5,12 +5,13 @@
5     my $here = getcwd;
6    
7     my $FQDN = "$SystemName.$DomainName";
8     + my $commonName = &$cropLeft($modSSL{CommonName} || $FQDN, 64);
9     my $crt = "/home/e-smith/ssl.crt/$FQDN.crt";
10     my $key = "/home/e-smith/ssl.key/$FQDN.key";
11     my $defaultCity = $ldap{defaultCity};
12     my $defaultCompany = $ldap{defaultCompany};
13     my $defaultDepartment = $ldap{defaultDepartment};
14     - my $email = "admin\@$FQDN";
15     + my $email = "admin\@$DomainName";
16    
17     if ( -f $crt )
18     {
19     @@ -24,7 +25,7 @@
20     $expected_issuer .= '/L=' . ($defaultCity ? $defaultCity : 'Newbury');
21     $expected_issuer .= '/O=' . ($defaultCompany ? $defaultCompany : 'My Company Ltd');
22     $expected_issuer .= "/OU=$defaultDepartment" if $defaultDepartment;
23     - $expected_issuer .= "/CN=$FQDN" .
24     + $expected_issuer .= "/CN=$commonName" .
25     "/emailAddress=$email";
26     my $issuer = `openssl x509 -issuer -noout -in $crt`;
27     chomp $issuer;
28     @@ -73,7 +74,6 @@
29     $defaultCity = &$cropLeft($defaultCity, 128);
30     $defaultCompany = &$cropLeft($defaultCompany, 64);
31     $defaultDepartment = &$cropLeft($defaultDepartment, 64);
32     - $FQDN = &$cropLeft($FQDN, 64);
33     $email = &$cropLeft($email, 40);
34    
35     foreach (
36     @@ -82,7 +82,7 @@
37     "$defaultCity",
38     "$defaultCompany",
39     "$defaultDepartment",
40     - "$FQDN",
41     + "$commonName",
42     "$email"
43     )
44     {

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed