[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Fri Feb 7 19:32:04 MST 2014


The branch, master has been updated
       via  a397967 param: rename lp function and variable from "nis_home_map" to "nis_homedir"
       via  61d4af5 param: rename lp function and variable from "syncalways" to "sync_always"
       via  52b1b16 param: rename lp function and variable from "minprintspace" to "min_print_space"
       via  fe9974c param: rename lp function and variable from "maxdisksize" to "max_disk_size"
       via  e3052c5 param: rename lp function and variable from "writelist" to "write_list"
       via  7cdcf13 param: rename lp function and variable from "usernamelevel" to "username_level"
       via  73bac10 param: rename lp function and variable from "rootdir" to "root_directory"
       via  ad4048b param: rename lp function and variable from "renameuser_script" to "rename_user_script"
       via  8256cb5 param: rename lp function and variable from "readlist" to "read_list"
       via  c81c75d param: rename lp function and variable from "onlyuser" to "only_user"
       via  51f8a24 param: rename lp function and variable from "inherit_perms" to "inherit_permissions"
       via  63598ff param: rename lp function and variable from "encrypted_passwords" to "encrypt_passwords"
       via  fc111c7 param: rename lp function and variable from "srv_minprotocol" to "server_min_protocol"
       via  64dc4b5 param: rename lp function and variable from "srv_maxprotocol" to "server_max_protocol"
       via  57d4074 param: rename lp function and variable from "maxmux" to "max_mux"
       via  5be5acb param: rename lp function and variable from "cli_minprotocol" to "client_min_protocol"
       via  f548585 param: rename lp function and variable from "cli_maxprotocol" to "client_max_protocol"
       via  4e4dbc9 param: rename lp function and variable from "ms_add_printer_wizard" to "show_add_printer_wizard"
       via  798678e param: rename lp function and variable from "queueresumecommand" to "queueresume_command"
       via  609e7be param: rename lp function and variable from "queuepausecommand" to "queuepause_command"
       via  77d0491 param: rename lp function and variable from "printcommand" to "print_command"
       via  cf6f358 param: rename lp function and variable from "max_reported_jobs" to "max_reported_print_jobs"
       via  db52b90 param: rename lp function and variable from "lprmcommand" to "lprm_command"
       via  bbcd004 param: rename lp function and variable from "lpresumecommand" to "lpresume_command"
       via  b8eeddd param: rename lp function and variable from "lpqcommand" to "lpq_command"
       via  3fda1fa param: rename lp function and variable from "lpqcachetime" to "lpq_cache_time"
       via  d3460a7 param: rename lp function and variable from "lppausecommand" to "lppause_command"
       via  cd17020 param: rename lp function and variable from "enumports_cmd" to "enumports_command"
       via  df507a1 param: rename lp function and variable from "deleteprinter_cmd" to "deleteprinter_command"
       via  f8e7ea2 param: rename lp function and variable from "addprinter_cmd" to "addprinter_command"
       via  35dd3a7 param: rename lp function and variable from "addport_cmd" to "addport_command"
       via  8d503a4 param: rename lp function and variable from "rootpreexec" to "root_preexec"
       via  fc148e6 param: rename lp function and variable from "rootpostexec" to "root_postexec"
       via  8ec3e11 param: rename lp function and variable from "msg_command" to "message_command"
       via  e07f8ae param: rename lp function and variable from "magicscript" to "magic_script"
       via  d2b6e33 param: rename lp function and variable from "magicoutput" to "magic_output"
       via  1256555 param: rename lp function and variable from "nis_home_map_name" to "homedir_map"
       via  5f4159b param: rename lp function and variable from "symlinks" to "follow_symlinks"
       via  f4414d6 param: rename lp function and variable from "fake_dir_create_times" to "fake_directory_create_times"
       via  63e8b41 param: rename lp function and variable from "delete_share_cmd" to "delete_share_command"
       via  619ddaff param: rename lp function and variable from "change_share_cmd" to "change_share_command"
       via  4f592c0 param: rename lp function and variable from "allow_insecure_widelinks" to "allow_insecure_wide_links"
       via  317d287 param: rename lp function and variable from "add_share_cmd" to "add_share_command"
       via  b61019f param: rename lp function and variable from "setprimarygroup_script" to "set_primary_group_script"
       via  5abd5e0 param: rename lp function and variable from "deluser_script" to "delete_user_script"
       via  9e42b5d param: rename lp function and variable from "deluserfromgroup_script" to "delete_user_from_group_script"
       via  e4a482f param: rename lp function and variable from "delgroup_script" to "delete_group_script"
       via  ae64a8e param: rename lp function and variable from "addusertogroup_script" to "add_user_to_group_script"
       via  216d969 param: rename lp function and variable from "adduser_script" to "add_user_script"
       via  8feac80 param: rename lp function and variable from "addmachine_script" to "add_machine_script"
       via  d53a9a5 param: rename lp function and variable from "addgroup_script" to "add_group_script"
       via  bc455c3 param: rename lp function and variable from "veto_oplocks" to "veto_oplock_files"
       via  11f910b param: rename lp function and variable from "shortpreservecase" to "short_preserve_case"
       via  fb8c6f8 param: rename lp function and variable from "preservecase" to "preserve_case"
       via  debda15 param: rename lp function and variable from "hideunwriteable_files" to "hide_unwriteable_files"
       via  324a976 param: rename lp function and variable from "hideunreadable" to "hide_unreadable"
       via  a1bc448 param: rename lp function and variable from "recursive_veto_delete" to "delete_veto_files"
       via  2ca2ab3 param: rename lp function and variable from "serverstring" to "server_string"
       via  418fc85 param: rename lp function and variable from 'wtmpdir' to 'wtmp_directory'
       via  a702fca param: rename lp function and variable from 'umtpdir' to 'utmp_directory'
       via  ca20ddb param: rename lp function and variable from 'piddir' to 'pid_directory'
       via  8b8ebb4 param: rename lp function and variable from 'passwordserver' to 'password_server'
       via  63c2497 param: rename lp function and variable from 'lockdir' to 'lock_directory'
       via  e23c7ad param: rename lp function and variable from 'guestaccount' to 'guest_account'
       via  7c0f3ea param: rename lp function and variable from 'magicchar' to 'mangling_char'
       via  cfa64d2 param: rename lp function and variable from 'defaultcase' to 'default_case'
       via  617d9ac param: rename lp function and variable from 'manglednames' to 'mangled_names'
       via  e02e9a3 param: rename lp function and variable from 'casesensitive' to 'case_sensitive'
       via  60d46ff param: rename lp function and variable from 'dontdescend' to 'dont_descend'
       via  904a235 param: rename lp function and variable from 'force_dir_mode' to 'force_directory_mode'
      from  17adbbc s3: modules: streaminfo: As we have no VFS function SMB_VFS_LLISTXATTR we can't cope with a symlink when lp_posix_pathnames() is true.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a3979677a825765b70e55720cf19a40e0a3b33af
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:04 2014 +1300

    param: rename lp function and variable from "nis_home_map" to "nis_homedir"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Sat Feb  8 03:31:34 CET 2014 on sn-devel-104

commit 61d4af550a94af7ced5e149f4166941edf80cfd8
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:12 2014 +1300

    param: rename lp function and variable from "syncalways" to "sync_always"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 52b1b168b3f29a49c544ae207065fd192aefe864
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:12 2014 +1300

    param: rename lp function and variable from "minprintspace" to "min_print_space"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit fe9974ca45ec6d9a43d70cea3bd28243e43f785e
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:12 2014 +1300

    param: rename lp function and variable from "maxdisksize" to "max_disk_size"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit e3052c5bd94de2ae282c124685f17f5632e14b29
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:11 2014 +1300

    param: rename lp function and variable from "writelist" to "write_list"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 7cdcf131e8da6d750d103ded2fee009fe84d07fb
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:11 2014 +1300

    param: rename lp function and variable from "usernamelevel" to "username_level"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 73bac10cae03494bc046e1cd3b7cb9ce82121480
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:11 2014 +1300

    param: rename lp function and variable from "rootdir" to "root_directory"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit ad4048bb0a4dcf87c4e15f22539acebfc61b2e06
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:11 2014 +1300

    param: rename lp function and variable from "renameuser_script" to "rename_user_script"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 8256cb5a37f15ce22dcfee19806a3323a4b9c34c
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:10 2014 +1300

    param: rename lp function and variable from "readlist" to "read_list"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit c81c75d263ffe75556cefa2938d6ebc94fae1b67
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:10 2014 +1300

    param: rename lp function and variable from "onlyuser" to "only_user"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 51f8a24d26e0e9358b8a87fdeecfebc80229de38
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:10 2014 +1300

    param: rename lp function and variable from "inherit_perms" to "inherit_permissions"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 63598ff628b874e3d4778939ac6f2b70292c9360
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:10 2014 +1300

    param: rename lp function and variable from "encrypted_passwords" to "encrypt_passwords"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit fc111c7875e35c846dbe52f7d3dbce75cfc74336
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:09 2014 +1300

    param: rename lp function and variable from "srv_minprotocol" to "server_min_protocol"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 64dc4b59f880b190a347f33dbcb40e0d65a8e009
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:09 2014 +1300

    param: rename lp function and variable from "srv_maxprotocol" to "server_max_protocol"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 57d407430fedcaed643f4f2feed72512fca664c2
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:09 2014 +1300

    param: rename lp function and variable from "maxmux" to "max_mux"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 5be5acb736e35a177452bfd9a7dd008c834f52dc
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:08 2014 +1300

    param: rename lp function and variable from "cli_minprotocol" to "client_min_protocol"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit f54858505102f4c1b9321edf264752307097d98d
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:08 2014 +1300

    param: rename lp function and variable from "cli_maxprotocol" to "client_max_protocol"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 4e4dbc9aeaf9f76dceeff45ad585627744ef3159
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:08 2014 +1300

    param: rename lp function and variable from "ms_add_printer_wizard" to "show_add_printer_wizard"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 798678ecfc8929174c30a97588027b678bbc85f1
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:08 2014 +1300

    param: rename lp function and variable from "queueresumecommand" to "queueresume_command"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 609e7bea49edf9ac6053d99b01c8c15be4be2329
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:07 2014 +1300

    param: rename lp function and variable from "queuepausecommand" to "queuepause_command"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 77d04917f79fa64733a3af17efce40926107d4e6
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:07 2014 +1300

    param: rename lp function and variable from "printcommand" to "print_command"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit cf6f3585634b2ad65917056eb739ed59e506e823
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:07 2014 +1300

    param: rename lp function and variable from "max_reported_jobs" to "max_reported_print_jobs"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit db52b908c7aed5ae8cd2463010a3e2940c6ee4e9
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:07 2014 +1300

    param: rename lp function and variable from "lprmcommand" to "lprm_command"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit bbcd0042188757cd17fa69a459b582f42e2b3b4c
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:06 2014 +1300

    param: rename lp function and variable from "lpresumecommand" to "lpresume_command"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit b8eedddc2faa19dce649dd220c42f5aa65fbbc92
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:06 2014 +1300

    param: rename lp function and variable from "lpqcommand" to "lpq_command"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 3fda1fa96f6d8a36bad2d18b4c4e7fc4a679466f
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:06 2014 +1300

    param: rename lp function and variable from "lpqcachetime" to "lpq_cache_time"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit d3460a798a03872bf3d30391799162c1c4358e9d
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:06 2014 +1300

    param: rename lp function and variable from "lppausecommand" to "lppause_command"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit cd17020e66204a674dd32639930498e172b342e5
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:06 2014 +1300

    param: rename lp function and variable from "enumports_cmd" to "enumports_command"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit df507a1a13503c0237eea8084748193ae6ba089e
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:05 2014 +1300

    param: rename lp function and variable from "deleteprinter_cmd" to "deleteprinter_command"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit f8e7ea278d077e6c699258b63dcaf0bf4adb1c8c
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:05 2014 +1300

    param: rename lp function and variable from "addprinter_cmd" to "addprinter_command"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 35dd3a749984da550ff5081b0ca01394474b444f
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:05 2014 +1300

    param: rename lp function and variable from "addport_cmd" to "addport_command"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 8d503a4eedc2d395fc3053fb3aea20ed5df901e8
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:04 2014 +1300

    param: rename lp function and variable from "rootpreexec" to "root_preexec"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit fc148e61f143ceeae63c0ad1a52d68548ad07aab
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:04 2014 +1300

    param: rename lp function and variable from "rootpostexec" to "root_postexec"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 8ec3e110047034c0eb495c3d3bde1f1ef6ee7b18
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:04 2014 +1300

    param: rename lp function and variable from "msg_command" to "message_command"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit e07f8aeeac5f8b0be7d28159793b237e9f3547df
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:03 2014 +1300

    param: rename lp function and variable from "magicscript" to "magic_script"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit d2b6e331c644f3bc4a5b7adb5c3c30aad3b017a8
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:03 2014 +1300

    param: rename lp function and variable from "magicoutput" to "magic_output"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 1256555b76d9302a08dd47eaa1118172395171d7
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:03 2014 +1300

    param: rename lp function and variable from "nis_home_map_name" to "homedir_map"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 5f4159b25bcddc06babbd9b3aa6c3ff86770a610
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:03 2014 +1300

    param: rename lp function and variable from "symlinks" to "follow_symlinks"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit f4414d63cdd4d276f66433c6868c9efe8567f28c
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:02 2014 +1300

    param: rename lp function and variable from "fake_dir_create_times" to "fake_directory_create_times"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 63e8b414c2db61a7ae5620e712fa6fd0047a69f2
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:02 2014 +1300

    param: rename lp function and variable from "delete_share_cmd" to "delete_share_command"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 619ddaff05e31344d8962386343fb0855dacc6b7
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:02 2014 +1300

    param: rename lp function and variable from "change_share_cmd" to "change_share_command"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 4f592c07922c328659d3227fc79e2e8d03eca197
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:02 2014 +1300

    param: rename lp function and variable from "allow_insecure_widelinks" to "allow_insecure_wide_links"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 317d287be8a0c9e0ce390eeb8bbfc9b2dcc124c0
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:02 2014 +1300

    param: rename lp function and variable from "add_share_cmd" to "add_share_command"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit b61019f37900823f213daefbfaa31262868c10fd
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:01 2014 +1300

    param: rename lp function and variable from "setprimarygroup_script" to "set_primary_group_script"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 5abd5e0a30299b1c1baaf7fe06f72ac62ce831db
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:01 2014 +1300

    param: rename lp function and variable from "deluser_script" to "delete_user_script"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 9e42b5d3d84c11b1501141671062ee48ddcb0a62
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:01 2014 +1300

    param: rename lp function and variable from "deluserfromgroup_script" to "delete_user_from_group_script"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit e4a482f9b6628515a7c666fea7c1c525c481a6ed
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:01 2014 +1300

    param: rename lp function and variable from "delgroup_script" to "delete_group_script"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit ae64a8ecd977d894e6ada253289d6369eec2f905
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:00 2014 +1300

    param: rename lp function and variable from "addusertogroup_script" to "add_user_to_group_script"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 216d9691803ce58da97458466fd0d2f964c26b83
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:00 2014 +1300

    param: rename lp function and variable from "adduser_script" to "add_user_script"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 8feac8039535dc9b68cd04fcf5a30f9a8e2ba7a6
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:00 2014 +1300

    param: rename lp function and variable from "addmachine_script" to "add_machine_script"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit d53a9a529cafcf2c78c2ddb79b41949c4d9b382d
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:09:00 2014 +1300

    param: rename lp function and variable from "addgroup_script" to "add_group_script"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit bc455c34daffebd4714fa42d3e67b0d82c1224f8
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:08:59 2014 +1300

    param: rename lp function and variable from "veto_oplocks" to "veto_oplock_files"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 11f910be61a956c4f4de591875663c0077305b7d
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:08:59 2014 +1300

    param: rename lp function and variable from "shortpreservecase" to "short_preserve_case"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit fb8c6f8ef4650ac597ee09dcee5a7ef5e37fbae2
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:08:59 2014 +1300

    param: rename lp function and variable from "preservecase" to "preserve_case"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit debda157853b32c924efd298fb43de502522a1c5
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:08:59 2014 +1300

    param: rename lp function and variable from "hideunwriteable_files" to "hide_unwriteable_files"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 324a976653e1ac37edb2bc07557b52adbd552d14
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:08:58 2014 +1300

    param: rename lp function and variable from "hideunreadable" to "hide_unreadable"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit a1bc448707f6ae308692cce23a2e55ffff33a23d
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:08:58 2014 +1300

    param: rename lp function and variable from "recursive_veto_delete" to "delete_veto_files"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 2ca2ab3550469d5e156635f5218db3b25144dab3
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Tue Feb 4 15:08:58 2014 +1300

    param: rename lp function and variable from "serverstring" to "server_string"
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 418fc85819292b7694e4f90f8244e92ffd793755
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Mon Feb 3 16:03:35 2014 +1300

    param: rename lp function and variable from 'wtmpdir' to 'wtmp_directory'
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit a702fca94bf868da3386749925452e66ce4d9bda
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Mon Feb 3 16:00:28 2014 +1300

    param: rename lp function and variable from 'umtpdir' to 'utmp_directory'
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit ca20ddbe910b5fbd29e1bd0f1ef39d4d3720ebaa
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Mon Feb 3 15:57:21 2014 +1300

    param: rename lp function and variable from 'piddir' to 'pid_directory'
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 8b8ebb47981a8242679697b229c692c2ee022d1c
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Mon Feb 3 15:52:14 2014 +1300

    param: rename lp function and variable from 'passwordserver' to 'password_server'
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 63c24977ba06dba46d7080400775f8937ecee108
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Mon Feb 3 15:46:08 2014 +1300

    param: rename lp function and variable from 'lockdir' to 'lock_directory'
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit e23c7adb1a5f23aa3b688e76888c778e12368320
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Mon Feb 3 15:22:13 2014 +1300

    param: rename lp function and variable from 'guestaccount' to 'guest_account'
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 7c0f3ea1304293fd1505706e597eebb640d224e3
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Mon Feb 3 15:16:06 2014 +1300

    param: rename lp function and variable from 'magicchar' to 'mangling_char'
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit cfa64d20df05ebe99d3a4bc016e68a770b70d4ad
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Mon Feb 3 15:12:09 2014 +1300

    param: rename lp function and variable from 'defaultcase' to 'default_case'
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 617d9acf70a2e2e8556accc6e6961add10b50c67
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Mon Feb 3 15:06:25 2014 +1300

    param: rename lp function and variable from 'manglednames' to 'mangled_names'
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit e02e9a3d6c9c459b2bf7beac1d4a6d77b1066af2
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Mon Feb 3 15:01:01 2014 +1300

    param: rename lp function and variable from 'casesensitive' to 'case_sensitive'
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 60d46fff751be559e5c9a11f2070e8d3f35ec6b3
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Mon Feb 3 14:56:12 2014 +1300

    param: rename lp function and variable from 'dontdescend' to 'dont_descend'
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 904a2358327f7bf57b60a179b4d927bd16c162f5
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Mon Feb 3 14:48:28 2014 +1300

    param: rename lp function and variable from 'force_dir_mode' to 'force_directory_mode'
    
    Signed-off-by: Garming Sam <garming at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 lib/param/loadparm.c                        |    2 +-
 lib/param/param_functions.c                 |  142 ++++++++++----------
 lib/param/param_table.c                     |  156 +++++++++++-----------
 lib/param/util.c                            |    2 +-
 nsswitch/winbind_struct_protocol.h          |    2 +-
 source3/auth/auth.c                         |    2 +-
 source3/auth/auth_util.c                    |    6 +-
 source3/auth/token_util.c                   |    2 +-
 source3/auth/user_krb5.c                    |    2 +-
 source3/client/client.c                     |    2 +-
 source3/groupdb/mapping.c                   |   20 ++--
 source3/lib/netapi/cm.c                     |    2 +-
 source3/lib/netapi/serverinfo.c             |    4 +-
 source3/lib/substitute.c                    |    4 +-
 source3/lib/username.c                      |    6 +-
 source3/lib/util.c                          |    6 +-
 source3/libnet/libnet_dssync_passdb.c       |    4 +-
 source3/libnet/libnet_samsync_passdb.c      |    4 +-
 source3/libsmb/cliconnect.c                 |    4 +-
 source3/libsmb/clidfs.c                     |    2 +-
 source3/libsmb/clidgram.c                   |    2 +-
 source3/libsmb/libsmb_server.c              |    4 +-
 source3/libsmb/namequery.c                  |    2 +-
 source3/modules/vfs_default.c               |    8 +-
 source3/modules/vfs_gpfs.c                  |    2 +-
 source3/modules/vfs_media_harmony.c         |    2 +-
 source3/nmbd/nmbd.c                         |   12 +-
 source3/nmbd/nmbd_sendannounce.c            |    2 +-
 source3/nmbd/nmbd_serverlistdb.c            |    2 +-
 source3/nmbd/nmbd_synclists.c               |    2 +-
 source3/nmbd/nmbd_workgroupdb.c             |    2 +-
 source3/param/loadparm.c                    |  188 +++++++++++++-------------
 source3/passdb/passdb.c                     |    2 +-
 source3/passdb/pdb_interface.c              |    8 +-
 source3/passdb/pdb_ldap.c                   |    2 +-
 source3/passdb/pdb_smbpasswd.c              |   10 +-
 source3/passdb/pdb_tdb.c                    |    2 +-
 source3/printing/print_generic.c            |   10 +-
 source3/printing/printing.c                 |   20 ++--
 source3/rpc_server/samr/srv_samr_nt.c       |    4 +-
 source3/rpc_server/spoolss/srv_spoolss_nt.c |   14 +-
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c   |   20 ++--
 source3/rpc_server/wkssvc/srv_wkssvc_nt.c   |    2 +-
 source3/smbd/aio.c                          |    4 +-
 source3/smbd/close.c                        |   10 +-
 source3/smbd/dfree.c                        |    2 +-
 source3/smbd/dir.c                          |    4 +-
 source3/smbd/dosmode.c                      |    4 +-
 source3/smbd/fileio.c                       |    2 +-
 source3/smbd/filename.c                     |    6 +-
 source3/smbd/mangle.c                       |    6 +-
 source3/smbd/mangle_hash.c                  |    6 +-
 source3/smbd/message.c                      |   12 +-
 source3/smbd/negprot.c                      |   16 +-
 source3/smbd/open.c                         |    6 +-
 source3/smbd/oplock_irix.c                  |    2 +-
 source3/smbd/process.c                      |   14 +-
 source3/smbd/reply.c                        |    4 +-
 source3/smbd/server.c                       |   10 +-
 source3/smbd/server_exit.c                  |    2 +-
 source3/smbd/service.c                      |   22 ++--
 source3/smbd/share_access.c                 |   10 +-
 source3/smbd/smb2_find.c                    |    4 +-
 source3/smbd/smb2_negprot.c                 |   22 ++--
 source3/smbd/smb2_tcon.c                    |    4 +-
 source3/smbd/trans2.c                       |   16 +-
 source3/smbd/uid.c                          |    2 +-
 source3/smbd/utmp.c                         |    4 +-
 source3/smbd/vfs.c                          |    2 +-
 source3/torture/masktest.c                  |    2 +-
 source3/utils/net_sam.c                     |   10 +-
 source3/utils/smbcontrol.c                  |    2 +-
 source3/utils/testparm.c                    |   20 ++--
 source3/winbindd/winbindd.c                 |   12 +-
 source3/winbindd/winbindd_cm.c              |    4 +-
 source4/librpc/rpc/dcerpc_connect.c         |    2 +-
 source4/param/loadparm.c                    |    4 +-
 source4/param/share_classic.c               |    4 +-
 source4/rpc_server/dcerpc_server.c          |    2 +-
 source4/rpc_server/srvsvc/dcesrv_srvsvc.c   |    4 +-
 source4/smb_server/smb/negprot.c            |   16 +-
 source4/smb_server/smb_server.c             |    2 +-
 source4/smbd/server.c                       |    6 +-
 83 files changed, 491 insertions(+), 491 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index df9a324..f22bb55 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2015,7 +2015,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
 	lp_ctx->sDefault->create_mask = 0744;
 	lp_ctx->sDefault->force_create_mode = 0000;
 	lp_ctx->sDefault->directory_mask = 0755;
-	lp_ctx->sDefault->force_dir_mode = 0000;
+	lp_ctx->sDefault->force_directory_mode = 0000;
 
 	DEBUG(3, ("Initialising global parameters\n"));
 
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index b81ad61..159a7a6 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -46,50 +46,50 @@ FN_LOCAL_INTEGER(csc_policy, csc_policy)
 FN_LOCAL_INTEGER(create_mask, create_mask)
 FN_LOCAL_INTEGER(force_create_mode, force_create_mode)
 FN_LOCAL_INTEGER(directory_mask, directory_mask)
-FN_LOCAL_INTEGER(force_dir_mode, force_dir_mode)
+FN_LOCAL_INTEGER(force_directory_mode, force_directory_mode)
 FN_LOCAL_STRING(preexec, preexec)
 FN_LOCAL_STRING(postexec, postexec)
-FN_LOCAL_STRING(rootpreexec, rootpreexec)
-FN_LOCAL_STRING(rootpostexec, rootpostexec)
-FN_LOCAL_STRING(dontdescend, dontdescend)
+FN_LOCAL_STRING(root_preexec, root_preexec)
+FN_LOCAL_STRING(root_postexec, root_postexec)
+FN_LOCAL_STRING(dont_descend, dont_descend)
 FN_LOCAL_STRING(username, username)
 FN_LOCAL_LIST(invalid_users, invalid_users)
 FN_LOCAL_LIST(valid_users, valid_users)
 FN_LOCAL_LIST(admin_users, admin_users)
-FN_LOCAL_STRING(printcommand, printcommand)
-FN_LOCAL_STRING(lpqcommand, lpqcommand)
-FN_LOCAL_STRING(lprmcommand, lprmcommand)
-FN_LOCAL_STRING(lppausecommand, lppausecommand)
-FN_LOCAL_STRING(lpresumecommand, lpresumecommand)
-FN_LOCAL_STRING(queuepausecommand, queuepausecommand)
-FN_LOCAL_STRING(queueresumecommand, queueresumecommand)
+FN_LOCAL_STRING(print_command, print_command)
+FN_LOCAL_STRING(lpq_command, lpq_command)
+FN_LOCAL_STRING(lprm_command, lprm_command)
+FN_LOCAL_STRING(lppause_command, lppause_command)
+FN_LOCAL_STRING(lpresume_command, lpresume_command)
+FN_LOCAL_STRING(queuepause_command, queuepause_command)
+FN_LOCAL_STRING(queueresume_command, queueresume_command)
 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_LIST(readlist, readlist)
-FN_LOCAL_LIST(writelist, writelist)
+FN_LOCAL_LIST(read_list, read_list)
+FN_LOCAL_LIST(write_list, write_list)
 FN_LOCAL_LIST(vfs_objects, vfs_objects)
 FN_LOCAL_STRING(msdfs_proxy, msdfs_proxy)
 FN_LOCAL_STRING(volume, volume)
 FN_LOCAL_STRING(veto_files, veto_files)
 FN_LOCAL_STRING(hide_files, hide_files)
-FN_LOCAL_STRING(veto_oplocks, veto_oplocks)
+FN_LOCAL_STRING(veto_oplock_files, veto_oplock_files)
 FN_LOCAL_STRING(aio_write_behind, aio_write_behind)
 FN_LOCAL_STRING(dfree_command, dfree_command)
 FN_LOCAL_BOOL(autoloaded, autoloaded)
 FN_LOCAL_BOOL(preexec_close, preexec_close)
-FN_LOCAL_BOOL(rootpreexec_close, rootpreexec_close)
-FN_LOCAL_INTEGER(casesensitive, casesensitive)
-FN_LOCAL_BOOL(preservecase, preservecase)
-FN_LOCAL_BOOL(shortpreservecase, shortpreservecase)
+FN_LOCAL_BOOL(root_preexec_close, root_preexec_close)
+FN_LOCAL_INTEGER(case_sensitive, case_sensitive)
+FN_LOCAL_BOOL(preserve_case, preserve_case)
+FN_LOCAL_BOOL(short_preserve_case, short_preserve_case)
 FN_LOCAL_BOOL(hide_dot_files, hide_dot_files)
 FN_LOCAL_BOOL(hide_special_files, hide_special_files)
-FN_LOCAL_BOOL(hideunreadable, hideunreadable)
-FN_LOCAL_BOOL(hideunwriteable_files, hideunwriteable_files)
+FN_LOCAL_BOOL(hide_unreadable, hide_unreadable)
+FN_LOCAL_BOOL(hide_unwriteable_files, hide_unwriteable_files)
 FN_LOCAL_BOOL(access_based_share_enum, access_based_share_enum)
 FN_LOCAL_BOOL(guest_ok, guest_ok)
 FN_LOCAL_BOOL(guest_only, guest_only)
@@ -103,20 +103,20 @@ FN_LOCAL_PARM_BOOL(posix_locking, posix_locking)
 FN_LOCAL_BOOL(kernel_oplocks, kernel_oplocks)
 FN_LOCAL_BOOL(level2_oplocks, level2_oplocks)
 FN_LOCAL_BOOL(kernel_share_modes, kernel_share_modes)
-FN_LOCAL_BOOL(onlyuser, onlyuser)
-FN_LOCAL_PARM_BOOL(manglednames, manglednames)
-FN_LOCAL_BOOL(symlinks, symlinks)
-FN_LOCAL_BOOL(syncalways, syncalways)
+FN_LOCAL_BOOL(only_user, only_user)
+FN_LOCAL_PARM_BOOL(mangled_names, mangled_names)
+FN_LOCAL_BOOL(follow_symlinks, follow_symlinks)
+FN_LOCAL_BOOL(sync_always, sync_always)
 FN_LOCAL_BOOL(strict_allocate, strict_allocate)
 FN_LOCAL_BOOL(delete_readonly, delete_readonly)
 FN_LOCAL_BOOL(fake_oplocks, fake_oplocks)
-FN_LOCAL_BOOL(recursive_veto_delete, recursive_veto_delete)
+FN_LOCAL_BOOL(delete_veto_files, delete_veto_files)
 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_permissions, inherit_permissions)
 FN_LOCAL_BOOL(inherit_acls, inherit_acls)
 FN_LOCAL_BOOL(inherit_owner, inherit_owner)
 FN_LOCAL_BOOL(use_client_driver, use_client_driver)
