Skip to content

Commit 6206b19

Browse files
authored
Merge pull request #1844 from jrha/cleanup-metaconfig-kerberos
ncm-metaconfig: kerberos: Fix wrapping and indentation in pan
2 parents c025bc3 + b5c86cc commit 6206b19

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

ncm-metaconfig/src/main/metaconfig/kerberos/pan/schema.pan

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ type krb5_libdefaults = {
1818
"dns_lookup_realm" : boolean = false
1919
"dns_lookup_kdc" : boolean = false
2020
# The lifetimes are specified in seconds
21-
"ticket_lifetime" : long = 24*60*60
22-
"renew_lifetime" : long = 7*24*60
21+
"ticket_lifetime" : long = 24 * 60 * 60
22+
"renew_lifetime" : long = 7 * 24 * 60
2323
"forwardable" : boolean = true
2424
"default_keytab_name" : string = "FILE:/etc/krb5.keytab"
2525
};
@@ -40,9 +40,11 @@ type kdc_realm = {
4040
"acl_file" : string = "/var/kerberos/krb5kdc/kadm5.acl"
4141
"dict_file" : string = "/usr/share/dict/words"
4242
"admin_keytab" : string = "/var/kerberos/krb5kdc/krb5kdc/kadm5.keytab"
43-
"supported_enctypes" : string[] = list("aes256-cts:normal",
44-
"aes128-cts:normal",
45-
"des3-hmac-sha1:normal")
43+
"supported_enctypes" : string[] = list(
44+
"aes256-cts:normal",
45+
"aes128-cts:normal",
46+
"des3-hmac-sha1:normal",
47+
)
4648
};
4749

4850
type kdc_conf_file = {

ncm-metaconfig/src/main/metaconfig/kerberos/tests/profiles/base-client.pan

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ prefix "/metaconfig/contents";
99
'KDC.REALM', dict(
1010
"kdc", 'KDC.SERVER',
1111
"admin_server", 'KDC.SERVER'
12-
));
12+
),
13+
);
1314
"domain_realms" = dict('DEFAULT_DOMAIN', 'KDC.REALM');
1415

1516
# verify schema

ncm-metaconfig/src/main/metaconfig/kerberos/tests/profiles/krb5_conf.pan

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ prefix "/software/components/metaconfig/services/{/etc/krb5.conf}/contents";
1010
'KDC.REALM', dict(
1111
"kdc", 'KDC.SERVER',
1212
"admin_server", 'KDC.SERVER'
13-
));
13+
),
14+
);
1415
"domain_realms" = dict('DEFAULT_DOMAIN', 'KDC.REALM');

0 commit comments

Comments
 (0)