Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ncm-authconfig: Fix wrapping and indentation in pan #1748

Merged
merged 1 commit into from
Nov 29, 2024
+15 −10
Merged

ncm-authconfig: Fix wrapping and indentation in pan #1748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions ncm-authconfig/src/main/pan/components/authconfig/sssd/ldap.pan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@

declaration template components/authconfig/sssd/ldap;

type ldap_schema = string with match(SELF, "^(IPA|AD|rfc2307|rfc2307bis)") ||
error ("LDAP schema must be valid according to sssd-ldap: " + SELF);
type ldap_schema = string with match(SELF, "^(IPA|AD|rfc2307|rfc2307bis)") || error(
jrha marked this conversation as resolved.
Show resolved Hide resolved
"LDAP schema must be valid according to sssd-ldap: " + SELF
);

type ldap_authok = string with match(SELF, "^(obfuscated_)?password") ||
error ("LDAP authok must be valid according to sssd-ldap: " + SELF);
type ldap_authok = string with match(SELF, "^(obfuscated_)?password") || error(
"LDAP authok must be valid according to sssd-ldap: " + SELF
);

type ldap_deref = string with match(SELF, "^(never|searching|finding|always)$") ||
error ("Invalid LDAP alias dereferencing method: " + SELF);
type ldap_deref = string with match(SELF, "^(never|searching|finding|always)$") || error(
"Invalid LDAP alias dereferencing method: " + SELF
);

type ldap_order = string with match(SELF, "^(filter|expire|authorized_service|host)$");

Expand Down
10 changes: 6 additions & 4 deletions ncm-authconfig/src/main/pan/components/authconfig/sssd/tls.pan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@

declaration template components/authconfig/sssd/tls;

type ldap_req_checks = string with match(SELF, "^(never|allow|try|demand|hard)$") ||
error ("LDAP certificate requests must be valid acording to ssd-ldap: " + SELF);
type ldap_req_checks = string with match(SELF, "^(never|allow|try|demand|hard)$") || error(
"LDAP certificate requests must be valid acording to ssd-ldap: " + SELF
);


type sssd_tls = {
Expand All @@ -24,5 +25,6 @@ type sssd_tls = {
"key" ? string
"cipher_suite" ? string[]
"reqcert" : ldap_req_checks = "hard"
} with exists(SELF["cacert"]) || exists(SELF["cacertdir"]) ||
error("LDAP TLS requires at least one of cacert or cacertdir");
} with exists(SELF["cacert"]) || exists(SELF["cacertdir"]) || error(
"LDAP TLS requires at least one of cacert or cacertdir"
);