@@ -133,10 +133,10 @@ FN_LOCAL_BOOL(acl_check_permissions, acl_check_permissions)
 FN_LOCAL_BOOL(acl_group_control, acl_group_control)
 FN_LOCAL_BOOL(acl_map_full_control, acl_map_full_control)
 FN_LOCAL_BOOL(acl_allow_execute_always, acl_allow_execute_always)
-FN_LOCAL_INTEGER(defaultcase, defaultcase)
-FN_LOCAL_INTEGER(minprintspace, minprintspace)
+FN_LOCAL_INTEGER(default_case, default_case)
+FN_LOCAL_INTEGER(min_print_space, min_print_space)
 FN_LOCAL_INTEGER(printing, printing)
-FN_LOCAL_INTEGER(max_reported_jobs, max_reported_jobs)
+FN_LOCAL_INTEGER(max_reported_print_jobs, max_reported_print_jobs)
 FN_LOCAL_INTEGER(oplock_contention_limit, oplock_contention_limit)
 FN_LOCAL_INTEGER(write_cache_size, write_cache_size)
 FN_LOCAL_INTEGER(block_size, block_size)
@@ -147,13 +147,13 @@ FN_LOCAL_INTEGER(aio_write_size, aio_write_size)
 FN_LOCAL_INTEGER(map_readonly, map_readonly)
 FN_LOCAL_INTEGER(directory_name_cache_size, directory_name_cache_size)
 FN_LOCAL_INTEGER(smb_encrypt, smb_encrypt)
