Changeset 11644 for trunk

Timestamp:

11/12/08 16:38:16 (8 weeks ago)

Author:

javier.amor.garcia@…

Message:

Make and restore backup more robust: removed slapd.conf parameters in both slapadd and slapcat invokations, so we can use the module with sldap with configuration in the directory itself

Location:

trunk/client/usersandgroups

Files:

• ChangeLog (modified) (1 diff)
• src/EBox/Ldap.pm (modified) (3 diffs)

trunk/client/usersandgroups/ChangeLog

@@ -1 +1 @@
 0.12.100
-        + Restore backup is more robust: inexistent users in a group are ignored
+        + Restore backup is more robust: inexistent users in a group are
+        ignored
+        + Make and restore backup more robust: removed slapd.conf
+        parameters in both slapadd and slapcat invokations, so we can use
+        the module with sldap with configuration in the directory itself
 0.12.99
         + New release

trunk/client/usersandgroups/src/EBox/Ldap.pm

@@ -558 +558 @@
   
   my $ldapDir       = EBox::Ldap::dataDir();
-  my $slapdConfFile = EBox::Ldap::slapdConfFile();
   my $user  = EBox::Config::user();
   my $group = EBox::Config::group();
   my $ldifFile = $self->ldifFile($dir);
 
-  my $slapcatCommand = $self->_slapcatCmd($ldifFile, $slapdConfFile);
+  my $slapcatCommand = $self->_slapcatCmd($ldifFile);
   my $chownCommand = "/bin/chown $user.$group $ldifFile";
 
@@ -581 +580 @@
   
   my $ldapDir   = EBox::Ldap::dataDir();
-  my $slapdConfFile = EBox::Ldap::slapdConfFile();
   my $ldifFile = $self->ldifFile($dir);
 
   my $backupCommand = $self->_backupSystemDirectory();
   my $rmCommand = $self->_rmLdapDirCmd($ldapDir);
-  my $slapaddCommand = $self->_slapaddCmd($ldifFile, $slapdConfFile);
+  my $slapaddCommand = $self->_slapaddCmd($ldifFile);
   my $chownDataCommand = $self->_chownDatadir;
   
@@ -619 +617 @@
 sub _slapcatCmd
 {
-  my ($self, $ldifFile, $slapdConfFile) = @_;
-  return  "/usr/sbin/slapcat  -f $slapdConfFile > $ldifFile";
+  my ($self, $ldifFile) = @_;
+  return  "/usr/sbin/slapcat  > $ldifFile";
 }
 
 sub _slapaddCmd
 {
-  my ($self, $ldifFile, $slapdConfFile) = @_;
-  return  "/usr/sbin/slapadd  -c -f $slapdConfFile < $ldifFile" ;
+  my ($self, $ldifFile) = @_;
+  return  "/usr/sbin/slapadd  -c  < $ldifFile" ;
 }