Author: jsuchome
Date: Wed May 14 15:14:51 2008
New Revision: 47528
URL: http://svn.opensuse.org/viewcvs/yast?rev=47528&view=rev
Log:
- check for required packages also in CommandLine mode (bnc#390111)
- write correct nss_base_* values in CommandLine mode (bnc#390104)
- options from "configure" command may be used in "pam" command
- 2.16.14
Modified:
trunk/ldap-client/VERSION
trunk/ldap-client/package/yast2-ldap-client.changes
trunk/ldap-client/src/Ldap.ycp
trunk/ldap-client/src/ldap.ycp
trunk/ldap-client/src/ldap_browser.ycp
Modified: trunk/ldap-client/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=47528&r1=47527&r2=47528&view=diff
==============================================================================
--- trunk/ldap-client/VERSION (original)
+++ trunk/ldap-client/VERSION Wed May 14 15:14:51 2008
@@ -1 +1 @@
-2.16.13
+2.16.14
Modified: trunk/ldap-client/package/yast2-ldap-client.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-client.changes?rev=47528&r1=47527&r2=47528&view=diff
==============================================================================
--- trunk/ldap-client/package/yast2-ldap-client.changes (original)
+++ trunk/ldap-client/package/yast2-ldap-client.changes Wed May 14 15:14:51 2008
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Wed May 14 15:09:13 CEST 2008 - jsuchome@suse.cz
+
+- check for required packages also in CommandLine mode (bnc#390111)
+- write correct nss_base_* values in CommandLine mode (bnc#390104)
+- options from "configure" command may be used in "pam" command
+- 2.16.14
+
+-------------------------------------------------------------------
Tue Apr 15 14:00:08 CEST 2008 - jsuchome@suse.cz
- merged texts from proofread
Modified: trunk/ldap-client/src/Ldap.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=47528&r1=47527&r2=47528&view=diff
==============================================================================
--- trunk/ldap-client/src/Ldap.ycp (original)
+++ trunk/ldap-client/src/Ldap.ycp Wed May 14 15:14:51 2008
@@ -362,6 +362,37 @@
return read_settings;
}
+ /**
+ * Return list of architecture specific packages (derived from package list
+ * given as parameter) merged with the packages in parameter
+ */
+ global define list<string> UpdatedArchPackages (list<string> packages) {
+
+ list<string> ret = packages;
+ string arch = Arch::architecture ();
+
+ foreach (string package, packages, {
+ ret = (list<string>) union (ret, arch_packages[package,arch]:[]);
+ });
+ return ret;
+ }
+
+ /**
+ * Return needed packages and packages to be removed
+ * during autoinstallation.
+ * @return map of lists.
+ */
+ global define map AutoPackages() ``{
+
+ if (start)
+ required_packages = (list<string>)
+ union (required_packages, ["pam_ldap", "nss_ldap"]);
+ list<string> install_pkgs = UpdatedArchPackages (required_packages);
+ list remove_pkgs = [];
+ return ($["install": install_pkgs, "remove": remove_pkgs]);
+ }
+
+
/* ------------- auto_yast functions -------------------------------- */
/**
@@ -1047,7 +1078,7 @@
`VBox(
`HSpacing(40),
// password entering label
- `Password(`id(`pw), _("&LDAP Server Password")),
+ `Password(`id(`pw), `opt (`hstretch), _("&LDAP Server Password")),
// label
`Label (sformat (_("Server: %1"), GetFirstServer (server))),
// label (%1 is admin DN - string)
@@ -2521,6 +2552,30 @@
global define boolean WriteNow () {
block<boolean> abort = ``{ return false; };
+
+ list<string> needed_packages =
+ UpdatedArchPackages (["pam_ldap", "nss_ldap"]);
+
+ if (_start_autofs && !Package::Installed("autofs"))
+ {
+ needed_packages = add (needed_packages, "autofs");
+ }
+
+ if (start && !Package::InstalledAll (needed_packages))
+ {
+ if (!Package::InstallAll (needed_packages))
+ Report::Error (Message::FailedToInstallPackages ());
+ start = false;
+ _start_autofs = false;
+ }
+ // during CLI call nss_base_* are not edited: adapt them to new base DN
+ if (old_base_dn != base_dn && nss_base_passwd == old_base_dn)
+ {
+ nss_base_passwd = base_dn;
+ nss_base_shadow = base_dn;
+ nss_base_group = base_dn;
+ }
+
return (Write(abort) == `next);
}
@@ -2565,36 +2620,6 @@
}
/**
- * Return list of architecture specific packages (derived from package list
- * given as parameter) merged with the packages in parameter
- */
- global define list<string> UpdatedArchPackages (list<string> packages) {
-
- list<string> ret = packages;
- string arch = Arch::architecture ();
-
- foreach (string package, packages, {
- ret = (list<string>) union (ret, arch_packages[package,arch]:[]);
- });
- return ret;
- }
-
- /**
- * Return needed packages and packages to be removed
- * during autoinstallation.
- * @return map of lists.
- */
- global define map AutoPackages() ``{
-
- if (start)
- required_packages = (list<string>)
- union (required_packages, ["pam_ldap", "nss_ldap"]);
- list<string> install_pkgs = UpdatedArchPackages (required_packages);
- list remove_pkgs = [];
- return ($["install": install_pkgs, "remove": remove_pkgs]);
- }
-
- /**
* Set the value of bind_pass variable
* @param pass new password valure
*/
Modified: trunk/ldap-client/src/ldap.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap.ycp?rev=47528&r1=47527&r2=47528&view=diff
==============================================================================
--- trunk/ldap-client/src/ldap.ycp (original)
+++ trunk/ldap-client/src/ldap.ycp Wed May 14 15:14:51 2008
@@ -29,24 +29,6 @@
// --------------------------------- cmd-line handlers
/**
- * Enable or disable LDAP authentication
- * @param options a list of parameters passed as args
- * @return boolean true on success
- */
-define boolean LdapEnableHandler( map