diff options
| author | Antoine Ginies <aginies@mandriva.com> | 2008-09-18 09:54:44 +0000 |
|---|---|---|
| committer | Antoine Ginies <aginies@mandriva.com> | 2008-09-18 09:54:44 +0000 |
| commit | df18386aa961268a40f3f3f03c883100f77a4355 (patch) | |
| tree | 35618793066092b6aa0b38f044c98b1385bc7f82 /bin | |
| parent | 76600a27e868bd3a29787ebc048e404ed930617e (diff) | |
| download | drakx-net-df18386aa961268a40f3f3f03c883100f77a4355.tar drakx-net-df18386aa961268a40f3f3f03c883100f77a4355.tar.gz drakx-net-df18386aa961268a40f3f3f03c883100f77a4355.tar.bz2 drakx-net-df18386aa961268a40f3f3f03c883100f77a4355.tar.xz drakx-net-df18386aa961268a40f3f3f03c883100f77a4355.zip | |
remove option if value is null
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/draksambashare | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/draksambashare b/bin/draksambashare index c595661..093adb9 100755 --- a/bin/draksambashare +++ b/bin/draksambashare @@ -1185,7 +1185,7 @@ sub configure_samba { ], post => sub { $samba->{global}{workgroup} = $o->{var}{wiz_workgroup}; - $o->{var}{wiz_netbios_name} and $samba->{global}{"netbios name"} = $o->{var}{wiz_netbios_name}; + $o->{var}{wiz_netbios_name} ? $samba->{global}{"netbios name"} = $o->{var}{wiz_netbios_name} : delete $samba->{global}{"netbios name"}; $samba->{global}{'server string'} = $o->{var}{wiz_banner}; $o->{var}{wiz_log_file} and $samba->{global}{'log file'} = $o->{var}{wiz_log_file}; $o->{var}{wiz_log_level} and $samba->{global}{'log level'} = $o->{var}{wiz_log_level}; @@ -1208,11 +1208,11 @@ sub configure_samba { sub global_special_options() { # set charset - $o->{var}{wiz_doscharset} and $samba->{global}{'dos charset'} = $o->{var}{wiz_doscharset}; - $o->{var}{wiz_unixcharset} and $samba->{global}{'unix charset'} = $o->{var}{wiz_unixcharset}; - $o->{var}{wiz_displaycharset} and $samba->{global}{'display charset'} = $o->{var}{wiz_displaycharset}; - $o->{var}{wiz_security} and $samba->{global}{security} = $o->{var}{wiz_security}; - $o->{var}{hosts_allow} and $samba->{global}{'hosts allow'} = $o->{var}{hosts_allow}; + $o->{var}{wiz_doscharset} ? $samba->{global}{'dos charset'} = $o->{var}{wiz_doscharset} : delete $samba->{global}{'dos charset'}; + $o->{var}{wiz_unixcharset} ? $samba->{global}{'unix charset'} = $o->{var}{wiz_unixcharset} : delete $samba->{global}{'unix charset'}; + $o->{var}{wiz_displaycharset} ? $samba->{global}{'display charset'} = $o->{var}{wiz_displaycharset} : delete $samba->{global}{'display charset'}; + $o->{var}{wiz_security} ? $samba->{global}{security} = $o->{var}{wiz_security} : delete $samba->{global}{security}; + $o->{var}{hosts_allow} ? $samba->{global}{'hosts allow'} = $o->{var}{hosts_allow} : delete $samba->{global}{'hosts allow'}; # $samba->{global}{security} = $o->{var}{wiz_security}; # detect Samba type 3 is standalone if ($o->{var}{wiz_type} == "3") { |