From b0806fcb1a4aea851e32982b9931e9097b44f12c Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 12 May 2020 17:09:43 +0200 Subject: [PATCH 1/3] allow optional types for string and map --- src/autoyast-rnc/samba-server.rnc | 911 +++++++++++++++--------------- 1 file changed, 462 insertions(+), 449 deletions(-) diff --git a/src/autoyast-rnc/samba-server.rnc b/src/autoyast-rnc/samba-server.rnc index 3382868..f304ef2 100644 --- a/src/autoyast-rnc/samba-server.rnc +++ b/src/autoyast-rnc/samba-server.rnc @@ -2,456 +2,468 @@ default namespace = "http://www.suse.com/1.0/yast2ns" namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" -workgroup = element workgroup { text } +include "common.rnc" + +workgroup = element workgroup { STRING } accounts = element accounts { attribute config:type { text }?, - element account { text }* + element account { STRING }* } samba-server = element samba-server { - accounts? & - element backend { - element fixme { text }* - }? & - element config { - attribute config:type { text }? & - element comment { text }? & - element listentry { - element disabled { attribute config:type { text }? & text }? & - element name { text }? & - element comment { text }? & - element parameters { - element NIS_homedir { text }? & - element abort_shutdown_script { text }? & - element access_based_share_enum { text }? & - element acl_allow_execute_always { text }? & - element acl_check_permissions { text }? & - element acl_group_control { text }? & - element acl_map_full_control { text }? & - element add_group_script { text }? & - element add_machine_script { text }? & - element add_share_command { text }? & - element add_user_script { text }? & - element add_user_to_group_script { text }? & - element addport_command { text }? & - element addprinter_command { text }? & - element admin_users { text }? & - element administrative_share { text }? & - element afs_share { text }? & - element afs_token_lifetime { text }? & - element afs_username_map { text }? & - element aio_read_size { text }? & - element aio_write_behind { text }? & - element aio_write_size { text }? & - element algorithmic_rid_base { text }? & - element allocation_roundup_size { text }? & - element allow_dns_updates { text }? & - element allow_insecure_wide_links { text }? & - element allow_trusted_domains { text }? & - element async_smb_echo_handler { text }? & - element auth_methods { text }? & - element available { text }? & - element bind_interfaces_only { text }? & - element block_size { text }? & - element blocking_locks { text }? & - element browse_list { text }? & - element browseable { text }? & - element cache_directory { text }? & - element case_sensitive { text }? & - element change_notify { text }? & - element change_share_command { text }? & - element check_password_script { text }? & - element cldap_port { text }? & - element client_NTLMv2_auth { text }? & - element client_lanman_auth { text }? & - element client_ldap_sasl_wrapping { text }? & - element client_max_protocol { text }? & - element client_min_protocol { text }? & - element client_plaintext_auth { text }? & - element client_schannel { text }? & - element client_signing { text }? & - element client_use_spnego { text }? & - element client_use_spnego_principal { text }? & - element cluster_addresses { text }? & - element clustering { text }? & - element comment { text }? & - element config_backend { text }? & - element config_file { text }? & - element copy { text }? & - element create_krb5_conf { text }? & - element create_mask { text }? & - element csc_policy { text }? & - element ctdb_locktime_warn_threshold { text }? & - element ctdb_timeout { text }? & - element ctdbd_socket { text }? & - element cups_connection_timeout { text }? & - element cups_encrypt { text }? & - element cups_options { text }? & - element cups_server { text }? & - element dcerpc_endpoint_servers { text }? & - element deadtime { text }? & - element debug_class { text }? & - element debug_hires_timestamp { text }? & - element debug_pid { text }? & - element debug_prefix_timestamp { text }? & - element debug_timestamp { text }? & - element debug_uid { text }? & - element dedicated_keytab_file { text }? & - element default_case { text }? & - element default_devmode { text }? & - element default_service { text }? & - element defer_sharing_violations { text }? & - element delete_group_script { text }? & - element delete_readonly { text }? & - element delete_share_command { text }? & - element delete_user_from_group_script { text }? & - element delete_user_script { text }? & - element delete_veto_files { text }? & - element deleteprinter_command { text }? & - element dfree_cache_time { text }? & - element dfree_command { text }? & - element dgram_port { text }? & - element directory_mask { text }? & - element directory_name_cache_size { text }? & - element directory_security_mask { text }? & - element disable_netbios { text }? & - element disable_spoolss { text }? & - element dmapi_support { text }? & - element dns_forwarder { text }? & - element dns_proxy { text }? & - element dns_update_command { text }? & - element domain_logons { text }? & - element domain_master { text }? & - element dont_descend { text }? & - element dos_charset { text }? & - element dos_filemode { text }? & - element dos_filetime_resolution { text }? & - element dos_filetimes { text }? & - element durable_handles { text }? & - element ea_support { text }? & - element enable_asu_support { text }? & - element enable_core_files { text }? & - element enable_privileges { text }? & - element enable_spoolss { text }? & - element encrypt_passwords { text }? & - element enhanced_browsing { text }? & - element enumports_command { text }? & - element eventlog_list { text }? & - element fake_directory_create_times { text }? & - element fake_oplocks { text }? & - element follow_symlinks { text }? & - element force_create_mode { text }? & - element force_directory_mode { text }? & - element force_directory_security_mode { text }? & - element force_group { text }? & - element force_printername { text }? & - element force_security_mode { text }? & - element force_unknown_acl_user { text }? & - element force_user { text }? & - element fstype { text }? & - element get_quota_command { text }? & - element getwd_cache { text }? & - element guest_account { text }? & - element guest_ok { text }? & - element guest_only { text }? & - element hide_dot_files { text }? & - element hide_files { text }? & - element hide_special_files { text }? & - element hide_unreadable { text }? & - element hide_unwriteable_files { text }? & - element homedir_map { text }? & - element host_msdfs { text }? & - element hostname_lookups { text }? & - element hosts_allow { text }? & - element hosts_deny { text }? & - element idmap_backend { text }? & - element idmap_cache_time { text }? & - element idmap_gid { text }? & - element idmap_negative_cache_time { text }? & - element idmap_uid { text }? & - element include { text }? & - element inherit_acls { text }? & - element inherit_owner { text }? & - element inherit_permissions { text }? & - element init_logon_delay { text }? & - element init_logon_delayed_hosts { text }? & - element interfaces { text }? & - element invalid_users { text }? & - element iprint_server { text }? & - element keepalive { text }? & - element kerberos_method { text }? & - element kernel_change_notify { text }? & - element kernel_oplocks { text }? & - element kernel_share_modes { text }? & - element kpasswd_port { text }? & - element krb5_port { text }? & - element lanman_auth { text }? & - element large_readwrite { text }? & - element ldap_admin_dn { text }? & - element ldap_connection_timeout { text }? & - element ldap_debug_level { text }? & - element ldap_debug_threshold { text }? & - element ldap_delete_dn { text }? & - element ldap_deref { text }? & - element ldap_follow_referral { text }? & - element ldap_group_suffix { text }? & - element ldap_idmap_suffix { text }? & - element ldap_machine_suffix { text }? & - element ldap_page_size { text }? & - element ldap_passwd_sync { text }? & - element ldap_replication_sleep { text }? & - element ldap_ssl { text }? & - element ldap_ssl_ads { text }? & - element ldap_suffix { text }? & - element ldap_timeout { text }? & - element ldap_user_suffix { text }? & - element level2_oplocks { text }? & - element lm_announce { text }? & - element lm_interval { text }? & - element load_printers { text }? & - element local_master { text }? & - element lock_directory { text }? & - element lock_spin_time { text }? & - element locking { text }? & - element log_file { text }? & - element log_level { text }? & - element log_nt_token_command { text }? & - element log_writeable_files_on_exit { text }? & - element logon_drive { text }? & - element logon_home { text }? & - element logon_path { text }? & - element logon_script { text }? & - element lppause_command { text }? & - element lpq_cache_time { text }? & - element lpq_command { text }? & - element lpresume_command { text }? & - element lprm_command { text }? & - element machine_password_timeout { text }? & - element magic_output { text }? & - element magic_script { text }? & - element mangle_prefix { text }? & - element mangled_names { text }? & - element mangling_char { text }? & - element mangling_method { text }? & - element map_acl_inherit { text }? & - element map_archive { text }? & - element map_hidden { text }? & - element map_readonly { text }? & - element map_system { text }? & - element map_to_guest { text }? & - element map_untrusted_to_domain { text }? & - element max_connections { text }? & - element max_disk_size { text }? & - element max_log_size { text }? & - element max_mux { text }? & - element max_open_files { text }? & - element max_print_jobs { text }? & - element max_reported_print_jobs { text }? & - element max_smbd_processes { text }? & - element max_stat_cache_size { text }? & - element max_ttl { text }? & - element max_wins_ttl { text }? & - element max_xmit { text }? & - element message_command { text }? & - element min_print_space { text }? & - element min_receivefile_size { text }? & - element min_wins_ttl { text }? & - element msdfs_proxy { text }? & - element msdfs_root { text }? & - element multicast_dns_register { text }? & - element name_cache_timeout { text }? & - element name_resolve_order { text }? & - element nbt_client_socket_address { text }? & - element nbt_port { text }? & - element ncalrpc_dir { text }? & - element netbios_aliases { text }? & - element netbios_name { text }? & - element netbios_scope { text }? & - element nmbd_bind_explicit_broadcast { text }? & - element nsupdate_command { text }? & - element nt_acl_support { text }? & - element nt_pipe_support { text }? & - element nt_status_support { text }? & - element ntlm_auth { text }? & - element ntp_signd_socket_directory { text }? & - element ntvfs_handler { text }? & - element null_passwords { text }? & - element obey_pam_restrictions { text }? & - element only_user { text }? & - element oplock_break_wait_time { text }? & - element oplock_contention_limit { text }? & - element oplocks { text }? & - element os2_driver_map { text }? & - element os_level { text }? & - element pam_password_change { text }? & - element panic_action { text }? & - element passdb_backend { text }? & - element passdb_expand_explicit { text }? & - element passwd_chat { text }? & - element passwd_chat_debug { text }? & - element passwd_chat_timeout { text }? & - element passwd_program { text }? & - element password_server { text }? & - element path { text }? & - element perfcount_module { text }? & - element pid_directory { text }? & - element posix_locking { text }? & - element postexec { text }? & - element preexec { text }? & - element preexec_close { text }? & - element preferred_master { text }? & - element preload { text }? & - element preload_modules { text }? & - element preserve_case { text }? & - element print_command { text }? & - element print_notify_backchannel { text }? & - element printable { text }? & - element printcap_cache_time { text }? & - element printcap_name { text }? & - element printer_name { text }? & - element printing { text }? & - element printjob_username { text }? & - element private_dir { text }? & - element profile_acls { text }? & - element queuepause_command { text }? & - element queueresume_command { text }? & - element read_list { text }? & - element read_only { text }? & - element read_raw { text }? & - element realm { text }? & - element registry_shares { text }? & - element remote_announce { text }? & - element remote_browse_sync { text }? & - element rename_user_script { text }? & - element reset_on_zero_vc { text }? & - element restrict_anonymous { text }? & - element rndc_command { text }? & - element root_directory { text }? & - element root_postexec { text }? & - element root_preexec { text }? & - element root_preexec_close { text }? & - element rpc_big_endian { text }? & - element samba_kcc_command { text }? & - element security { text }? & - element security_mask { text }? & - element server_max_protocol { text }? & - element server_min_protocol { text }? & - element server_role { text }? & - element server_schannel { text }? & - element server_services { text }? & - element server_signing { text }? & - element server_string { text }? & - element set_primary_group_script { text }? & - element set_quota_command { text }? & - element share_backend { text }? & - element short_preserve_case { text }? & - element show_add_printer_wizard { text }? & - element shutdown_script { text }? & - element smb2_max_credits { text }? & - element smb2_max_read { text }? & - element smb2_max_trans { text }? & - element smb2_max_write { text }? & - element smb_encrypt { text }? & - element smb_passwd_file { text }? & - element smb_ports { text }? & - element socket_options { text }? & - element spn_update_command { text }? & - element stat_cache { text }? & - element state_directory { text }? & - element store_dos_attributes { text }? & - element strict_allocate { text }? & - element strict_locking { text }? & - element strict_sync { text }? & - element svcctl_list { text }? & - element sync_always { text }? & - element syslog { text }? & - element syslog_only { text }? & - element template_homedir { text }? & - element template_shell { text }? & - element time_server { text }? & - element tls_cafile { text }? & - element tls_certfile { text }? & - element tls_crlfile { text }? & - element tls_dh_params_file { text }? & - element tls_enabled { text }? & - element tls_keyfile { text }? & - element unicode { text }? & - element unix_charset { text }? & - element unix_extensions { text }? & - element unix_password_sync { text }? & - element use_client_driver { text }? & - element use_mmap { text }? & - element use_ntdb { text }? & - element use_sendfile { text }? & - element use_spnego { text }? & - element username { text }? & - element username_level { text }? & - element username_map { text }? & - element username_map_cache_time { text }? & - element username_map_script { text }? & - element usershare_allow_guests { text }? & - element usershare_max_shares { text }? & - element usershare_owner_only { text }? & - element usershare_path { text }? & - element usershare_prefix_allow_list { text }? & - element usershare_prefix_deny_list { text }? & - element usershare_template_share { text }? & - element utmp { text }? & - element utmp_directory { text }? & - element valid_users { text }? & - element veto_files { text }? & - element veto_oplock_files { text }? & - element vfs_objects { text }? & - element volume { text }? & - element web_port { text }? & - element wide_links { text }? & - element winbind_cache_time { text }? & - element winbind_enum_groups { text }? & - element winbind_enum_users { text }? & - element winbind_expand_groups { text }? & - element winbind_max_clients { text }? & - element winbind_max_domain_connections { text }? & - element winbind_nested_groups { text }? & - element winbind_normalize_names { text }? & - element winbind_nss_info { text }? & - element winbind_offline_logon { text }? & - element winbind_reconnect_delay { text }? & - element winbind_refresh_tickets { text }? & - element winbind_request_timeout { text }? & - element winbind_rpc_only { text }? & - element winbind_sealed_pipes { text }? & - element winbind_separator { text }? & - element winbind_trusted_domains_only { text }? & - element winbind_use_default_domain { text }? & - element winbindd_privileged_socket_directory { text }? & - element winbindd_socket_directory { text }? & - element wins_hook { text }? & - element wins_proxy { text }? & - element wins_server { text }? & - element wins_support { text }? & - element workgroup { text }? & - element write_cache_size { text }? & - element write_list { text }? & - element write_raw { text }? & - element writeable { text }? & - element wtmp_directory { text }? - }? - }* - }? & - samba-client? & - role? & - element service { text }? & - shares? & - element trustdom { - element fixme { text }* - }? & - trusteddomains? & - version? + MAP, + ( + accounts? & + element backend { + element fixme { STRING }* + }? & + element config { + attribute config:type { text }? & + element comment { STRING }? & + element listentry { + MAP, + ( + element disabled { attribute config:type { text }? & STRING }? & + element name { STRING }? & + element comment { STRING }? & + element parameters { + MAP, + ( + element NIS_homedir { STRING }? & + element abort_shutdown_script { STRING }? & + element access_based_share_enum { STRING }? & + element acl_allow_execute_always { STRING }? & + element acl_check_permissions { STRING }? & + element acl_group_control { STRING }? & + element acl_map_full_control { STRING }? & + element add_group_script { STRING }? & + element add_machine_script { STRING }? & + element add_share_command { STRING }? & + element add_user_script { STRING }? & + element add_user_to_group_script { STRING }? & + element addport_command { STRING }? & + element addprinter_command { STRING }? & + element admin_users { STRING }? & + element administrative_share { STRING }? & + element afs_share { STRING }? & + element afs_token_lifetime { STRING }? & + element afs_username_map { STRING }? & + element aio_read_size { STRING }? & + element aio_write_behind { STRING }? & + element aio_write_size { STRING }? & + element algorithmic_rid_base { STRING }? & + element allocation_roundup_size { STRING }? & + element allow_dns_updates { STRING }? & + element allow_insecure_wide_links { STRING }? & + element allow_trusted_domains { STRING }? & + element async_smb_echo_handler { STRING }? & + element auth_methods { STRING }? & + element available { STRING }? & + element bind_interfaces_only { STRING }? & + element block_size { STRING }? & + element blocking_locks { STRING }? & + element browse_list { STRING }? & + element browseable { STRING }? & + element cache_directory { STRING }? & + element case_sensitive { STRING }? & + element change_notify { STRING }? & + element change_share_command { STRING }? & + element check_password_script { STRING }? & + element cldap_port { STRING }? & + element client_NTLMv2_auth { STRING }? & + element client_lanman_auth { STRING }? & + element client_ldap_sasl_wrapping { STRING }? & + element client_max_protocol { STRING }? & + element client_min_protocol { STRING }? & + element client_plaintext_auth { STRING }? & + element client_schannel { STRING }? & + element client_signing { STRING }? & + element client_use_spnego { STRING }? & + element client_use_spnego_principal { STRING }? & + element cluster_addresses { STRING }? & + element clustering { STRING }? & + element comment { STRING }? & + element config_backend { STRING }? & + element config_file { STRING }? & + element copy { STRING }? & + element create_krb5_conf { STRING }? & + element create_mask { STRING }? & + element csc_policy { STRING }? & + element ctdb_locktime_warn_threshold { STRING }? & + element ctdb_timeout { STRING }? & + element ctdbd_socket { STRING }? & + element cups_connection_timeout { STRING }? & + element cups_encrypt { STRING }? & + element cups_options { STRING }? & + element cups_server { STRING }? & + element dcerpc_endpoint_servers { STRING }? & + element deadtime { STRING }? & + element debug_class { STRING }? & + element debug_hires_timestamp { STRING }? & + element debug_pid { STRING }? & + element debug_prefix_timestamp { STRING }? & + element debug_timestamp { STRING }? & + element debug_uid { STRING }? & + element dedicated_keytab_file { STRING }? & + element default_case { STRING }? & + element default_devmode { STRING }? & + element default_service { STRING }? & + element defer_sharing_violations { STRING }? & + element delete_group_script { STRING }? & + element delete_readonly { STRING }? & + element delete_share_command { STRING }? & + element delete_user_from_group_script { STRING }? & + element delete_user_script { STRING }? & + element delete_veto_files { STRING }? & + element deleteprinter_command { STRING }? & + element dfree_cache_time { STRING }? & + element dfree_command { STRING }? & + element dgram_port { STRING }? & + element directory_mask { STRING }? & + element directory_name_cache_size { STRING }? & + element directory_security_mask { STRING }? & + element disable_netbios { STRING }? & + element disable_spoolss { STRING }? & + element dmapi_support { STRING }? & + element dns_forwarder { STRING }? & + element dns_proxy { STRING }? & + element dns_update_command { STRING }? & + element domain_logons { STRING }? & + element domain_master { STRING }? & + element dont_descend { STRING }? & + element dos_charset { STRING }? & + element dos_filemode { STRING }? & + element dos_filetime_resolution { STRING }? & + element dos_filetimes { STRING }? & + element durable_handles { STRING }? & + element ea_support { STRING }? & + element enable_asu_support { STRING }? & + element enable_core_files { STRING }? & + element enable_privileges { STRING }? & + element enable_spoolss { STRING }? & + element encrypt_passwords { STRING }? & + element enhanced_browsing { STRING }? & + element enumports_command { STRING }? & + element eventlog_list { STRING }? & + element fake_directory_create_times { STRING }? & + element fake_oplocks { STRING }? & + element follow_symlinks { STRING }? & + element force_create_mode { STRING }? & + element force_directory_mode { STRING }? & + element force_directory_security_mode { STRING }? & + element force_group { STRING }? & + element force_printername { STRING }? & + element force_security_mode { STRING }? & + element force_unknown_acl_user { STRING }? & + element force_user { STRING }? & + element fstype { STRING }? & + element get_quota_command { STRING }? & + element getwd_cache { STRING }? & + element guest_account { STRING }? & + element guest_ok { STRING }? & + element guest_only { STRING }? & + element hide_dot_files { STRING }? & + element hide_files { STRING }? & + element hide_special_files { STRING }? & + element hide_unreadable { STRING }? & + element hide_unwriteable_files { STRING }? & + element homedir_map { STRING }? & + element host_msdfs { STRING }? & + element hostname_lookups { STRING }? & + element hosts_allow { STRING }? & + element hosts_deny { STRING }? & + element idmap_backend { STRING }? & + element idmap_cache_time { STRING }? & + element idmap_gid { STRING }? & + element idmap_negative_cache_time { STRING }? & + element idmap_uid { STRING }? & + element include { STRING }? & + element inherit_acls { STRING }? & + element inherit_owner { STRING }? & + element inherit_permissions { STRING }? & + element init_logon_delay { STRING }? & + element init_logon_delayed_hosts { STRING }? & + element interfaces { STRING }? & + element invalid_users { STRING }? & + element iprint_server { STRING }? & + element keepalive { STRING }? & + element kerberos_method { STRING }? & + element kernel_change_notify { STRING }? & + element kernel_oplocks { STRING }? & + element kernel_share_modes { STRING }? & + element kpasswd_port { STRING }? & + element krb5_port { STRING }? & + element lanman_auth { STRING }? & + element large_readwrite { STRING }? & + element ldap_admin_dn { STRING }? & + element ldap_connection_timeout { STRING }? & + element ldap_debug_level { STRING }? & + element ldap_debug_threshold { STRING }? & + element ldap_delete_dn { STRING }? & + element ldap_deref { STRING }? & + element ldap_follow_referral { STRING }? & + element ldap_group_suffix { STRING }? & + element ldap_idmap_suffix { STRING }? & + element ldap_machine_suffix { STRING }? & + element ldap_page_size { STRING }? & + element ldap_passwd_sync { STRING }? & + element ldap_replication_sleep { STRING }? & + element ldap_ssl { STRING }? & + element ldap_ssl_ads { STRING }? & + element ldap_suffix { STRING }? & + element ldap_timeout { STRING }? & + element ldap_user_suffix { STRING }? & + element level2_oplocks { STRING }? & + element lm_announce { STRING }? & + element lm_interval { STRING }? & + element load_printers { STRING }? & + element local_master { STRING }? & + element lock_directory { STRING }? & + element lock_spin_time { STRING }? & + element locking { STRING }? & + element log_file { STRING }? & + element log_level { STRING }? & + element log_nt_token_command { STRING }? & + element log_writeable_files_on_exit { STRING }? & + element logon_drive { STRING }? & + element logon_home { STRING }? & + element logon_path { STRING }? & + element logon_script { STRING }? & + element lppause_command { STRING }? & + element lpq_cache_time { STRING }? & + element lpq_command { STRING }? & + element lpresume_command { STRING }? & + element lprm_command { STRING }? & + element machine_password_timeout { STRING }? & + element magic_output { STRING }? & + element magic_script { STRING }? & + element mangle_prefix { STRING }? & + element mangled_names { STRING }? & + element mangling_char { STRING }? & + element mangling_method { STRING }? & + element map_acl_inherit { STRING }? & + element map_archive { STRING }? & + element map_hidden { STRING }? & + element map_readonly { STRING }? & + element map_system { STRING }? & + element map_to_guest { STRING }? & + element map_untrusted_to_domain { STRING }? & + element max_connections { STRING }? & + element max_disk_size { STRING }? & + element max_log_size { STRING }? & + element max_mux { STRING }? & + element max_open_files { STRING }? & + element max_print_jobs { STRING }? & + element max_reported_print_jobs { STRING }? & + element max_smbd_processes { STRING }? & + element max_stat_cache_size { STRING }? & + element max_ttl { STRING }? & + element max_wins_ttl { STRING }? & + element max_xmit { STRING }? & + element message_command { STRING }? & + element min_print_space { STRING }? & + element min_receivefile_size { STRING }? & + element min_wins_ttl { STRING }? & + element msdfs_proxy { STRING }? & + element msdfs_root { STRING }? & + element multicast_dns_register { STRING }? & + element name_cache_timeout { STRING }? & + element name_resolve_order { STRING }? & + element nbt_client_socket_address { STRING }? & + element nbt_port { STRING }? & + element ncalrpc_dir { STRING }? & + element netbios_aliases { STRING }? & + element netbios_name { STRING }? & + element netbios_scope { STRING }? & + element nmbd_bind_explicit_broadcast { STRING }? & + element nsupdate_command { STRING }? & + element nt_acl_support { STRING }? & + element nt_pipe_support { STRING }? & + element nt_status_support { STRING }? & + element ntlm_auth { STRING }? & + element ntp_signd_socket_directory { STRING }? & + element ntvfs_handler { STRING }? & + element null_passwords { STRING }? & + element obey_pam_restrictions { STRING }? & + element only_user { STRING }? & + element oplock_break_wait_time { STRING }? & + element oplock_contention_limit { STRING }? & + element oplocks { STRING }? & + element os2_driver_map { STRING }? & + element os_level { STRING }? & + element pam_password_change { STRING }? & + element panic_action { STRING }? & + element passdb_backend { STRING }? & + element passdb_expand_explicit { STRING }? & + element passwd_chat { STRING }? & + element passwd_chat_debug { STRING }? & + element passwd_chat_timeout { STRING }? & + element passwd_program { STRING }? & + element password_server { STRING }? & + element path { STRING }? & + element perfcount_module { STRING }? & + element pid_directory { STRING }? & + element posix_locking { STRING }? & + element postexec { STRING }? & + element preexec { STRING }? & + element preexec_close { STRING }? & + element preferred_master { STRING }? & + element preload { STRING }? & + element preload_modules { STRING }? & + element preserve_case { STRING }? & + element print_command { STRING }? & + element print_notify_backchannel { STRING }? & + element printable { STRING }? & + element printcap_cache_time { STRING }? & + element printcap_name { STRING }? & + element printer_name { STRING }? & + element printing { STRING }? & + element printjob_username { STRING }? & + element private_dir { STRING }? & + element profile_acls { STRING }? & + element queuepause_command { STRING }? & + element queueresume_command { STRING }? & + element read_list { STRING }? & + element read_only { STRING }? & + element read_raw { STRING }? & + element realm { STRING }? & + element registry_shares { STRING }? & + element remote_announce { STRING }? & + element remote_browse_sync { STRING }? & + element rename_user_script { STRING }? & + element reset_on_zero_vc { STRING }? & + element restrict_anonymous { STRING }? & + element rndc_command { STRING }? & + element root_directory { STRING }? & + element root_postexec { STRING }? & + element root_preexec { STRING }? & + element root_preexec_close { STRING }? & + element rpc_big_endian { STRING }? & + element samba_kcc_command { STRING }? & + element security { STRING }? & + element security_mask { STRING }? & + element server_max_protocol { STRING }? & + element server_min_protocol { STRING }? & + element server_role { STRING }? & + element server_schannel { STRING }? & + element server_services { STRING }? & + element server_signing { STRING }? & + element server_string { STRING }? & + element set_primary_group_script { STRING }? & + element set_quota_command { STRING }? & + element share_backend { STRING }? & + element short_preserve_case { STRING }? & + element show_add_printer_wizard { STRING }? & + element shutdown_script { STRING }? & + element smb2_max_credits { STRING }? & + element smb2_max_read { STRING }? & + element smb2_max_trans { STRING }? & + element smb2_max_write { STRING }? & + element smb_encrypt { STRING }? & + element smb_passwd_file { STRING }? & + element smb_ports { STRING }? & + element socket_options { STRING }? & + element spn_update_command { STRING }? & + element stat_cache { STRING }? & + element state_directory { STRING }? & + element store_dos_attributes { STRING }? & + element strict_allocate { STRING }? & + element strict_locking { STRING }? & + element strict_sync { STRING }? & + element svcctl_list { STRING }? & + element sync_always { STRING }? & + element syslog { STRING }? & + element syslog_only { STRING }? & + element template_homedir { STRING }? & + element template_shell { STRING }? & + element time_server { STRING }? & + element tls_cafile { STRING }? & + element tls_certfile { STRING }? & + element tls_crlfile { STRING }? & + element tls_dh_params_file { STRING }? & + element tls_enabled { STRING }? & + element tls_keyfile { STRING }? & + element unicode { STRING }? & + element unix_charset { STRING }? & + element unix_extensions { STRING }? & + element unix_password_sync { STRING }? & + element use_client_driver { STRING }? & + element use_mmap { STRING }? & + element use_ntdb { STRING }? & + element use_sendfile { STRING }? & + element use_spnego { STRING }? & + element username { STRING }? & + element username_level { STRING }? & + element username_map { STRING }? & + element username_map_cache_time { STRING }? & + element username_map_script { STRING }? & + element usershare_allow_guests { STRING }? & + element usershare_max_shares { STRING }? & + element usershare_owner_only { STRING }? & + element usershare_path { STRING }? & + element usershare_prefix_allow_list { STRING }? & + element usershare_prefix_deny_list { STRING }? & + element usershare_template_share { STRING }? & + element utmp { STRING }? & + element utmp_directory { STRING }? & + element valid_users { STRING }? & + element veto_files { STRING }? & + element veto_oplock_files { STRING }? & + element vfs_objects { STRING }? & + element volume { STRING }? & + element web_port { STRING }? & + element wide_links { STRING }? & + element winbind_cache_time { STRING }? & + element winbind_enum_groups { STRING }? & + element winbind_enum_users { STRING }? & + element winbind_expand_groups { STRING }? & + element winbind_max_clients { STRING }? & + element winbind_max_domain_connections { STRING }? & + element winbind_nested_groups { STRING }? & + element winbind_normalize_names { STRING }? & + element winbind_nss_info { STRING }? & + element winbind_offline_logon { STRING }? & + element winbind_reconnect_delay { STRING }? & + element winbind_refresh_tickets { STRING }? & + element winbind_request_timeout { STRING }? & + element winbind_rpc_only { STRING }? & + element winbind_sealed_pipes { STRING }? & + element winbind_separator { STRING }? & + element winbind_trusted_domains_only { STRING }? & + element winbind_use_default_domain { STRING }? & + element winbindd_privileged_socket_directory { STRING }? & + element winbindd_socket_directory { STRING }? & + element wins_hook { STRING }? & + element wins_proxy { STRING }? & + element wins_server { STRING }? & + element wins_support { STRING }? & + element workgroup { STRING }? & + element write_cache_size { STRING }? & + element write_list { STRING }? & + element write_raw { STRING }? & + element writeable { STRING }? & + element wtmp_directory { STRING }? + ) + }? + ) + }* + }? & + samba-client? & + role? & + element service { STRING }? & + shares? & + element trustdom { + MAP, + element fixme { STRING }* + }? & + trusteddomains? & + version? + ) } -role = element role { text } -version = element version { text } +role = element role { STRING } +version = element version { STRING } shares = element shares { LIST, @@ -461,13 +473,14 @@ trusteddomains = element trusteddomains { trusteddomain* } -trusteddomain = element trusteddomain { trusteddomain_domain, trusteddomain_password } -trusteddomain_domain = element domain { text } -trusteddomain_password = element password { text } +trusteddomain = element trusteddomain { MAP, trusteddomain_domain, trusteddomain_password } +trusteddomain_domain = element domain { STRING } +trusteddomain_password = element password { STRING } y2_share = samba_options | share samba_options = element options { - element option { samba_option_key, samba_option_val? }* + MAP, + element option { MAP, samba_option_key, samba_option_val? }* } -share = element share { (text | y2_share)* } -samba_option_key = element key { text } -samba_option_val = element value { text } +share = element share { (STRING | y2_share)* } +samba_option_key = element key { STRING } +samba_option_val = element value { STRING } From 57e015f12716531f043c4afe2a036ea87272076a Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 12 May 2020 17:12:39 +0200 Subject: [PATCH 2/3] changes --- package/yast2-samba-server.changes | 7 +++++++ package/yast2-samba-server.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/yast2-samba-server.changes b/package/yast2-samba-server.changes index fdef0e5..b56b173 100644 --- a/package/yast2-samba-server.changes +++ b/package/yast2-samba-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 12 15:09:50 UTC 2020 - josef Reidinger + +- Autoyast schema: Allow optional types for string and map objects + (bsc#1170886) +- 4.3.0 + ------------------------------------------------------------------- Wed Mar 11 10:00:37 UTC 2020 - Knut Anderssen diff --git a/package/yast2-samba-server.spec b/package/yast2-samba-server.spec index f1a7944..9d57dab 100644 --- a/package/yast2-samba-server.spec +++ b/package/yast2-samba-server.spec @@ -17,7 +17,7 @@ Name: yast2-samba-server -Version: 4.2.4 +Version: 4.3.0 Release: 0 Url: https://github.com/yast/yast-samba-server Summary: YaST2 - Samba Server Configuration From 8d0d592c440b5fe767a7de3ccd0aacbbf4300c3c Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 12 May 2020 17:17:41 +0200 Subject: [PATCH 3/3] fix travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ac16e7e..44a3d78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,4 @@ before_install: script: # the "yast-travis-ruby" script is included in the base yastdevel/ruby image # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby - - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-samba-server-image yast-travis-ruby + - docker run -it --privileged -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-samba-server-image yast-travis-ruby