summaryrefslogtreecommitdiffstats
path: root/ldap_wizard/Ldap.pm
diff options
context:
space:
mode:
Diffstat (limited to 'ldap_wizard/Ldap.pm')
-rw-r--r--ldap_wizard/Ldap.pm36
1 files changed, 16 insertions, 20 deletions
diff --git a/ldap_wizard/Ldap.pm b/ldap_wizard/Ldap.pm
index 1d43e3cd..295b56d4 100644
--- a/ldap_wizard/Ldap.pm
+++ b/ldap_wizard/Ldap.pm
@@ -5,7 +5,7 @@
package MDK::Wizard::Ldap;
use lib qw(/usr/lib/libDrakX);
-use ugtk2;
+use ugtk2 qw(:create);
use strict;
use ldapdef;
use common;
@@ -16,6 +16,8 @@ use Expect;
require Net::LDAP;
use Net::LDAP::Util qw(ldap_error_text);
+
+
#unless ($> == 0) {
# die "You are not root Exiting\n";
#}
@@ -103,10 +105,9 @@ $o->{pages} = {
sav_old_conf => {
name => N("Save an existing configuration"),
- post => \&sav_conf,
- next => 'set_srv'
+ post => \&sav_conf,
+ next => 'set_srv'
},
-
add_userposix => {
name => N("LDAP User Add") . "\n\n" . N("User Create in: ") . $o->{var}{defou} . ", " . $o->{var}{suffix},
data => [
@@ -157,8 +158,7 @@ $o->{pages} = {
{ label => N("LDAP Password (again):"), hidden => 1, val => \$o->{var}{rootpass2}, help => N("aide p") },
],
complete => sub {
-
- if (!$o->{var}{suffix} || $o->{var}{suffix} !~ /dc/ ) {
+ if (!$o->{var}{suffix} || $o->{var}{suffix} !~ /dc/) {
$::in->ask_warn(N("Error"), N("You must enter a suffix for LDAP."));
return 1;
}
@@ -226,7 +226,6 @@ $o->{pages} = {
};
sub do_it_setldap {
-
return if $::testing;
if (!-f $LDAPCONF) {
die "no $LDAPCONF found";
@@ -244,12 +243,12 @@ sub do_it_setldap {
} else {
append_to_file($LDAPCONF, qq(suffix\t"$o->{var}{suffix}"));
}
-
- # s/example/$dcall
+
+ # s/example/$dcall
substInFile {
s/example/$o->{var}{suffix}/g;
} $LDAPCONF;
-
+
# set rootdn
if (any { /^rootdn/ } cat_($LDAPCONF)) {
substInFile {
@@ -292,14 +291,14 @@ EOF
sub init_ldap {
my $_root_cn = (split('=', (split(/,/, $o->{var}{rootdn}))[0]))[1];
my $ldap_dc = (split('=', (split(/,/, $o->{var}{suffix}))[0]))[1];
-
+
$o->{var}{rootdn} =~ /cn=(\w+),/ and my $cnadmin = $1;
-
+
print "$o->{var}{rootdn}\n";
print "$o->{var}{rootpass}\n";
my $LDAP;
open($LDAP, "| ldapadd -x -h $o->{var}{srv} -D '$o->{var}{rootdn}' -w $o->{var}{rootpass}");
-
+
print $LDAP <<RootLdif;
dn: $o->{var}{suffix}
dc: $ldap_dc
@@ -335,18 +334,15 @@ RootLdif
close($LDAP)
}
-
-
-
sub do_it_user_add {
return if $::testing;
- my $_mesg = add_user($o);
+ add_user($o);
}
sub sav_conf {
- system("slapcat -l /root/ldap-sav.ldiff");
- system("cp /etc/openldap/slapd.conf /root/");
- system("rm -fr /var/lib/ldap/*")
+ system("slapcat -l /root/ldap-sav.ldiff");
+ system("cp /etc/openldap/slapd.conf /root/");
+ system("rm -fr /var/lib/ldap/*")
}
sub new {