summaryrefslogtreecommitdiffstats
path: root/samba_wizard
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2003-09-15 11:10:22 +0000
committerFlorent Villard <warly@mandriva.com>2003-09-15 11:10:22 +0000
commit724f7a8d02d6cd48b108a8f2cfbb98feeecae2a7 (patch)
tree2e796bb5e0cb5fb582b6f48563696337b6bea18d /samba_wizard
parent5cbe71386657f4f045cbd59137f5e1d702a93292 (diff)
downloaddrakwizard-724f7a8d02d6cd48b108a8f2cfbb98feeecae2a7.tar
drakwizard-724f7a8d02d6cd48b108a8f2cfbb98feeecae2a7.tar.gz
drakwizard-724f7a8d02d6cd48b108a8f2cfbb98feeecae2a7.tar.bz2
drakwizard-724f7a8d02d6cd48b108a8f2cfbb98feeecae2a7.tar.xz
drakwizard-724f7a8d02d6cd48b108a8f2cfbb98feeecae2a7.zip
fix apache
fix dns_client adding a \n at the end of the line of the configuration file fix squid fix inn fix ftp fix samba add a init function in drakwizard.pl for case such as apache which need to initialize some parameters separate region/country in ntp wizard
Diffstat (limited to 'samba_wizard')
-rwxr-xr-xsamba_wizard/Samba.pm13
-rw-r--r--samba_wizard/scripts/smb.conf.default3
2 files changed, 10 insertions, 6 deletions
diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm
index d40a51a5..e192d0d2 100755
--- a/samba_wizard/Samba.pm
+++ b/samba_wizard/Samba.pm
@@ -23,6 +23,7 @@ package MDK::Wizard::Samba;
use strict;
use common;
+use services;
use MDK::Wizard::Wizcommon;
my $wiz = new MDK::Wizard::Wizcommon;
@@ -112,7 +113,7 @@ $o->{pages} = {
next => 'ask_services'
},
ask_netmask => {
- name => N('Access control') . "\n\n" . N('* Example 1: allow all IPs in 150.203.*.*; except one\nhosts allow = 150.203. EXCEPT 150.203.6.66') . "\n\n" . N('* Example 2: allow hosts that match the given network/netmask\nhosts allow = 150.203.15.0/255.255.255.0') . "\n\n" . N('* Example 3: allow a couple of hosts\nhosts allow = lapland, arvidsjaur') . "\n\n" . N('* Example 4: allow only hosts in NIS netgroup \qfoonet\q, but deny access from one particular host\nhosts allow = @foonet\nhosts deny = pirate') . "\n\n" . N('Note that access still requires suitable user-level passwords.'),
+ name => N('Access control') . "\n\n" . N('* Example 1: allow all IPs in 150.203.*.*; except one\nhosts allow = 150.203. EXCEPT 150.203.6.66') . "\n\n" . N('* Example 2: allow hosts that match the given network/netmask\nhosts allow = 150.203.15.0/255.255.255.0') . "\n\n" . N('* Example 3: allow a couple of hosts\nhosts allow = lapland, arvidsjaur') . "\n\n" . N('* Example 4: allow only hosts in NIS netgroup "foonet", but deny access from one particular host\nhosts allow = @foonet\nhosts deny = pirate') . "\n\n" . N('Note that access still requires suitable user-level passwords.'),
pre => sub {
$o->{var}{wiz_hosts_allow} ||= get_allow_host();
$o->{var}{wiz_hosts_allow} ||= get_deny_host()
@@ -322,10 +323,14 @@ sub list_printers {
my @list if 0;
return @list if @list;
- @list = sort grep /^(?!\#).*/, map {
+ @list = sort grep /^(?!\#).+/, map {
my ($printer) = split(':', $_);
} cat_("/etc/printcap");
- @list
+ if (@list) {
+ @list
+ } else {
+ ()
+ }
}
@@ -466,7 +471,7 @@ sub do_it {
$conf->chg_var("global", "server string", $o->{var}{wiz_banner});
$conf->chg_var("public", "write list", $o->{var}{wiz_write_list}) if $o->{var}{wiz_do_file_sharing};
$conf->chg_var("public", "read list", $o->{var}{wiz_read_list}) if $o->{var}{wiz_do_file_sharing};
- my $ip = $o->itf_get("IPADDR");
+ my $ip = $wiz->{net}->itf_get("IPADDR");
if ($o->{var}{wiz_do_file_sharing}) {
standalone->explanations("Enabling $o->{var}{wiz_dir} samba file sharing");
$conf->comment_menu("public", " ");
diff --git a/samba_wizard/scripts/smb.conf.default b/samba_wizard/scripts/smb.conf.default
index 1e714025..c81b8615 100644
--- a/samba_wizard/scripts/smb.conf.default
+++ b/samba_wizard/scripts/smb.conf.default
@@ -102,8 +102,7 @@
# to be kept in sync with the SMB password.
unix password sync = Yes
passwd program = /usr/bin/passwd %u
- passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password* %n\n
-*passwd:*all*authentication*tokens*updated*successfully*
+ passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password* %n\n *passwd:*all*authentication*tokens*updated*successfully*
# Unix users can map to different SMB User names
; username map = /etc/samba/smbusers