-FN_LOCAL_PARM_CHAR(magicchar, magicchar)
+FN_LOCAL_PARM_CHAR(mangling_char, mangling_char)
 FN_LOCAL_STRING(cups_options, cups_options)
 FN_LOCAL_PARM_BOOL(change_notify, change_notify)
 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)
@@ -178,7 +178,7 @@ FN_GLOBAL_BOOL(_domain_logons, _domain_logons)
 FN_GLOBAL_BOOL(enable_asu_support, enable_asu_support)
 FN_GLOBAL_BOOL(enable_core_files, enable_core_files)
 FN_GLOBAL_BOOL(enable_privileges, enable_privileges)
-FN_GLOBAL_BOOL(encrypted_passwords, encrypted_passwords)
+FN_GLOBAL_BOOL(encrypt_passwords, encrypt_passwords)
 FN_GLOBAL_BOOL(enhanced_browsing, enhanced_browsing)
 FN_GLOBAL_BOOL(getwd_cache, getwd_cache)
 FN_GLOBAL_BOOL(host_msdfs, host_msdfs)
@@ -191,10 +191,10 @@ FN_GLOBAL_BOOL(load_printers, load_printers)
 FN_GLOBAL_BOOL(local_master, local_master)
 FN_GLOBAL_BOOL(log_writeable_files_on_exit, log_writeable_files_on_exit)
 FN_GLOBAL_BOOL(map_untrusted_to_domain, map_untrusted_to_domain)
