1 |
jcrisp |
1.1 |
diff -ruN e-smith-samba-2.6.0.old/createlinks e-smith-samba-2.6.0/createlinks |
2 |
|
|
--- e-smith-samba-2.6.0.old/createlinks 2020-11-13 10:51:17.757341913 +0100 |
3 |
|
|
+++ e-smith-samba-2.6.0/createlinks 2020-11-13 11:03:23.888649314 +0100 |
4 |
|
|
@@ -24,6 +24,7 @@ |
5 |
|
|
|
6 |
|
|
foreach my $file (qw( |
7 |
|
|
/etc/pam.d/samba |
8 |
|
|
+ /etc/krb5.conf |
9 |
|
|
)) |
10 |
|
|
{ |
11 |
|
|
templates2events($file, qw(console-save bootstrap-console-save)); |
12 |
|
|
diff -ruN e-smith-samba-2.6.0.old/root/etc/e-smith/db/configuration/defaults/krb5/DNSLookupKDC e-smith-samba-2.6.0/root/etc/e-smith/db/configuration/defaults/krb5/DNSLookupKDC |
13 |
|
|
--- e-smith-samba-2.6.0.old/root/etc/e-smith/db/configuration/defaults/krb5/DNSLookupKDC 1970-01-01 01:00:00.000000000 +0100 |
14 |
|
|
+++ e-smith-samba-2.6.0/root/etc/e-smith/db/configuration/defaults/krb5/DNSLookupKDC 2016-09-26 00:50:38.000000000 +0200 |
15 |
|
|
@@ -0,0 +1 @@ |
16 |
|
|
+true |
17 |
|
|
diff -ruN e-smith-samba-2.6.0.old/root/etc/e-smith/db/configuration/defaults/krb5/DNSLookupRealm e-smith-samba-2.6.0/root/etc/e-smith/db/configuration/defaults/krb5/DNSLookupRealm |
18 |
|
|
--- e-smith-samba-2.6.0.old/root/etc/e-smith/db/configuration/defaults/krb5/DNSLookupRealm 1970-01-01 01:00:00.000000000 +0100 |
19 |
|
|
+++ e-smith-samba-2.6.0/root/etc/e-smith/db/configuration/defaults/krb5/DNSLookupRealm 2016-09-26 00:50:38.000000000 +0200 |
20 |
|
|
@@ -0,0 +1 @@ |
21 |
|
|
+false |
22 |
|
|
diff -ruN e-smith-samba-2.6.0.old/root/etc/e-smith/db/configuration/defaults/krb5/type e-smith-samba-2.6.0/root/etc/e-smith/db/configuration/defaults/krb5/type |
23 |
|
|
--- e-smith-samba-2.6.0.old/root/etc/e-smith/db/configuration/defaults/krb5/type 1970-01-01 01:00:00.000000000 +0100 |
24 |
|
|
+++ e-smith-samba-2.6.0/root/etc/e-smith/db/configuration/defaults/krb5/type 2016-09-26 00:50:38.000000000 +0200 |
25 |
|
|
@@ -0,0 +1 @@ |
26 |
|
|
+configuration |
27 |
|
|
diff -ruN e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/00usedb e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/00usedb |
28 |
|
|
--- e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/00usedb 1970-01-01 01:00:00.000000000 +0100 |
29 |
|
|
+++ e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/00usedb 2016-09-26 00:50:38.000000000 +0200 |
30 |
|
|
@@ -0,0 +1,3 @@ |
31 |
|
|
+{ |
32 |
|
|
+ use esmith::db; |
33 |
|
|
+} |
34 |
|
|
diff -ruN e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/02disableprofiledir e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/02disableprofiledir |
35 |
|
|
--- e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/02disableprofiledir 1970-01-01 01:00:00.000000000 +0100 |
36 |
|
|
+++ e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/02disableprofiledir 2020-11-13 11:03:23.888649314 +0100 |
37 |
|
|
@@ -0,0 +1,3 @@ |
38 |
|
|
+# Configuration snippets may be placed in this directory as well |
39 |
|
|
+# See https://bugs.contribs.org/show_bug.cgi?id=11093 |
40 |
|
|
+#includedir /etc/krb5.conf.d/ |
41 |
|
|
diff -ruN e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/05logging e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/05logging |
42 |
|
|
--- e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/05logging 1970-01-01 01:00:00.000000000 +0100 |
43 |
|
|
+++ e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/05logging 2020-11-14 17:41:13.884316007 +0100 |
44 |
|
|
@@ -0,0 +1,4 @@ |
45 |
|
|
+[logging] |
46 |
|
|
+ default = FILE:/var/log/krb5libs.log |
47 |
|
|
+ kdc = FILE:/var/log/krb5kdc.log |
48 |
|
|
+ admin_server = FILE:/var/log/kadmind.log |
49 |
|
|
diff -ruN e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/10libdefaults e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/10libdefaults |
50 |
|
|
--- e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/10libdefaults 1970-01-01 01:00:00.000000000 +0100 |
51 |
|
|
+++ e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/10libdefaults 2016-09-26 00:50:38.000000000 +0200 |
52 |
|
|
@@ -0,0 +1 @@ |
53 |
|
|
+[libdefaults] |
54 |
|
|
diff -ruN e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/15settings e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/15settings |
55 |
|
|
--- e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/15settings 1970-01-01 01:00:00.000000000 +0100 |
56 |
|
|
+++ e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/15settings 2020-11-14 17:47:06.884873750 +0100 |
57 |
|
|
@@ -0,0 +1,6 @@ |
58 |
|
|
+ ticket_lifetime = 24h |
59 |
|
|
+ renew_lifetime = 7d |
60 |
|
|
+ forwardable = true |
61 |
|
|
+ rdns = false |
62 |
|
|
+ default_ccache_name = KEYRING:persistent:%{uid} |
63 |
|
|
+ |
64 |
|
|
\ No newline at end of file |
65 |
|
|
diff -ruN e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/20default_realm e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/20default_realm |
66 |
|
|
--- e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/20default_realm 1970-01-01 01:00:00.000000000 +0100 |
67 |
|
|
+++ e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/20default_realm 2016-09-26 00:50:38.000000000 +0200 |
68 |
|
|
@@ -0,0 +1,8 @@ |
69 |
|
|
+{ |
70 |
|
|
+ my $workgroup = $smb{Workgroup} || 'sme-server'; |
71 |
|
|
+ my $realm = $smb{realm} || $workgroup . "." . $DomainName; |
72 |
|
|
+ |
73 |
|
|
+ my $default_realm = $smb{realm} || $workgroup . "." .$DomainName; |
74 |
|
|
+ |
75 |
|
|
+ "default_realm = $default_realm"; |
76 |
|
|
+} |
77 |
|
|
diff -ruN e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/25dns_lookup_realm e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/25dns_lookup_realm |
78 |
|
|
--- e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/25dns_lookup_realm 1970-01-01 01:00:00.000000000 +0100 |
79 |
|
|
+++ e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/25dns_lookup_realm 2016-09-26 00:50:38.000000000 +0200 |
80 |
|
|
@@ -0,0 +1,5 @@ |
81 |
|
|
+{ |
82 |
|
|
+ my $dns_lookup_realm = $krb5{DNSLookupRealm} || 'false'; |
83 |
|
|
+ |
84 |
|
|
+ "dns_lookup_realm = $dns_lookup_realm"; |
85 |
|
|
+} |
86 |
|
|
diff -ruN e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/30dns_lookup_kdc e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/30dns_lookup_kdc |
87 |
|
|
--- e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/30dns_lookup_kdc 1970-01-01 01:00:00.000000000 +0100 |
88 |
|
|
+++ e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/30dns_lookup_kdc 2016-09-26 00:50:38.000000000 +0200 |
89 |
|
|
@@ -0,0 +1,5 @@ |
90 |
|
|
+{ |
91 |
|
|
+ my $dns_lookup_kdc = $krb5{DNSLookupKDC} || 'true'; |
92 |
|
|
+ |
93 |
|
|
+ "dns_lookup_kdc = $dns_lookup_kdc"; |
94 |
|
|
+} |
95 |
|
|
diff -ruN e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/40realms e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/40realms |
96 |
|
|
--- e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/40realms 1970-01-01 01:00:00.000000000 +0100 |
97 |
|
|
+++ e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/40realms 2020-11-14 17:44:57.125830796 +0100 |
98 |
|
|
@@ -0,0 +1,5 @@ |
99 |
|
|
+[realms] |
100 |
|
|
+# EXAMPLE.COM = { |
101 |
|
|
+# kdc = kerberos.example.com |
102 |
|
|
+# admin_server = kerberos.example.com |
103 |
|
|
+# } |
104 |
|
|
diff -ruN e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/50domain_realm e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/50domain_realm |
105 |
|
|
--- e-smith-samba-2.6.0.old/root/etc/e-smith/templates/etc/krb5.conf/50domain_realm 1970-01-01 01:00:00.000000000 +0100 |
106 |
|
|
+++ e-smith-samba-2.6.0/root/etc/e-smith/templates/etc/krb5.conf/50domain_realm 2020-11-14 17:45:25.622279244 +0100 |
107 |
|
|
@@ -0,0 +1,3 @@ |
108 |
|
|
+[domain_realm] |
109 |
|
|
+# .example.com = EXAMPLE.COM |
110 |
|
|
+# example.com = EXAMPLE.COM |