FN_LOCAL_STRING(queueresumecommand, queueresumecommand)
FN_LOCAL_STRING(_printername, _printername)
FN_LOCAL_CONST_STRING(printjob_username, printjob_username)
-FN_LOCAL_STRING(magicscript, magicscript)
-FN_LOCAL_STRING(magicoutput, magicoutput)
+FN_LOCAL_STRING(magic_script, magic_script)
+FN_LOCAL_STRING(magic_output, magic_output)
FN_LOCAL_STRING(comment, comment)
FN_LOCAL_STRING(force_user, force_user)
FN_LOCAL_STRING(force_group, force_group)
FN_LOCAL_BOOL(kernel_share_modes, kernel_share_modes)
FN_LOCAL_BOOL(onlyuser, onlyuser)
FN_LOCAL_PARM_BOOL(mangled_names, mangled_names)
-FN_LOCAL_BOOL(symlinks, symlinks)
+FN_LOCAL_BOOL(follow_symlinks, follow_symlinks)
FN_LOCAL_BOOL(syncalways, syncalways)
FN_LOCAL_BOOL(strict_allocate, strict_allocate)
FN_LOCAL_BOOL(delete_readonly, delete_readonly)
FN_LOCAL_BOOL(dos_filemode, dos_filemode)
FN_LOCAL_BOOL(dos_filetimes, dos_filetimes)
FN_LOCAL_BOOL(dos_filetime_resolution, dos_filetime_resolution)
-FN_LOCAL_BOOL(fake_dir_create_times, fake_dir_create_times)
+FN_LOCAL_BOOL(fake_directory_create_times, fake_directory_create_times)
FN_LOCAL_BOOL(blocking_locks, blocking_locks)
FN_LOCAL_BOOL(inherit_perms, inherit_perms)
FN_LOCAL_BOOL(inherit_acls, inherit_acls)
FN_LOCAL_PARM_BOOL(kernel_change_notify, kernel_change_notify)
FN_LOCAL_BOOL(durable_handles, durable_handles)
-FN_GLOBAL_BOOL(allow_insecure_widelinks, allow_insecure_widelinks)
+FN_GLOBAL_BOOL(allow_insecure_wide_links, allow_insecure_wide_links)
FN_GLOBAL_BOOL(allow_nt4_crypto, allow_nt4_crypto)
FN_GLOBAL_BOOL(allow_trusted_domains, allow_trusted_domains)
FN_GLOBAL_BOOL(async_smb_echo_handler, async_smb_echo_handler)
FN_GLOBAL_STRING(add_machine_script, add_machine_script)
FN_GLOBAL_STRING(addport_cmd, addport_cmd)
FN_GLOBAL_STRING(addprinter_cmd, addprinter_cmd)
-FN_GLOBAL_STRING(add_share_cmd, add_share_cmd)
-FN_GLOBAL_STRING(adduser_script, adduser_script)
-FN_GLOBAL_STRING(addusertogroup_script, addusertogroup_script)
+FN_GLOBAL_STRING(add_share_command, add_share_command)
+FN_GLOBAL_STRING(add_user_script, add_user_script)
+FN_GLOBAL_STRING(add_user_to_group_script, add_user_to_group_script)
FN_GLOBAL_STRING(auto_services, auto_services)
-FN_GLOBAL_STRING(change_share_cmd, change_share_cmd)
+FN_GLOBAL_STRING(change_share_command, change_share_command)
FN_GLOBAL_STRING(check_password_script, check_password_script)
FN_GLOBAL_STRING(cups_server, cups_server)
FN_GLOBAL_STRING(defaultservice, defaultservice)
FN_GLOBAL_STRING(deleteprinter_cmd, deleteprinter_cmd)
-FN_GLOBAL_STRING(delete_share_cmd, delete_share_cmd)
-FN_GLOBAL_STRING(delgroup_script, delgroup_script)
-FN_GLOBAL_STRING(deluserfromgroup_script, deluserfromgroup_script)
-FN_GLOBAL_STRING(deluser_script, deluser_script)
+FN_GLOBAL_STRING(delete_share_command, delete_share_command)
+FN_GLOBAL_STRING(delete_group_script, delete_group_script)
+FN_GLOBAL_STRING(delete_user_from_group_script, delete_user_from_group_script)
+FN_GLOBAL_STRING(delete_user_script, delete_user_script)
FN_GLOBAL_STRING(enumports_cmd, enumports_cmd)
FN_GLOBAL_STRING(get_quota_command, get_quota_command)
FN_GLOBAL_STRING(iprint_server, iprint_server)
FN_GLOBAL_STRING(logfile, logfile)
FN_GLOBAL_STRING(log_nt_token_command, log_nt_token_command)
FN_GLOBAL_STRING(mangling_method, mangling_method)
-FN_GLOBAL_STRING(msg_command, msg_command)
-FN_GLOBAL_STRING(nis_home_map_name, nis_home_map_name)
+FN_GLOBAL_STRING(message_command, message_command)
+FN_GLOBAL_STRING(homedir_map, homedir_map)
FN_GLOBAL_STRING(os2_driver_map, os2_driver_map)
FN_GLOBAL_STRING(panic_action, panic_action)
FN_GLOBAL_STRING(passwd_chat, passwd_chat)
FN_GLOBAL_STRING(renameuser_script, renameuser_script)
FN_GLOBAL_STRING(rootdir, rootdir)
FN_GLOBAL_STRING(server_string, server_string)
-FN_GLOBAL_STRING(setprimarygroup_script, setprimarygroup_script)
+FN_GLOBAL_STRING(set_primary_group_script, set_primary_group_script)
FN_GLOBAL_STRING(set_quota_command, set_quota_command)
FN_GLOBAL_STRING(share_backend, share_backend)
FN_GLOBAL_STRING(shutdown_script, shutdown_script)