-FN_GLOBAL_BOOL(ms_add_printer_wizard, ms_add_printer_wizard)
+FN_GLOBAL_BOOL(show_add_printer_wizard, show_add_printer_wizard)
 FN_GLOBAL_BOOL(multicast_dns_register, multicast_dns_register)
 FN_GLOBAL_BOOL(neutralize_nt4_emulation, neutralize_nt4_emulation)
-FN_GLOBAL_BOOL(nis_home_map, nis_home_map)
+FN_GLOBAL_BOOL(nis_homedir, nis_homedir)
 FN_GLOBAL_BOOL(nmbd_bind_explicit_broadcast, nmbd_bind_explicit_broadcast)
 FN_GLOBAL_BOOL(ntlm_auth, ntlm_auth)
 FN_GLOBAL_BOOL(nt_pipe_support, nt_pipe_support)
@@ -243,8 +243,8 @@ FN_GLOBAL_CONST_STRING(dedicated_keytab_file, dedicated_keytab_file)
 FN_GLOBAL_CONST_STRING(dnsdomain, dnsdomain)
 FN_GLOBAL_CONST_STRING(dns_forwarder, dns_forwarder)
 FN_GLOBAL_CONST_STRING(dos_charset, dos_charset)
-FN_GLOBAL_CONST_STRING(guestaccount, guestaccount)
-FN_GLOBAL_CONST_STRING(lockdir, lockdir)
+FN_GLOBAL_CONST_STRING(guest_account, guest_account)
+FN_GLOBAL_CONST_STRING(lock_directory, lock_directory)
 FN_GLOBAL_CONST_STRING(logon_drive, logon_drive)
 FN_GLOBAL_CONST_STRING(logon_home, logon_home)
 FN_GLOBAL_CONST_STRING(logon_path, logon_path)
