ncm-sudo: support all values for lecture option and the lecture_file …

…option
quattor · Jul 3, 2024 · 9d31391 · 9d31391
1 parent 3f9e67d
commit 9d31391
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ncm-sudo/src/main/pan/components/sudo/schema.pan b/ncm-sudo/src/main/pan/components/sudo/schema.pan
@@ -46,7 +46,9 @@ type sudo_default_options = {
     "mail_no_host" ? boolean
     "mail_no_perms" ? boolean
     "tty_tickets" ? boolean
-    "lecture" ? boolean
+    # old boolean behaviour: true means once, false means never
+    "lecture" ? choice('always', 'once', 'never')
+    "lecture_file" ? absolute_file_path
     "authenticate" ? boolean
     "root_sudo" ? boolean
     "log_host" ? boolean

diff --git a/ncm-sudo/src/main/perl/sudo.pm b/ncm-sudo/src/main/perl/sudo.pm
@@ -73,7 +73,6 @@ use constant BOOLEAN_OPTS => qw(
     mail_no_host
     mail_no_perms
     tty_tickets
-    lecture
     authenticate
     root_sudo
     log_host
@@ -124,6 +123,8 @@ use constant STRING_OPTS => qw(
     verifypw
     listpw
     secure_path
+    lecture
+    lecture_file
 );
 
 # generate_aliases method