summaryrefslogtreecommitdiffstats
path: root/ldap_wizard
diff options
context:
space:
mode:
Diffstat (limited to 'ldap_wizard')
-rw-r--r--ldap_wizard/Ldap.pm32
1 files changed, 16 insertions, 16 deletions
diff --git a/ldap_wizard/Ldap.pm b/ldap_wizard/Ldap.pm
index ddda4e37..9518a2c8 100644
--- a/ldap_wizard/Ldap.pm
+++ b/ldap_wizard/Ldap.pm
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# version 0.1
# GPL like
-# aginies@mandrakesoft.com
+# vguardiola@mandrakesoft.com
package MDK::Wizard::Ldap;
use lib qw(/usr/lib/libDrakX);
@@ -52,7 +52,7 @@ my $o = {
},
needed_rpm => [ 'openldap-servers','openldap-clients' ],
defaultimage => "$ENV{__WIZ_HOME__}ldap_wizard/images/ldap.png",
- };
+ };
my $wiz = new MDK::Wizard::Wizcommon;
@@ -181,7 +181,7 @@ $o->{pages} = {
next => 'summary_add_user'
},
set_srv => {
- name => "\n". N("Configuring LDAP Server") ."\n\n" . N("LDAP directory tree") . "\n" . N("The DNS naming is used for LDAP directory tree definition") . "\n" . N("Domain name: ") . $wiz_domain_name . "\n" . ("LDAP Diretory Tree: " . $o->{var}{suffix} ) . "\n\n" . N("LDAP Administrator") . "\n" . N("Administrator is a power user with grant access on LDAP database") . "\n" . "cn=".N("Administrator").",".$o->{var}{suffix} . "\n\n",
+ name => "\n". N("Configuring LDAP Server") ."\n\n" . N("LDAP directory tree") . "\n" . N("The DNS naming is used for LDAP directory tree definition") . "\n" . N("Domain name: ") . $wiz_domain_name . "\n" . ("LDAP Diretory Tree: " . $o->{var}{suffix} ) . "\n\n" . N("LDAP Administrator") . "\n" . N("Administrator is a power user with grant access on LDAP database") . "\n" . "cn=".N("Adrministrator").",".$o->{var}{suffix} . "\n\n",
data => [
{ label => " " },
{ label => N("LDAP directory tree:"), val => \$o->{var}{suffix}, help => "aide p" },
@@ -302,7 +302,7 @@ sub do_it_setldap {
# s/example/$dcall
substInFile {
- s/example/$o->{var}{suffix}/g;
+ s/dc=example,dc=com/$o->{var}{suffix}/g;
} $LDAPCONF;
# set rootdn
@@ -327,19 +327,8 @@ sub do_it_setldap {
}
- # create config file in /etc/sysconfig/ldapconf
-
- output($conf_file, <<EOF);
-srv=$o->{var}{srv}
-suffix=$o->{var}{suffix}
-rootdn=$o->{var}{rootdn}
-rootpass=$o->{var}{rootpass}
-users=$o->{var}{defou}
-EOF
-
# reset premisions
system("chown -R root.ldap /etc/openldap");
- # better use status, maybe ?
services::restart('ldap');
sleep(4);
init_ldap();
@@ -387,7 +376,18 @@ objectClass: organizationalUnit
RootLdif
- close($LDAP)
+ close($LDAP);
+
+ # create config file in /etc/sysconfig/ldapwiz
+ output($conf_file, <<EOF);
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install2.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index db2a700ea..0ae072f13 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -329,9 +329,8 @@ sub start_i810fb() {
eval { modules::load('intel-agp') };
eval {
any::ddcxinfos(); # keep the result otherwise ddcxinfos doesn't return good results afterwards
- modules::load([ 'i810fb',
- "xres=$xres", 'hsync1=32', 'hsync2=48', 'vsync1=50', 'vsync2=70', #- this sucking i810fb does not accept floating point numbers in hsync!
- 'vram=2', 'bpp=16', 'accel=1', 'mtrr=1' ]);
+ my $opt = "xres=$xres hsync1=32 hsync2=48 vsync1=50 vsync2=70 vram=2 bpp=16 accel=1 mtrr=1"; #- this sucking i810fb does not accept floating point numbers in hsync!
+ modules::load_with_options([ 'i810fb' ], { i810fb => $opt });
};
}