@@ -255,8 +255,8 @@ FN_GLOBAL_CONST_STRING(netbios_name, netbios_name)
 FN_GLOBAL_CONST_STRING(netbios_scope, netbios_scope)
 FN_GLOBAL_CONST_STRING(ntp_signd_socket_directory, ntp_signd_socket_directory)
 FN_GLOBAL_CONST_STRING(passdb_backend, passdb_backend)
-FN_GLOBAL_CONST_STRING(passwordserver, passwordserver)
-FN_GLOBAL_CONST_STRING(piddir, piddir)
+FN_GLOBAL_CONST_STRING(password_server, password_server)
+FN_GLOBAL_CONST_STRING(pid_directory, pid_directory)
 FN_GLOBAL_CONST_STRING(private_dir, private_dir)
 FN_GLOBAL_CONST_STRING(realm, realm)
 FN_GLOBAL_CONST_STRING(smb_passwd_file, smb_passwd_file)
@@ -264,12 +264,12 @@ FN_GLOBAL_CONST_STRING(socket_options, socket_options)
 FN_GLOBAL_CONST_STRING(template_homedir, template_homedir)
 FN_GLOBAL_CONST_STRING(template_shell, template_shell)
 FN_GLOBAL_CONST_STRING(unix_charset, unix_charset)
