summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Ginies <aginies@mandriva.com>2005-08-26 17:23:48 +0000
committerAntoine Ginies <aginies@mandriva.com>2005-08-26 17:23:48 +0000
commit6143b766db2e1ddec5fde1d066f5c5721d98fc5f (patch)
treed6064791a2074e2e21935ab91db98aedac3e41fa
parent61b95a29884c9e94c1eb3e83192a665f76467b22 (diff)
downloaddrakx-backup-do-not-use-6143b766db2e1ddec5fde1d066f5c5721d98fc5f.tar
drakx-backup-do-not-use-6143b766db2e1ddec5fde1d066f5c5721d98fc5f.tar.gz
drakx-backup-do-not-use-6143b766db2e1ddec5fde1d066f5c5721d98fc5f.tar.bz2
drakx-backup-do-not-use-6143b766db2e1ddec5fde1d066f5c5721d98fc5f.tar.xz
drakx-backup-do-not-use-6143b766db2e1ddec5fde1d066f5c5721d98fc5f.zip
check user in valid_list, write_list ....
-rwxr-xr-xperl-install/standalone/draksambashare40
1 files changed, 17 insertions, 23 deletions
diff --git a/perl-install/standalone/draksambashare b/perl-install/standalone/draksambashare
index 7553daf11..118627b4f 100755
--- a/perl-install/standalone/draksambashare
+++ b/perl-install/standalone/draksambashare
@@ -258,16 +258,6 @@ sub get_samba_printers() {
return @listprinters;
}
-sub create_smbuser {
- my ($list) = @_;
- my @users = split(" ", $list);
- foreach my $user (@users) {
- if (!any { /^$user:/ } cat_("/etc/samba/smbpasswd")) {
- system("smbpasswd -a $user -n");
- }
- }
-}
-
sub write_conf() {
$samba->write_conf("/etc/samba/smb.conf");
}
@@ -370,13 +360,13 @@ sub add_entry() {
}
}
if (!$wiz_addshare_path) {
- err_dialog(N("Error"), N("Can\'t create the directory, please enter a correct path.")) and return 'welcome';
+ err_dialog(N("Error"), N("Can't create the directory, please enter a correct path.")) and return 'welcome';
}
if (!$wiz_addshare_comment) {
err_dialog(N("Error"), N("Please enter a Comment for this share.")) and return 'welcome';
}
if (! -d $wiz_addshare_path) {
- mkdir_p($wiz_addshare_path) or err_dialog(N("Error"), N("Can\'t create the directory, please enter a correct path.")) and return 'welcome';
+ mkdir_p($wiz_addshare_path) or err_dialog(N("Error"), N("Can't create the directory, please enter a correct path.")) and return 'welcome';
}
},
post => sub {
@@ -767,7 +757,7 @@ sub modify_entry {
0, Gtk2::HSeparator->new,
0, $expander_file,
),
- ),
+ ),
create_okcancel({
cancel_clicked => sub { $w->destroy },
ok_clicked => sub {
@@ -782,6 +772,14 @@ sub modify_entry {
err_dialog(N("Error"), N("Create mask, create mode and directory mask should be numeric. ie: 0755.")) and return 1;
}
}
+ foreach ($read_list->get_text, $write_list->get_text, $admin_users->get_text, $valid_users->get_text) {
+ my @users = split(" ", $_);
+ foreach my $user (@users) {
+ if (!any { /^$user:/ } cat_("/etc/samba/smbpasswd") and !/\@/) {
+ err_dialog(N("Error"), N("Please create this Samba user: %s", $user)) and return;
+ }
+ }
+ }
# update gui SimpleList
remove_entry($selected, $share_list);
push @{$share_list->{data}}, [
@@ -874,7 +872,7 @@ sub get_user {
my $conf = "/etc/passwd";
my @data; local $_;
foreach (cat_($conf)) {
- push @data, "$1" if m/^([^#:]+):[^:]+:([^:]+):/ and $2 > 499;
+ push @data, $1 if m/^([^#:]+):[^:]+:([^:]+):/ and $2 > 499;
}
push @data, " ";
return sort(@data);
@@ -934,15 +932,11 @@ sub modify_user_info {
sub set_user_passwd {
my ($user, $passwd) = @_;
- print "here\n";
- local *F;
- open(F, "|smbpasswd $user\n");
- print F "
-$passwd\n
-$passwd\n
-\n
-";
- close F;
+ my $F;
+ open($F, '|' . qq(smbpasswd $user -s));
+ print $F "$passwd\n";
+ print $F "$passwd\n";
+ close $F;
}
sub add_data_share_list {