Author: varkoly
Date: Sat Jul 26 06:24:39 2008
New Revision: 49425
URL: http://svn.opensuse.org/viewcvs/yast?rev=49425&view=rev
Log:
* add missed required packages
* setting up a local ldap-server we would configure ldap client
Modified:
trunk/mail/src/MailServerLDAP.pm
trunk/mail/src/mail-server_dialogs.ycp
trunk/mail/yast2-mail.spec.in
Modified: trunk/mail/src/MailServerLDAP.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServerLDAP.pm?rev=49425&r1=49424&r2=49425&view=diff
==============================================================================
--- trunk/mail/src/MailServerLDAP.pm (original)
+++ trunk/mail/src/MailServerLDAP.pm Sat Jul 26 06:24:39 2008
@@ -32,6 +32,7 @@
YaST::YCP::Import ("YaPI::LdapServer");
YaST::YCP::Import ("Service");
+YaST::YCP::Import ("Ldap");
BEGIN {$TYPEINFO{ConfigureLDAPServer} = ["function", [ "map" , "string", "any" ] ];}
sub ConfigureLDAPServer()
Modified: trunk/mail/src/mail-server_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp?rev=49425&r1=49424&r2=49425&view=diff
==============================================================================
--- trunk/mail/src/mail-server_dialogs.ycp (original)
+++ trunk/mail/src/mail-server_dialogs.ycp Sat Jul 26 06:24:39 2008
@@ -112,7 +112,7 @@
{ // Now we setup the LDAP Server
args = add(args, "setup");
}
- if( conf_ldap_client )
+ if( conf_ldap_client && ! setup_ldap_server )
{ // Now we setup the server as LDAP Server
args = add(args, "conf");
}
@@ -127,6 +127,14 @@
Ldap::Read();
Ldap::LDAPInit();
LDAPSettings = (map ) Ldap::Export();
+ //tell Ldap module to create the default objects:
+ if ( LDAPSettings [ "ldap_server" ]:"" == "" ) LDAPSettings [ "ldap_server" ] = "localhost";
+ if ( LDAPSettings [ "ldap_server" ]:"" == "" ) LDAPSettings [ "ldap_server" ] = true;
+ LDAPSettings [ "start_ldap" ] = true;
+ LDAPSettings [ "create_ldap" ] = true;
+ Ldap::Import(LDAPSettings);
+ //write the settings:
+ Ldap::Write(abort);
}
MailServer::AdminPassword = Ldap::LDAPAskAndBind(false);
if( MailServer::AdminPassword != nil )
@@ -139,12 +147,6 @@
return false;
};
- //tell Ldap module to create the default objects:
- LDAPSettings [ "create_ldap" ] = true;
- Ldap::Import(LDAPSettings);
-y2milestone("after LDAPSettings %1", LDAPSettings);
- //write the settings:
- Ldap::Write(abort);
//create default mail-server configuration
YaPI::MailServer::ResetMailServer(MailServer::AdminPassword);
return `ok;
Modified: trunk/mail/yast2-mail.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/yast2-mail.spec.in?rev=49425&r1=49424&r2=49425&view=diff
==============================================================================
--- trunk/mail/yast2-mail.spec.in (original)
+++ trunk/mail/yast2-mail.spec.in Sat Jul 26 06:24:39 2008
@@ -3,6 +3,7 @@
@HEADER@
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite
BuildRequires: yast2-perl-bindings yast2-ldap-server yast2-users yast2-network
+BuildRequires: perl-NetxAP
PreReq: %fillup_prereq
@@ -10,6 +11,7 @@
Requires: yast2 >= 2.16.23
Requires: yast2-users
Requires: yast2-ldap
+Requires: perl-NetxAP
Provides: yast2-config-network:/usr/lib/YaST2/clients/lan_sendmail.ycp
Provides: yast2-config-sendmail yast2-config-sendmail-devel
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