-FN_GLOBAL_CONST_STRING(utmpdir, utmpdir)
+FN_GLOBAL_CONST_STRING(utmp_directory, utmp_directory)
 FN_GLOBAL_CONST_STRING(winbindd_privileged_socket_directory, winbindd_privileged_socket_directory)
 FN_GLOBAL_CONST_STRING(winbindd_socket_directory, winbindd_socket_directory)
 FN_GLOBAL_CONST_STRING(winbind_separator, winbind_separator)
 FN_GLOBAL_CONST_STRING(workgroup, workgroup)
-FN_GLOBAL_CONST_STRING(wtmpdir, wtmpdir)
+FN_GLOBAL_CONST_STRING(wtmp_directory, wtmp_directory)
 FN_GLOBAL_INTEGER(afs_token_lifetime, afs_token_lifetime)
 FN_GLOBAL_INTEGER(algorithmic_rid_base, algorithmic_rid_base)
 FN_GLOBAL_INTEGER(allow_dns_updates, allow_dns_updates)
@@ -277,8 +277,8 @@ FN_GLOBAL_INTEGER(cldap_port, cldap_port)
 FN_GLOBAL_INTEGER(client_ldap_sasl_wrapping, client_ldap_sasl_wrapping)
 FN_GLOBAL_INTEGER(client_schannel, client_schannel)
 FN_GLOBAL_INTEGER(client_signing, client_signing)
