Hello community,
here is the log from the commit of package yast2-ldap-client
checked in at Fri Aug 25 15:41:08 CEST 2006.
--------
--- yast2-ldap-client/yast2-ldap-client.changes 2006-07-26 14:55:36.000000000 +0200
+++ yast2-ldap-client/yast2-ldap-client.changes 2006-08-25 15:15:12.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Aug 25 12:50:31 CEST 2006 - jsuchome@suse.cz
+
+- adapted for pam-config usage (F300956)
+- API of PamSettings module is obsolete
+- 2.14.0
+
+-------------------------------------------------------------------
Old:
----
yast2-ldap-client-2.13.20.tar.bz2
New:
----
yast2-ldap-client-2.14.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ldap-client.spec ++++++
--- /var/tmp/diff_new_pack.69j1om/_old 2006-08-25 15:40:49.000000000 +0200
+++ /var/tmp/diff_new_pack.69j1om/_new 2006-08-25 15:40:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ldap-client (Version 2.13.20)
+# spec file for package yast2-ldap-client (Version 2.14.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,16 +11,18 @@
# norootforbuild
Name: yast2-ldap-client
-Version: 2.13.20
+Version: 2.14.0
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ldap-client-2.13.20.tar.bz2
+Source0: yast2-ldap-client-2.14.0.tar.bz2
prefix: /usr
BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-network yast2-pam yast2-testsuite
PreReq: %fillup_prereq
-Requires: yast2 yast2-pam yast2-ldap yast2-slp yast2-network
+Requires: yast2 yast2-ldap yast2-slp yast2-network
+# new API of Pam.ycp
+Requires: yast2-pam >= 2.14.0
Provides: yast2-config-ldap_client
Obsoletes: yast2-config-ldap_client
Provides: yast2-trans-ldap_client
@@ -40,7 +42,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-ldap-client-2.13.20
+%setup -n yast2-ldap-client-2.14.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -80,6 +82,10 @@
/var/adm/fillup-templates/sysconfig.ldap
%changelog -n yast2-ldap-client
+* Fri Aug 25 2006 - jsuchome@suse.cz
+- adapted for pam-config usage (F300956)
+- API of PamSettings module is obsolete
+- 2.14.0
* Wed Jul 26 2006 - jsuchome@suse.cz
- allow setting of pam_mkhomedir in /etc/pam.d/commond-session (#190330)
- 2.13.20
++++++ yast2-ldap-client-2.13.20.tar.bz2 -> yast2-ldap-client-2.14.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.13.20/Makefile.am new/yast2-ldap-client-2.14.0/Makefile.am
--- old/yast2-ldap-client-2.13.20/Makefile.am 2006-06-26 09:18:13.000000000 +0200
+++ new/yast2-ldap-client-2.14.0/Makefile.am 2006-01-27 08:43:12.000000000 +0100
@@ -8,7 +8,6 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -96,7 +95,7 @@
done
pot:
- $(Y2TOOL) y2makepot -s $(srcdir)
+ y2tool y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -117,7 +116,7 @@
fi
spellcheck: pot
- $(Y2TOOL) pot-spellcheck
+ y2tool pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -144,20 +143,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(Y2TOOL); then \
- echo "$(Y2TOOL): not found."; \
+ if ! test -x $(PREFIX)/bin/y2tool; then \
+ echo "$(PREFIX)/bin/y2tool: not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
+ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
-TAGVERSION = $(Y2TOOL) tagversion
+TAGVERSION = $(PREFIX)/bin/y2tool tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -200,13 +199,10 @@
false; \
fi
-check-textdomain:
- $(Y2TOOL) check-textdomain $(srcdir)
-
stable: checkin-stable
checkin-stable: package
- $(Y2TOOL) checkin-stable
+ $(PREFIX)/bin/y2tool checkin-stable
# For po/ modules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.13.20/Makefile.in new/yast2-ldap-client-2.14.0/Makefile.in
--- old/yast2-ldap-client-2.13.20/Makefile.in 2006-06-26 09:18:20.000000000 +0200
+++ new/yast2-ldap-client-2.14.0/Makefile.in 2006-01-27 08:43:17.000000000 +0100
@@ -198,7 +198,6 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS)
ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4)
HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE)
@@ -228,7 +227,7 @@
$(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1)
@CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc
@CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc
-TAGVERSION = $(Y2TOOL) tagversion
+TAGVERSION = $(PREFIX)/bin/y2tool tagversion
# test ! -d $(srcdir)/po \
# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
@@ -725,7 +724,7 @@
done
pot:
- $(Y2TOOL) y2makepot -s $(srcdir)
+ y2tool y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -746,7 +745,7 @@
fi
spellcheck: pot
- $(Y2TOOL) pot-spellcheck
+ y2tool pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -773,18 +772,18 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(Y2TOOL); then \
- echo "$(Y2TOOL): not found."; \
+ if ! test -x $(PREFIX)/bin/y2tool; then \
+ echo "$(PREFIX)/bin/y2tool: not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
+ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -827,13 +826,10 @@
false; \
fi
-check-textdomain:
- $(Y2TOOL) check-textdomain $(srcdir)
-
stable: checkin-stable
checkin-stable: package
- $(Y2TOOL) checkin-stable
+ $(PREFIX)/bin/y2tool checkin-stable
# For po/ modules
checkpo:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.13.20/VERSION new/yast2-ldap-client-2.14.0/VERSION
--- old/yast2-ldap-client-2.13.20/VERSION 2006-07-26 14:34:06.000000000 +0200
+++ new/yast2-ldap-client-2.14.0/VERSION 2006-08-24 16:20:40.000000000 +0200
@@ -1 +1 @@
-2.13.20
+2.14.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.13.20/configure new/yast2-ldap-client-2.14.0/configure
--- old/yast2-ldap-client-2.13.20/configure 2006-06-26 09:18:18.000000000 +0200
+++ new/yast2-ldap-client-2.14.0/configure 2006-01-27 08:43:15.000000000 +0100
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-ldap-client 2.13.18.
+# Generated by GNU Autoconf 2.59 for yast2-ldap-client 2.13.7.
#
-# Report bugs to http://bugs.opensuse.org/.
+# Report bugs to http://www.suse.de/feedback.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -269,9 +269,9 @@
# Identity of this package.
PACKAGE_NAME='yast2-ldap-client'
PACKAGE_TARNAME='yast2-ldap-client'
-PACKAGE_VERSION='2.13.18'
-PACKAGE_STRING='yast2-ldap-client 2.13.18'
-PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
+PACKAGE_VERSION='2.13.7'
+PACKAGE_STRING='yast2-ldap-client 2.13.7'
+PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
ac_default_prefix=/usr
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-ldap-client 2.13.18 to adapt to many kinds of systems.
+\`configure' configures yast2-ldap-client 2.13.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-ldap-client 2.13.18:";;
+ short | recursive ) echo "Configuration of yast2-ldap-client 2.13.7:";;
esac
cat <<\_ACEOF
@@ -812,7 +812,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to http://bugs.opensuse.org/.
+Report bugs to http://www.suse.de/feedback.
_ACEOF
fi
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ldap-client configure 2.13.18
+yast2-ldap-client configure 2.13.7
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-ldap-client $as_me 2.13.18, which was
+It was created by yast2-ldap-client $as_me 2.13.7, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-ldap-client'
- VERSION='2.13.18'
+ VERSION='2.13.7'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.18"
+VERSION="2.13.7"
RPMNAME="yast2-ldap-client"
MAINTAINER="Jiri Suchomel "
@@ -2693,7 +2693,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-ldap-client $as_me 2.13.18, which was
+This file was extended by yast2-ldap-client $as_me 2.13.7, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-ldap-client config.status 2.13.18
+yast2-ldap-client config.status 2.13.7
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.13.20/configure.in new/yast2-ldap-client-2.14.0/configure.in
--- old/yast2-ldap-client-2.13.20/configure.in 2006-06-26 09:18:13.000000000 +0200
+++ new/yast2-ldap-client-2.14.0/configure.in 2006-01-27 08:43:12.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-ldap-client
dnl
-dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ldap-client, 2.13.18, http://bugs.opensuse.org/, yast2-ldap-client)
+AC_INIT(yast2-ldap-client, 2.13.7, http://www.suse.de/feedback, yast2-ldap-client)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.18"
+VERSION="2.13.7"
RPMNAME="yast2-ldap-client"
MAINTAINER="Jiri Suchomel "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.13.20/ldap-client.pot new/yast2-ldap-client-2.14.0/ldap-client.pot
--- old/yast2-ldap-client-2.13.20/ldap-client.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ldap-client-2.14.0/ldap-client.pot 2005-09-27 14:00:15.000000000 +0200
@@ -0,0 +1,953 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-09-27 14:00+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. summary item
+#: src/Ldap.ycp:406
+msgid "LDAP Client enabled"
+msgstr ""
+
+#. summary (is LDAP enabled?)
+#. summary (LDAP version 2?)
+#. summary (use TLS?)
+#. summary (client enabled?)
+#: src/Ldap.ycp:408 src/Ldap.ycp:418 src/Ldap.ycp:422 src/Ldap.ycp:441
+msgid "Yes"
+msgstr ""
+
+#. summary item
+#: src/Ldap.ycp:410
+msgid "LDAP Domain"
+msgstr ""
+
+#. summary item
+#: src/Ldap.ycp:413
+msgid "LDAP Server"
+msgstr ""
+
+#. summary item
+#: src/Ldap.ycp:416
+msgid "LDAP Version 2"
+msgstr ""
+
+#. summary item
+#: src/Ldap.ycp:420
+msgid "LDAP TLS/SSL"
+msgstr ""
+
+#. summary text
+#: src/Ldap.ycp:435
+#, ycp-format
+msgid "<b>Servers</b>:%1<br>"
+msgstr ""
+
+#. summary text
+#: src/Ldap.ycp:437
+#, ycp-format
+msgid "<b>Base DN</b>:%1<br>"
+msgstr ""
+
+#. summary text (yes/no follows)
+#: src/Ldap.ycp:439
+#, ycp-format
+msgid "<b>Client Enabled</b>:%1<br>"
+msgstr ""
+
+#. summary (client enabled?)
+#: src/Ldap.ycp:443
+msgid "No"
+msgstr ""
+
+#. error message:
+#: src/Ldap.ycp:688
+msgid ""
+"\n"
+"Server could be down or unreachable."
+msgstr ""
+
+#. error message:
+#: src/Ldap.ycp:692
+msgid ""
+"\n"
+"Value of DN is missing or invalid."
+msgstr ""
+
+#. error message:
+#: src/Ldap.ycp:696
+msgid ""
+"\n"
+"Attribute type not found.\n"
+msgstr ""
+
+#. error message:
+#: src/Ldap.ycp:700
+msgid ""
+"\n"
+"Object class not found.\n"
+msgstr ""
+
+#. error message, more specific description follows
+#: src/Ldap.ycp:706
+msgid "Connection to LDAP server cannot be established."
+msgstr ""
+
+#. error message, more specific description follows
+#: src/Ldap.ycp:708
+msgid "Problem with connecting to the LDAP server."
+msgstr ""
+
+#. error message, more specific description follows
+#: src/Ldap.ycp:710
+msgid "Problem with reading data from the LDAP server."
+msgstr ""
+
+#. error message, more specific description follows
+#: src/Ldap.ycp:712
+msgid "There was a problem with writing LDAP users."
+msgstr ""
+
+#. error message, more specific description follows
+#: src/Ldap.ycp:714
+msgid "There was a problem with writing LDAP groups."
+msgstr ""
+
+#. error message, more specific description follows
+#: src/Ldap.ycp:716
+msgid "There was a problem with writing data to LDAP server."
+msgstr ""
+
+#. error message, more specific description follows
+#: src/Ldap.ycp:718
+msgid "Problem with reading schema from the LDAP server."
+msgstr ""
+
+#. default error message
+#: src/Ldap.ycp:736
+msgid "Unknown LDAP error"
+msgstr ""
+
+#. checkbox label
+#: src/Ldap.ycp:741
+msgid "&Show Details"
+msgstr ""
+
+#. error message
+#: src/Ldap.ycp:850
+msgid "Unknown error. Perhaps 'yast2-ldap' is not available."
+msgstr ""
+
+#. password entering label
+#: src/Ldap.ycp:894
+msgid "&Enter the Password for LDAP Server:"
+msgstr ""
+
+#. label
+#: src/Ldap.ycp:896
+#, ycp-format
+msgid "Server: %1"
+msgstr ""
+
+#. label (%1 is admin DN - string)
+#: src/Ldap.ycp:898
+#, ycp-format
+msgid "Administrator: %1"
+msgstr ""
+
+#. button label
+#: src/Ldap.ycp:903
+msgid "&Anonymous Access"
+msgstr ""
+
+#. error message, %1 is DN
+#: src/Ldap.ycp:1234
+#, ycp-format
+msgid ""
+"A direct parent for DN '%1' \n"
+"does not exist in the LDAP directory.\n"
+"The object with the selected DN cannot be created.\n"
+msgstr ""
+
+#. error message
+#: src/Ldap.ycp:1440
+msgid ""
+"Object with selected DN exists, but it is not a template object.\n"
+"Select another one.\n"
+msgstr ""
+
+#. progress caption
+#: src/Ldap.ycp:1854
+msgid "Writing LDAP Configuration..."
+msgstr ""
+
+#. progress stage label
+#: src/Ldap.ycp:1859
+msgid "Stop services"
+msgstr ""
+
+#. progress stage label
+#: src/Ldap.ycp:1861
+msgid "Update configuration files"
+msgstr ""
+
+#. progress stage label
+#: src/Ldap.ycp:1863
+msgid "Start services"
+msgstr ""
+
+#. progress stage label
+#: src/Ldap.ycp:1865
+msgid "Update configuration in LDAP directory"
+msgstr ""
+
+#. progress step label
+#: src/Ldap.ycp:1868
+msgid "Stopping services..."
+msgstr ""
+
+#. progress step label
+#: src/Ldap.ycp:1870
+msgid "Updating configuration files..."
+msgstr ""
+
+#. progress step label
+#: src/Ldap.ycp:1872
+msgid "Starting services..."
+msgstr ""
+
+#. progress step label
+#: src/Ldap.ycp:1874
+msgid "Updating configuration in LDAP directory..."
+msgstr ""
+
+#. final progress step label
+#: src/Ldap.ycp:1876
+msgid "Finished"
+msgstr ""
+
+#. yes/no popup, %1 is value of DN
+#: src/Ldap.ycp:2160
+#, ycp-format
+msgid ""
+"No entry with DN '%1'\n"
+"exists on the LDAP server. Create it now?\n"
+msgstr ""
+
+#. button label
+#: src/LdapPopup.ycp:55
+msgid "&Open"
+msgstr ""
+
+#. help text 1/3
+#: src/LdapPopup.ycp:223
+msgid "<p>Set the new value for the current attribute.</p>"
+msgstr ""
+
+#. help text 2/3
+#: src/LdapPopup.ycp:226
+msgid ""
+"<p>If the attribute can have more values, add new entries\n"
+"with <b>Add Value</b>. Sometimes the button contains the list of\n"
+"possible values to use for the current attribute.\n"
+"If the value of the edited attribute should be a distinguished name (DN),\n"
+"it is possible to choose it from LDAP tree using <b>Browse</b>.\n"
+"</p>\n"
+msgstr ""
+
+#. help text 3/3, %1 is attribute name, description follows.
+#. The description will be not translated: maybe add a note
+#. "available only in english" to the sentence for other languages?
+#. Example:
+#. "<p>The description of attribute \"%1\"<br>(available only in english):</p>"
+#. or:
+#. "<p>The description (only in english) of attribute \"%1\":<br></p>"
+#: src/LdapPopup.ycp:244
+#, ycp-format
+msgid "<p>The description of attribute \"%1\":<br></p>"
+msgstr ""
+
+#. textentry label
+#: src/LdapPopup.ycp:263
+#, ycp-format
+msgid "&Value of \"%1\" Attribute"
+msgstr ""
+
+#. textentry label
+#: src/LdapPopup.ycp:269
+#, ycp-format
+msgid "&Values of \"%1\" Attribute"
+msgstr ""
+
+#. button label
+#: src/LdapPopup.ycp:284 src/LdapPopup.ycp:296
+msgid "&Add Value"
+msgstr ""
+
+#. menubutton item (default value)
+#: src/LdapPopup.ycp:289
+msgid "&Empty Entry"
+msgstr ""
+
+#. button label
+#: src/LdapPopup.ycp:291 src/ui.ycp:631 src/ui.ycp:664
+msgid "Bro&wse"
+msgstr ""
+
+#. error popup
+#: src/LdapPopup.ycp:370
+#, ycp-format
+msgid ""
+"The value '%1' already exists.\n"
+"Please select another one."
+msgstr ""
+
+#. description of configuration object
+#: src/LdapPopup.ycp:395
+msgid "Configuration of user management tools"
+msgstr ""
+
+#. description of configuration object
+#: src/LdapPopup.ycp:397
+msgid "Configuration of group management tools"
+msgstr ""
+
+#. label
+#: src/LdapPopup.ycp:400
+msgid "Object Class of New Module"
+msgstr ""
+
+#. textentry label, do not translate "cn"
+#: src/LdapPopup.ycp:413
+msgid "&Name of New Module (\"cn\" value)"
+msgstr ""
+
+#. error popup
+#: src/LdapPopup.ycp:440
+msgid ""
+"The entered value already exists.\n"
+"Select another one.\n"
+msgstr ""
+
+#. error popup
+#: src/LdapPopup.ycp:448
+msgid "Enter the module name."
+msgstr ""
+
+#. help text 1/3
+#: src/LdapPopup.ycp:468
+msgid ""
+"<p>Here, set the values of attributes belonging\n"
+"to an object using the current template. Such values are used as defaults when\n"
+"the new object is created.</p>\n"
+msgstr ""
+
+#.
+#. // help text 2/3 do not translate "defaultObjectClass"
+#. _("<p>The list of attributes provided in <b>Attribute Name</b> is the
+#. list of allowed attributes for objects described in the \"defaultObjectClass\"
+#. entry of the current template.</p>
+#. ") +
+#.
+#. help text 3/3 do not translate "homedirectory"
+#: src/LdapPopup.ycp:482
+msgid ""
+"<p>You can use special syntax to create attribute\n"
+"values from existing ones. The expression <i>%attr_name</i> will be replaced\n"
+"with the value of attribute \"attr_name\" (for example, use \"/home/%uid\"\n"
+"as a value of \"homeDirectory\").</p>\n"
+msgstr ""
+
+#. combobox label
+#: src/LdapPopup.ycp:496
+msgid "Attribute &Name"
+msgstr ""
+
+#. textentry label
+#: src/LdapPopup.ycp:500
+msgid "Attribute &Value"
+msgstr ""
+
+#. translators: command line help text for Ldap client module
+#: src/ldap.ycp:91
+msgid "LDAP client configuration module."
+msgstr ""
+
+#. translators: command line help text for pam action
+#: src/ldap.ycp:99
+msgid "Enable or disable authentication with LDAP"
+msgstr ""
+
+#. translators: command line help text for summary action
+#: src/ldap.ycp:104
+msgid "Configuration summary of LDAP client"
+msgstr ""
+
+#. translators: command line help text for configure action
+#: src/ldap.ycp:109
+msgid "Change the global settings of LDAP client"
+msgstr ""
+
+#. translators: command line help text for pam enable option
+#: src/ldap.ycp:115
+msgid "Enable the service"
+msgstr ""
+
+#. translators: command line help text for pam disable option
+#: src/ldap.ycp:119
+msgid "Disable the service"
+msgstr ""
+
+#. translators: command line help text for the server option
+#: src/ldap.ycp:123
+msgid "The LDAP server name"
+msgstr ""
+
+#. translators: command line help text for the base option
+#: src/ldap.ycp:128
+msgid "Distinguished Name (DN) of the search base"
+msgstr ""
+
+#. popup text
+#: src/ui.ycp:76
+msgid "Really abort the writing process?"
+msgstr ""
+
+#. help text
+#: src/ui.ycp:84
+msgid "Writing LDAP Client Settings"
+msgstr ""
+
+#. popup window
+#: src/ui.ycp:100
+msgid "Scanning for LDAP servers provided by SLP..."
+msgstr ""
+
+#. multiselection box label
+#: src/ui.ycp:119
+msgid "LDAP &Servers Provided by SLP:"
+msgstr ""
+
+#. help text 1/9
+#: src/ui.ycp:147
+msgid ""
+"<p>Here, your machine can be set up as an\n"
+"<b>LDAP client</b>.</p>"
+msgstr ""
+
+#. help text 2/9
+#: src/ui.ycp:151
+msgid "<p>To authenticate your users with an OpenLDAP server, select <b>Use LDAP</b>. NSS and PAM will be configured accordingly.</p>"
+msgstr ""
+
+#. help text 3/9
+#: src/ui.ycp:154
+msgid ""
+"<p>To deactivate LDAP services, click <b>Do Not Use LDAP</b>.\n"
+"If you deactivate LDAP, the current LDAP entry for passwd in /etc/nsswitch.conf\n"
+"will be removed. The PAM configuration will be modified and the LDAP entry\n"
+"removed.</p>"
+msgstr ""
+
+#. help text 3.5/9
+#: src/ui.ycp:160
+msgid "<p>To activate LDAP but forbid users from logging in to this machine, select <b>Enable LDAP Users but Disable Logins</b>.</p>"
+msgstr ""
+
+#. help text 4/9
+#: src/ui.ycp:163
+msgid ""
+"<p>Enter the LDAP server's <b>address</b> (e.g., ldap.example.com or 10.20.0.2) in the first entry and <b>Distinguished Name</b> of the search base (\"base DN\", such as dc=example,dc=com) in the second. Specify multiple servers\n"
+"by separating their addresses with spaces. It must be possible to resolve the\n"
+"addresses without using LDAP. You can also specify the port on which the server is running using the syntax \"server:port\", for example, ldap.example.com:379.\n"
+"</p>\n"
+msgstr ""
+
+#. help text 5/9
+#: src/ui.ycp:170
+msgid "<p>With <b>Find</b>, select the LDAP server from the list provided by the service location protocol (SLP). Using <b>Fetch DN</b>, read the base DN from server.</p>"
+msgstr ""
+
+#. help text 6/9
+#: src/ui.ycp:173
+msgid ""
+"<p>Some LDAP servers support StartTLS [RFC2830].\n"
+"If your server supports it and it is configured, activate <b>LDAP TLS/SSL</b>\n"
+"to encrypt your communication with the LDAP server.</p>"
+msgstr ""
+
+#. help text 7/9
+#: src/ui.ycp:178
+msgid ""
+"<p>Normally, the LDAP version 3 protocol will be used. If you have\n"
+"an LDAP server using protocol 2 (for example, OpenLDAP v1), activate\n"
+"<b>LDAP Version 2</b>.</p>\n"
+msgstr ""
+
+#. help text 8/9
+#: src/ui.ycp:184
+msgid ""
+"<p>For configuration of advanced LDAP settings, click\n"
+"<b>Advanced Configuration</b>.</p>\n"
+msgstr ""
+
+#. help text 9/9 (additional)
+#: src/ui.ycp:188
+msgid ""
+"<p><b>Automounter</b> is a daemon that automatically mounts directories,\n"
+"such as users' home directories.\n"
+"It is assumed that its configuration files (auto.*) already exist\n"
+"locally or over LDAP.\n"
+"If it is not installed and you want to use it, it is installed\n"
+"automatically.</p>\n"
+msgstr ""
+
+#. check box label
+#: src/ui.ycp:215
+msgid "Start Auto&mounter"
+msgstr ""
+
+#. frame label
+#: src/ui.ycp:223
+msgid "User Authentication"
+msgstr ""
+
+#. radio button label
+#: src/ui.ycp:229
+msgid "Do N&ot Use LDAP"
+msgstr ""
+
+#. radio button label
+#: src/ui.ycp:232
+msgid "&Use LDAP"
+msgstr ""
+
+#. radio button label
+#: src/ui.ycp:235
+msgid "Use LDAP but Disable &Logins"
+msgstr ""
+
+#. frame label
+#: src/ui.ycp:243
+msgid "LDAP client"
+msgstr ""
+
+#. text entry label
+#: src/ui.ycp:247
+msgid "Addresses of LDAP &Servers"
+msgstr ""
+
+#. push button label
+#: src/ui.ycp:252
+msgid "F&ind"
+msgstr ""
+
+#. text entry label
+#: src/ui.ycp:257
+msgid "LDAP base &DN"
+msgstr ""
+
+#. push button label
+#: src/ui.ycp:261
+msgid "F&etch DN"
+msgstr ""
+
+#. check box label
+#: src/ui.ycp:266
+msgid "LDAP &TLS/SSL"
+msgstr ""
+
+#. check box label
+#: src/ui.ycp:269
+msgid "LDAP &Version 2"
+msgstr ""
+
+#. pushbutton label
+#: src/ui.ycp:275
+msgid "&Advanced Configuration..."
+msgstr ""
+
+#. dialog title
+#. dialog label
+#: src/ui.ycp:280 src/wizards.ycp:73
+msgid "LDAP Client Configuration"
+msgstr ""
+
+#. error popup label
+#: src/ui.ycp:330
+msgid "Enter an LDAP base DN."
+msgstr ""
+
+#. error popup label
+#: src/ui.ycp:338
+msgid "Enter at least one address of an LDAP server."
+msgstr ""
+
+#. popup question: user enabled LDAP now, but probably has
+#. enabled NIS client before
+#: src/ui.ycp:354
+msgid ""
+"When you configure your machine as an LDAP client,\n"
+"you cannot retrieve data with NIS. Are you sure?\n"
+msgstr ""
+
+#. popup question
+#: src/ui.ycp:368
+msgid ""
+"An active configuration of the Kerberos client is present.\n"
+"Which should be used as the primary authentication service?\n"
+msgstr ""
+
+#. button label (authentication service)
+#: src/ui.ycp:372
+msgid "&LDAP"
+msgstr ""
+
+#. button label (authentication service)
+#: src/ui.ycp:374
+msgid "&Kerberos"
+msgstr ""
+
+#. popup text
+#: src/ui.ycp:432
+msgid "Now you have enabled LDAP."
+msgstr ""
+
+#. message popup, part 1/2
+#: src/ui.ycp:436
+msgid ""
+"This change only affects newly created processes and not already\n"
+"running services. Restart your services manually or reboot \n"
+"the machine to enable it for all services.\n"
+msgstr ""
+
+#. message popup, part 1/2
+#: src/ui.ycp:445
+msgid ""
+"\n"
+"To enable remote login for LDAP users, 'sshd' will be\n"
+"restarted automatically by YaST.\n"
+msgstr ""
+
+#. help text caption 1
+#: src/ui.ycp:476
+msgid "<p><b>Advanced LDAP Client Settings</b></p>"
+msgstr ""
+
+#. help text 1/3
+#: src/ui.ycp:479
+msgid ""
+"<p>Specify the search bases to use for specific maps (users, passwords, and groups) if they are different from the base DN. These values are\n"
+"set to the nss_base_passwd, nss_base_shadow, and nss_base_group attributes\n"
+"in /etc/ldap.conf file.</p>\n"
+msgstr ""
+
+#. help text 2/3
+#: src/ui.ycp:485
+msgid "<p><b>Password Change Protocol</b> refers to the pam_password attribute of /etc/ldap.conf file. See <tt>man pam_ldap</tt> for the meaning of its values.</p>"
+msgstr ""
+
+#. help text 3/3, %1 is attribute name
+#: src/ui.ycp:488
+#, ycp-format
+msgid ""
+"<p>Set the type of LDAP groups you are using.\n"
+"The default value for <b>Group Member Attribute</b> is <i>%1</i>.</p>"
+msgstr ""
+
+#. help text caption 2
+#: src/ui.ycp:494
+msgid "<p><b>Access to Server</b></p>"
+msgstr ""
+
+#. help text 1/4
+#: src/ui.ycp:497
+msgid ""
+"<p>First, set <b>Configuration Base DN</b>.\n"
+"It is the base for storing your configuration data, which is saved on the LDAP\n"
+"server.</p>\n"
+msgstr ""
+
+#. help text 2/4
+#: src/ui.ycp:503
+msgid ""
+"<p>To access the data stored on the server, enter the\n"
+"<b>Administrator DN</b> (e.g., cn=Administrator,dc=mydomain,dc=com).</p>\n"
+msgstr ""
+
+#. help text 3/4
+#: src/ui.ycp:508
+msgid ""
+"<p>To create the default configuration objects for LDAP users and groups,\n"
+"check <b>Create Default Configuration Objects</b>. The objects are only created when they do not already exist.</p>\n"
+msgstr ""
+
+#. help text 4/4
+#: src/ui.ycp:513
+msgid ""
+"<p>Press <b>Configure</b> to configure settings stored on the\n"
+"LDAP server. You will be asked for the password if you are not connected yet or\n"
+"have changed your configuration.</p>\n"
+msgstr ""
+
+#. help text caption 3
+#: src/ui.ycp:519
+msgid "<p><b>Home Directories</b></p>"
+msgstr ""
+
+#. help text 1/1
+#: src/ui.ycp:522
+msgid ""
+"<p>If home directories of users should be stored on this machine,\n"
+"check the appropriate option. Changing this value does not cause any direct\n"
+"action. It is only information for the YaST users module, which can manage\n"
+"user home directories.</p>\n"
+msgstr ""
+
+#. tab label
+#: src/ui.ycp:573
+msgid "C&lient Settings"
+msgstr ""
+
+#. tab label
+#: src/ui.ycp:575
+msgid "Ad&ministration Settings"
+msgstr ""
+
+#. frame label
+#: src/ui.ycp:601
+msgid "Naming Contexts"
+msgstr ""
+
+#. textentry label
+#: src/ui.ycp:607
+msgid "&User Map"
+msgstr ""
+
+#. button label
+#: src/ui.ycp:611
+msgid "&Browse"
+msgstr ""
+
+#. textentry label
+#: src/ui.ycp:617
+msgid "&Password Map"
+msgstr ""
+
+#. button label
+#: src/ui.ycp:621
+msgid "Br&owse"
+msgstr ""
+
+#. textentry label
+#: src/ui.ycp:627
+msgid "&Group Map"
+msgstr ""
+
+#. combobox label
+#: src/ui.ycp:641
+msgid "Pa&ssword Change Protocol"
+msgstr ""
+
+#. combobox label
+#: src/ui.ycp:645
+msgid "G&roup Member Attribute"
+msgstr ""
+
+#. textentry label
+#: src/ui.ycp:660
+msgid "Configuration &Base DN"
+msgstr ""
+
+#. textentry label
+#: src/ui.ycp:670
+msgid "Administrator &DN"
+msgstr ""
+
+#. checkbox label
+#: src/ui.ycp:674
+msgid "Crea&te Default Configuration Objects"
+msgstr ""
+
+#. pushbutton label
+#: src/ui.ycp:678
+msgid "Configure User Management &Settings..."
+msgstr ""
+
+#. checkbox label
+#: src/ui.ycp:682
+msgid "&Home Directories on This Machine"
+msgstr ""
+
+#. dialog label
+#: src/ui.ycp:699
+msgid "Advanced Configuration"
+msgstr ""
+
+#. error popup label
+#: src/ui.ycp:772
+msgid "Enter the DN used for binding to the LDAP server."
+msgstr ""
+
+#. error popup label
+#: src/ui.ycp:780
+msgid "Enter the configuration base DN"
+msgstr ""
+
+#. yes/no popup
+#: src/ui.ycp:867
+msgid ""
+"Reread settings from server?\n"
+"All changes will be lost.\n"
+msgstr ""
+
+#. help text 1/3
+#: src/ui.ycp:891
+msgid ""
+"<p>Here, configure the template used for\n"
+"creating new objects (like users or groups).</p>\n"
+msgstr ""
+
+#. help text 2/3
+#: src/ui.ycp:896
+msgid ""
+"<p>Edit the template attribute values with <b>Edit</b>.\n"
+"Changing the <b>cn</b> value renames the template.</p>\n"
+msgstr ""
+
+#. help text 3/3
+#: src/ui.ycp:901
+msgid ""
+"<p>The second table contains a list of <b>default values</b>, used\n"
+"for new objects. Modify the list by adding new values and editing or\n"
+"removing current ones.</p>\n"
+msgstr ""
+
+#. table header 1/2
+#: src/ui.ycp:943 src/ui.ycp:1233
+msgid "Attribute"
+msgstr ""
+
+#. table header 2/2
+#: src/ui.ycp:945 src/ui.ycp:1235
+msgid "Value"
+msgstr ""
+
+#. label (table folows)
+#: src/ui.ycp:952
+msgid "Default Values for New Objects"
+msgstr ""
+
+#. table header 1/2
+#: src/ui.ycp:955
+msgid "Attribute of Object"
+msgstr ""
+
+#. table header 2/2
+#: src/ui.ycp:957
+msgid "Default Value"
+msgstr ""
+
+#. button label (with non-default shortcut)
+#: src/ui.ycp:961
+msgid "A&dd"
+msgstr ""
+
+#. button label
+#: src/ui.ycp:963
+msgid "&Edit"
+msgstr ""
+
+#. dialog label
+#: src/ui.ycp:973
+msgid "Object Template Configuration"
+msgstr ""
+
+#. yes/no popup, %1 is name
+#: src/ui.ycp:1072
+#, ycp-format
+msgid "Really delete default attribute \"%1\"?"
+msgstr ""
+
+#. error popup, %1 is attribute name
+#: src/ui.ycp:1094 src/ui.ycp:1274
+#, ycp-format
+msgid ""
+"The \"%1\" attribute is mandatory.\n"
+"Enter a value."
+msgstr ""
+
+#. helptext 1/4
+#: src/ui.ycp:1116
+msgid "<p>Here, manage the configuration stored in LDAP directory.</p>"
+msgstr ""
+
+#. helptext 2/4
+#: src/ui.ycp:1119
+msgid ""
+"<p>Each configuration set is called a <b>configuration module</b>. If there\n"
+"is no configuration module in the provided location (Base Configuration),\n"
+"create one with <b>New</b>. Delete the current module\n"
+"using <b>Delete</b>.</p>\n"
+msgstr ""
+
+#. helptext 3/4
+#: src/ui.ycp:1126
+msgid ""
+"<p>Edit the values of attributes in the table with <b>Edit</b>.\n"
+"Some values have special meanings, for example, changing the <b>cn</b> value renames the\n"
+"current module.</p>\n"
+msgstr ""
+
+#. helptext 4/4
+#: src/ui.ycp:1132
+msgid ""
+"<p>To configure the default template of the current module,\n"
+"click <b>Configure Template</b>.\n"
+"</p>\n"
+msgstr ""
+
+#. combobox label
+#: src/ui.ycp:1200
+msgid "Configuration &Module"
+msgstr ""
+
+#. button label
+#: src/ui.ycp:1217
+msgid "C&onfigure Template"
+msgstr ""
+
+#. dialog label
+#: src/ui.ycp:1247
+msgid "Module Configuration"
+msgstr ""
+
+#. yes/no popup, %1 is name
+#: src/ui.ycp:1298
+#, ycp-format
+msgid "Really delete module \"%1\"?"
+msgstr ""
+
+#. message
+#: src/ui.ycp:1330
+msgid ""
+"You currently have configuration modules\n"
+"of each type, so you cannot add a new one."
+msgstr ""
+
+#. label (init dialog)
+#: src/wizards.ycp:75
+msgid "Initializing ..."
+msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.13.20/src/Ldap.ycp new/yast2-ldap-client-2.14.0/src/Ldap.ycp
--- old/yast2-ldap-client-2.13.20/src/Ldap.ycp 2006-07-26 14:17:55.000000000 +0200
+++ new/yast2-ldap-client-2.14.0/src/Ldap.ycp 2006-08-25 12:49:20.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Thorsten Kukuk
* Anas Nashif
*
- * $Id: Ldap.ycp 31792 2006-07-12 08:50:58Z jsuchome $
+ * $Id: Ldap.ycp 32008 2006-07-26 13:02:35Z jsuchome $
*/
{
@@ -22,7 +22,6 @@
import "Nsswitch";
import "Package";
import "Pam";
- import "PamSettings";
import "Popup";
import "ProductFeatures";
import "Progress";
@@ -155,16 +154,6 @@
// if LDAP configuration objects should be created automaticaly
global boolean create_ldap = false;
- // if authentication is currently done via Kerberos
- global boolean krb_first = false;
-
- // if kerberos authentication should remain primary one
- global boolean krb_authentication = nil;
-
- // current pam modules called by pam_unix (value of call_modules=... in
- // /etc/security/pam_unix2)
- list<string> auth_modules = [];
-
// if eDirectory is used as server
global boolean nds = false;
@@ -297,6 +286,10 @@
]
];
+ /**
+ * if pam_mkhomedir is set in /etc/pam.d/commond-session
+ */
+ global boolean mkhomedir = false;
//----------------------------------------------------------------
@@ -669,36 +662,10 @@
});
}
- list<string> auth = PamSettings::GetValues ("pam_unix2", "auth");
- integer ldap_pos = -1;
- integer krb_pos = -1;
- integer pos = -1;
- boolean comment = false;
- foreach (string val, auth, {
- pos = pos + 1;
- if (substring (val, 0, 1) == "#")
- comment = true;
- if (comment)
- return;
- if (issubstring (val, "krb5"))
- krb_pos = pos;
- if (val == "use_ldap")
- ldap_pos = pos;
- if (issubstring (val, "call_modules="))
- {
- list line_split = splitstring (val, "=");
- auth_modules = splitstring (line_split[1]:"",",");
- }
- });
- if (krb_pos != -1 && (ldap_pos == -1 || krb_pos < ldap_pos))
- {
- krb_first = true;
- }
+ mkhomedir = Pam::Enabled ("mkhomedir");
Autologin::Read ();
- Pam::Read ();
-
// Now check if previous configuration of LDAP server didn't proposed
// some better values:
if (Stage::cont ())
@@ -2124,6 +2091,7 @@
else
WriteLdapConfEntry ("ssl", "no");
+ Pam::Set ("mkhomedir", mkhomedir);
}
if (start) // ldap used for authentocation
{
@@ -2162,25 +2130,7 @@
if (!oes)
{
// pam settigs
- foreach (string type, [ "account", "auth", "password" ], {
- PamSettings::AddValue ("pam_unix2", type, "use_ldap");
-
- // prefer kerberos authentication (see #49894)
- if (krb_authentication == true)
- {
- PamSettings::RemoveValue ("unix2", type, "use_krb5");
- if (contains (auth_modules, "krb5afs"))
- {
- PamSettings::RemoveValue ("unix2", type,"call_modules");
- PamSettings::AddValue ("unix2", type,
- "call_modules="+mergestring (auth_modules,","));
- }
- else
- {
- PamSettings::AddValue ("unix2", type, "use_krb5");
- }
- }
- });
+ Pam::Add ("ldap");
// modify sources in /etc/nsswitch.conf
foreach (string db, [ "passwd", "group" ], {
@@ -2223,12 +2173,9 @@
Nsswitch::Write ();
- foreach (string type, [ "account", "auth", "password" ], ``{
- PamSettings::RemoveValue ("pam_unix2", type, "use_ldap");
- });
+ Pam::Remove ("ldap");
}
- Pam::Write (false);
// write the changes in /etc/ldap.conf and /etc/openldap/ldap.conf now
if (!SCR::Write(.etc.ldap_conf, nil))
@@ -2240,12 +2187,6 @@
SCR::UnmountAgent (.etc.ldap_conf);
}
- // write changes to /etc/security/pam_unix2.conf now
- if (!oes)
- {
- PamSettings::Write (false);
- }
-
// write sysconfig values
SCR::Write (.sysconfig.ldap.FILE_SERVER, file_server? "yes": "no");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.13.20/src/Makefile.am new/yast2-ldap-client-2.14.0/src/Makefile.am
--- old/yast2-ldap-client-2.13.20/src/Makefile.am 2006-06-26 09:45:08.000000000 +0200
+++ new/yast2-ldap-client-2.14.0/src/Makefile.am 2006-06-26 09:45:23.000000000 +0200
@@ -1,7 +1,7 @@
#
# Makefile.am for ldap-client/src
#
-# $Id: Makefile.am 31653 2006-06-26 07:46:36Z jsuchome $
+# $Id: Makefile.am 31656 2006-06-26 07:46:55Z jsuchome $
#
yncludedir = @yncludedir@/ldap
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.13.20/src/Makefile.in new/yast2-ldap-client-2.14.0/src/Makefile.in
--- old/yast2-ldap-client-2.13.20/src/Makefile.in 2006-07-26 14:07:02.000000000 +0200
+++ new/yast2-ldap-client-2.14.0/src/Makefile.in 2006-07-11 16:35:08.000000000 +0200
@@ -17,7 +17,7 @@
#
# Makefile.am for ldap-client/src
#
-# $Id: Makefile.am 31653 2006-06-26 07:46:36Z jsuchome $
+# $Id: Makefile.am 31656 2006-06-26 07:46:55Z jsuchome $
#
# Makefile.am.common -*- Makefile -*-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.13.20/src/ui.ycp new/yast2-ldap-client-2.14.0/src/ui.ycp
--- old/yast2-ldap-client-2.13.20/src/ui.ycp 2006-07-26 14:17:24.000000000 +0200
+++ new/yast2-ldap-client-2.14.0/src/ui.ycp 2006-08-25 11:26:56.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Thorsten Kukuk
* Anas Nashif
*
- * $Id: ui.ycp 31792 2006-07-12 08:50:58Z jsuchome $
+ * $Id: ui.ycp 32008 2006-07-26 13:02:35Z jsuchome $
*
* All user interface functions.
*/
@@ -243,7 +243,7 @@
help_text = help_text + autofs_help_text;
}
- boolean mkhomedir = Pam::MkHomeDir ();
+ boolean mkhomedir = Ldap::mkhomedir;
term mkhomedir_term = `VBox (
Ldap::_autofs_allowed ? `VSpacing (0) : `VSpacing (0.5),
`Left(`CheckBox(`id(`mkhomedir),
@@ -337,6 +337,7 @@
server = (string) UI::QueryWidget(`id(`server), `Value);
ldap_v2 = (boolean) UI::QueryWidget(`id(`ldapv), `Value);
ldap_tls = (boolean) UI::QueryWidget(`id(`ldaps), `Value);
+ mkhomedir = (boolean) UI::QueryWidget (`id(`mkhomedir),`Value);
if (result == `slp)
{
@@ -407,33 +408,6 @@
}
}
- if (start && Ldap::krb_first && Ldap::krb_authentication == nil)
- {
- any ret = Popup::AnyQuestion3 (
- Popup::NoHeadline(),
- // popup question
-_("An active configuration of the Kerberos client is present.
-Which should be used as the primary authentication service?
-"),
- // button label (authentication service)
- _("&LDAP"),
- // button label (authentication service)
- _("&Kerberos"),
- Label::CancelButton (),
- `focus_yes
- );
- if (ret == `retry)
- {
- result = `not_next;
- continue;
- }
- else
- {
- Ldap::modified = true;
- Ldap::krb_authentication = (ret == `no);
- }
- }
-
list<string> needed_packages =
Ldap::UpdatedArchPackages (["pam_ldap", "nss_ldap"]);
@@ -465,11 +439,11 @@
if (result == `next || result == `advanced)
{
- Pam::SetMkHomeDir((boolean)UI::QueryWidget(`id(`mkhomedir),`Value));
if (Ldap::start != start || Ldap::GetDomain() != domain ||
Ldap::server != server || Ldap::ldap_v2 != ldap_v2 ||
Ldap::ldap_tls != ldap_tls || Ldap::_start_autofs != autofs ||
- Ldap::login_enabled != login_enabled)
+ Ldap::login_enabled != login_enabled ||
+ Ldap::mkhomedir != mkhomedir)
{
if (result == `next)
{
@@ -506,6 +480,7 @@
Ldap::ldap_tls = ldap_tls;
Ldap::_start_autofs = autofs;
Ldap::login_enabled = login_enabled;
+ Ldap::mkhomedir = mkhomedir;
Ldap::modified = true;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.13.20/testsuite/tests/ConvertDefaultValues.ycp new/yast2-ldap-client-2.14.0/testsuite/tests/ConvertDefaultValues.ycp
--- old/yast2-ldap-client-2.13.20/testsuite/tests/ConvertDefaultValues.ycp 2006-06-26 09:45:08.000000000 +0200
+++ new/yast2-ldap-client-2.14.0/testsuite/tests/ConvertDefaultValues.ycp 2006-06-26 09:45:23.000000000 +0200
@@ -2,7 +2,7 @@
* ConvertDefaultValues.ycp
* Summary: Test of Ldap::ConvertDefaultValues
* Author: Jiri Suchomel
- * $Id: ConvertDefaultValues.ycp 31653 2006-06-26 07:46:36Z jsuchome $
+ * $Id: ConvertDefaultValues.ycp 31656 2006-06-26 07:46:55Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.13.20/testsuite/tests/Read.ycp new/yast2-ldap-client-2.14.0/testsuite/tests/Read.ycp
--- old/yast2-ldap-client-2.13.20/testsuite/tests/Read.ycp 2006-07-26 14:36:59.000000000 +0200
+++ new/yast2-ldap-client-2.14.0/testsuite/tests/Read.ycp 2006-08-25 13:19:39.000000000 +0200
@@ -2,7 +2,7 @@
* Read.ycp
* Test of Ldap:Read function
* Author: Jiri Suchomel
- * $Id: Read.ycp 23172 2005-04-26 13:28:14Z jsuchome $
+ * $Id: Read.ycp 32008 2006-07-26 13:02:35Z jsuchome $
*/
{
@@ -74,6 +74,9 @@
map EX = $[
"target": $[
"bash": 0,
+ "bash_output": $[
+ "stdout" : "",
+ ]
],
"passwd": $[
"init": true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.13.20/testsuite/tests/Routines.ycp new/yast2-ldap-client-2.14.0/testsuite/tests/Routines.ycp
--- old/yast2-ldap-client-2.13.20/testsuite/tests/Routines.ycp 2006-06-26 09:45:08.000000000 +0200
+++ new/yast2-ldap-client-2.14.0/testsuite/tests/Routines.ycp 2006-06-26 09:45:23.000000000 +0200
@@ -2,7 +2,7 @@
* File: Routines.ycp
* Summary: Test of routines.ycp functions
* Author: Jiri Suchomel
- * $Id: Routines.ycp 31653 2006-06-26 07:46:36Z jsuchome $
+ * $Id: Routines.ycp 31656 2006-06-26 07:46:55Z jsuchome $
*/
{
// testedfiles: Ldap.ycp
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org