summaryrefslogtreecommitdiffstats
path: root/ldap_wizard
diff options
context:
space:
mode:
authorMichael Scherer <misc@mandriva.com>2004-09-01 03:10:50 +0000
committerMichael Scherer <misc@mandriva.com>2004-09-01 03:10:50 +0000
commitfe67909b55c0b416053cef43afaa02f73b396acb (patch)
treec5e052434e4653a8750a57438061a61e80936a75 /ldap_wizard
parent2750c57fd38bb335a258ba6f08184d909aa9993c (diff)
downloaddrakwizard-fe67909b55c0b416053cef43afaa02f73b396acb.tar
drakwizard-fe67909b55c0b416053cef43afaa02f73b396acb.tar.gz
drakwizard-fe67909b55c0b416053cef43afaa02f73b396acb.tar.bz2
drakwizard-fe67909b55c0b416053cef43afaa02f73b396acb.tar.xz
drakwizard-fe67909b55c0b416053cef43afaa02f73b396acb.zip
- do not use a popup for error message.
Diffstat (limited to 'ldap_wizard')
-rw-r--r--ldap_wizard/Ldap.pm6
-rw-r--r--ldap_wizard/ldapdef.pm3
2 files changed, 6 insertions, 3 deletions
diff --git a/ldap_wizard/Ldap.pm b/ldap_wizard/Ldap.pm
index 6c7ad7fc..318ff3f6 100644
--- a/ldap_wizard/Ldap.pm
+++ b/ldap_wizard/Ldap.pm
@@ -209,7 +209,9 @@ $o->{pages} = {
},
endadd => {
name => N("Successfully added User"),
- data => [ { label => N("The wizard successfully added a user in LDAP") } ],
+ data => [ { label => N(""),fixed_val => \$o->{var}{error_user_add} }
+
+ ],
no_back => 1,
end => 1,
next => 0,
@@ -339,7 +341,7 @@ RootLdif
sub do_it_user_add {
return if $::testing;
- add_user($o);
+ $o->{var}{error_user_add}= add_user($o);
}
sub sav_conf {
diff --git a/ldap_wizard/ldapdef.pm b/ldap_wizard/ldapdef.pm
index 20a77a79..3f1caaab 100644
--- a/ldap_wizard/ldapdef.pm
+++ b/ldap_wizard/ldapdef.pm
@@ -102,5 +102,6 @@ sub add_user {
shadowExpire => '-1',
]
);
- create_dialog("", ldap_error_text($result->code));
+# create_dialog("", ldap_error_text($result->code));
+ return ldap_error_text($result->code));
}