-FN_GLOBAL_INTEGER(cli_maxprotocol, cli_maxprotocol)
-FN_GLOBAL_INTEGER(cli_minprotocol, cli_minprotocol)
+FN_GLOBAL_INTEGER(client_max_protocol, client_max_protocol)
+FN_GLOBAL_INTEGER(client_min_protocol, client_min_protocol)
 FN_GLOBAL_INTEGER(config_backend, config_backend)
 FN_GLOBAL_INTEGER(ctdb_locktime_warn_threshold, ctdb_locktime_warn_threshold)
 FN_GLOBAL_INTEGER(ctdb_timeout, ctdb_timeout)
@@ -306,13 +306,13 @@ FN_GLOBAL_INTEGER(ldap_timeout, ldap_timeout)
 FN_GLOBAL_INTEGER(lm_announce, lm_announce)
 FN_GLOBAL_INTEGER(lm_interval, lm_interval)
 FN_GLOBAL_INTEGER(lock_spin_time, lock_spin_time)
-FN_GLOBAL_INTEGER(lpqcachetime, lpqcachetime)
+FN_GLOBAL_INTEGER(lpq_cache_time, lpq_cache_time)
 FN_GLOBAL_INTEGER(machine_password_timeout, machine_password_timeout)
 FN_GLOBAL_INTEGER(mangle_prefix, mangle_prefix)
 FN_GLOBAL_INTEGER(map_to_guest, map_to_guest)
-FN_GLOBAL_INTEGER(maxdisksize, maxdisksize)
+FN_GLOBAL_INTEGER(max_disk_size, max_disk_size)
 FN_GLOBAL_INTEGER(max_log_size, max_log_size)
-FN_GLOBAL_INTEGER(maxmux, maxmux)
+FN_GLOBAL_INTEGER(max_mux, max_mux)
 FN_GLOBAL_INTEGER(max_open_files, max_open_files)
 FN_GLOBAL_INTEGER(max_smbd_processes, max_smbd_processes)
 FN_GLOBAL_INTEGER(max_stat_cache_size, max_stat_cache_size)
@@ -334,10 +334,10 @@ FN_GLOBAL_INTEGER(server_signing, server_signing)
 FN_GLOBAL_INTEGER(smb2_max_read, smb2_max_read)
 FN_GLOBAL_INTEGER(smb2_max_trans, smb2_max_trans)
 FN_GLOBAL_INTEGER(smb2_max_write, smb2_max_write)
-FN_GLOBAL_INTEGER(srv_maxprotocol, srv_maxprotocol)
-FN_GLOBAL_INTEGER(srv_minprotocol, srv_minprotocol)
+FN_GLOBAL_INTEGER(server_max_protocol, server_max_protocol)
+FN_GLOBAL_INTEGER(server_min_protocol, server_min_protocol)
 FN_GLOBAL_INTEGER(syslog, syslog)
-FN_GLOBAL_INTEGER(usernamelevel, usernamelevel)
+FN_GLOBAL_INTEGER(username_level, username_level)
 FN_GLOBAL_INTEGER(username_map_cache_time, username_map_cache_time)
 FN_GLOBAL_INTEGER(usershare_max_shares, usershare_max_shares)
 FN_GLOBAL_INTEGER(web_port, web_port)
@@ -367,24 +367,24 @@ FN_GLOBAL_LIST(usershare_prefix_deny_list, usershare_prefix_deny_list)
 FN_GLOBAL_LIST(winbind_nss_info, winbind_nss_info)
 FN_GLOBAL_LIST(wins_server_list, wins_server_list)
 FN_GLOBAL_STRING(abort_shutdown_script, abort_shutdown_script)
-FN_GLOBAL_STRING(addgroup_script, addgroup_script)
-FN_GLOBAL_STRING(addmachine_script, addmachine_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_group_script, add_group_script)
+FN_GLOBAL_STRING(add_machine_script, add_machine_script)
+FN_GLOBAL_STRING(addport_command, addport_command)
+FN_GLOBAL_STRING(addprinter_command, addprinter_command)
+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(enumports_cmd, enumports_cmd)
+FN_GLOBAL_STRING(deleteprinter_command, deleteprinter_command)
+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_command, enumports_command)
 FN_GLOBAL_STRING(get_quota_command, get_quota_command)
 FN_GLOBAL_STRING(iprint_server, iprint_server)
 FN_GLOBAL_STRING(ldap_admin_dn, ldap_admin_dn)
@@ -392,8 +392,8 @@ FN_GLOBAL_STRING(ldap_suffix, ldap_suffix)
 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)
@@ -401,10 +401,10 @@ FN_GLOBAL_STRING(passwd_program, passwd_program)
 FN_GLOBAL_STRING(perfcount_module, perfcount_module)
 FN_GLOBAL_STRING(remote_announce, remote_announce)
 FN_GLOBAL_STRING(remote_browse_sync, remote_browse_sync)
-FN_GLOBAL_STRING(renameuser_script, renameuser_script)
-FN_GLOBAL_STRING(rootdir, rootdir)
-FN_GLOBAL_STRING(serverstring, serverstring)
-FN_GLOBAL_STRING(setprimarygroup_script, setprimarygroup_script)
+FN_GLOBAL_STRING(rename_user_script, rename_user_script)
+FN_GLOBAL_STRING(root_directory, root_directory)
+FN_GLOBAL_STRING(server_string, server_string)
+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)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 66b1d43..515e94c 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -373,7 +373,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "server string",
 		.type		= P_STRING,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(serverstring),
+		.offset		= GLOBAL_VAR(server_string),
 		.special	= NULL,
 		.enum_list	= NULL,
 		.flags		= FLAG_BASIC | FLAG_ADVANCED,
@@ -439,7 +439,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "encrypt passwords",
 		.type		= P_BOOL,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(encrypted_passwords),
+		.offset		= GLOBAL_VAR(encrypt_passwords),
 		.special	= NULL,
 		.enum_list	= NULL,
 		.flags		= FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,
@@ -502,7 +502,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "password server",
 		.type		= P_STRING,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(passwordserver),
+		.offset		= GLOBAL_VAR(password_server),
 		.special	= NULL,
 		.enum_list	= NULL,
 		.flags		= FLAG_ADVANCED | FLAG_WIZARD,
@@ -556,7 +556,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "root directory",
 		.type		= P_STRING,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(rootdir),
+		.offset		= GLOBAL_VAR(root_directory),
 		.special	= NULL,
 		.enum_list	= NULL,
 		.flags		= FLAG_ADVANCED,
@@ -565,7 +565,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "root dir",
 		.type		= P_STRING,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(rootdir),
+		.offset		= GLOBAL_VAR(root_directory),
 		.special	= NULL,
 		.enum_list	= NULL,
 		.flags		= FLAG_HIDE,
@@ -574,7 +574,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "root",
 		.type		= P_STRING,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(rootdir),
+		.offset		= GLOBAL_VAR(root_directory),
 		.special	= NULL,
 		.enum_list	= NULL,
 		.flags		= FLAG_HIDE,
@@ -583,7 +583,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "guest account",
 		.type		= P_STRING,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(guestaccount),
+		.offset		= GLOBAL_VAR(guest_account),
 		.special	= NULL,
 		.enum_list	= NULL,
 		.flags		= FLAG_BASIC | FLAG_ADVANCED,
@@ -665,7 +665,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "username level",
 		.type		= P_INTEGER,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(usernamelevel),
+		.offset		= GLOBAL_VAR(username_level),
 		.special	= NULL,
 		.enum_list	= NULL,
 		.flags		= FLAG_ADVANCED,
@@ -800,7 +800,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "read list",
 		.type		= P_LIST,
 		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(readlist),
+		.offset		= LOCAL_VAR(read_list),
 		.special	= NULL,
 		.enum_list	= NULL,
 		.flags		= FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -809,7 +809,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "write list",
 		.type		= P_LIST,
 		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(writelist),
+		.offset		= LOCAL_VAR(write_list),
 		.special	= NULL,
 		.enum_list	= NULL,
 		.flags		= FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -963,7 +963,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "force directory mode",
 		.type		= P_OCTAL,
 		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(force_dir_mode),
+		.offset		= LOCAL_VAR(force_directory_mode),
 		.special	= NULL,
 		.enum_list	= NULL,
 		.flags		= FLAG_ADVANCED | FLAG_GLOBAL | FLAG_SHARE,
@@ -981,7 +981,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "inherit permissions",
 		.type		= P_BOOL,
 		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(inherit_perms),
+		.offset		= LOCAL_VAR(inherit_permissions),
 		.special	= NULL,
 		.enum_list	= NULL,
 		.flags		= FLAG_ADVANCED | FLAG_SHARE,
@@ -1054,7 +1054,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "only user",
 		.type		= P_BOOL,
 		.p_class	= P_LOCAL,
-		.offset		= LOCAL_VAR(onlyuser),
+		.offset		= LOCAL_VAR(only_user),
 		.special	= NULL,
 		.enum_list	= NULL,
 		.flags		= FLAG_ADVANCED | FLAG_SHARE | FLAG_DEPRECATED,
@@ -1322,7 +1322,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "server max protocol",
 		.type		= P_ENUM,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(srv_maxprotocol),
+		.offset		= GLOBAL_VAR(server_max_protocol),
 		.special	= NULL,
 		.enum_list	= enum_protocol,
 		.flags		= FLAG_ADVANCED,
@@ -1331,7 +1331,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "max protocol",
 		.type		= P_ENUM,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(srv_maxprotocol),
+		.offset		= GLOBAL_VAR(server_max_protocol),
 		.special	= NULL,
 		.enum_list	= enum_protocol,
 		.flags		= FLAG_ADVANCED,
@@ -1340,7 +1340,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "protocol",
 		.type		= P_ENUM,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(srv_maxprotocol),
+		.offset		= GLOBAL_VAR(server_max_protocol),
 		.special	= NULL,
 		.enum_list	= enum_protocol,
 		.flags		= FLAG_ADVANCED,
@@ -1349,7 +1349,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "server min protocol",
 		.type		= P_ENUM,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(srv_minprotocol),
+		.offset		= GLOBAL_VAR(server_min_protocol),
 		.special	= NULL,
 		.enum_list	= enum_protocol,
 		.flags		= FLAG_ADVANCED,
@@ -1358,7 +1358,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "min protocol",
 		.type		= P_ENUM,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(srv_minprotocol),
+		.offset		= GLOBAL_VAR(server_min_protocol),
 		.special	= NULL,
 		.enum_list	= enum_protocol,
 		.flags		= FLAG_ADVANCED,
@@ -1367,7 +1367,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "client max protocol",
 		.type		= P_ENUM,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(cli_maxprotocol),
+		.offset		= GLOBAL_VAR(client_max_protocol),
 		.special	= NULL,
 		.enum_list	= enum_protocol,
 		.flags		= FLAG_ADVANCED,
@@ -1376,7 +1376,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "client min protocol",
 		.type		= P_ENUM,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(cli_minprotocol),
+		.offset		= GLOBAL_VAR(client_min_protocol),
 		.special	= NULL,
 		.enum_list	= enum_protocol,
 		.flags		= FLAG_ADVANCED,
@@ -1519,7 +1519,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "max mux",


-- 
Samba Shared Repository


More information about the samba-cvs mailing list