Hello community, here is the log from the commit of package yast2-ldap-client for openSUSE:Factory checked in at 2013-06-25 06:59:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ldap-client (Old) and /work/SRC/openSUSE:Factory/.yast2-ldap-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ldap-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ldap-client/yast2-ldap-client.changes 2013-01-08 09:30:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ldap-client.new/yast2-ldap-client.changes 2013-06-25 06:59:18.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Jun 14 09:28:13 CEST 2013 - [email protected] + +- bring back fields for editing user and group search bases + (bnc#815506) +- 2.24.1 + +------------------------------------------------------------------- +Fri Apr 19 08:42:11 CEST 2013 - [email protected] + +- ensure nscd.conf changes are written before restarting the service + (bnc#804454) +- 2.24.0 + +------------------------------------------------------------------- Old: ---- yast2-ldap-client-2.23.2.tar.bz2 New: ---- yast2-ldap-client-2.24.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-client.spec ++++++ --- /var/tmp/diff_new_pack.fsxwH7/_old 2013-06-25 06:59:19.000000000 +0200 +++ /var/tmp/diff_new_pack.fsxwH7/_new 2013-06-25 06:59:19.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ldap-client -Version: 2.23.2 +Version: 2.24.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-ldap-client-2.23.2.tar.bz2 -> yast2-ldap-client-2.24.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.23.2/Makefile.am new/yast2-ldap-client-2.24.1/Makefile.am --- old/yast2-ldap-client-2.23.2/Makefile.am 2012-10-19 15:39:42.000000000 +0200 +++ new/yast2-ldap-client-2.24.1/Makefile.am 2013-06-21 09:51:00.000000000 +0200 @@ -158,19 +158,14 @@ TAGVERSION = $(Y2TOOL) tagversion -check-up-to-date check-cvs-up-to-date check-svn-up-to-date: - if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ - else \ - cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ +# check if there is no modified files and all commits were pushed +check-up-to-date: + if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ + (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ fi check-tagversion: - @if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ - else \ - cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ - fi >/dev/null; \ + cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.23.2/Makefile.am.common new/yast2-ldap-client-2.24.1/Makefile.am.common --- old/yast2-ldap-client-2.23.2/Makefile.am.common 2012-10-19 15:39:42.000000000 +0200 +++ new/yast2-ldap-client-2.24.1/Makefile.am.common 2013-06-21 09:51:00.000000000 +0200 @@ -31,7 +31,7 @@ CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.23.2/Makefile.in new/yast2-ldap-client-2.24.1/Makefile.in --- old/yast2-ldap-client-2.23.2/Makefile.in 2012-10-19 15:39:45.000000000 +0200 +++ new/yast2-ldap-client-2.24.1/Makefile.in 2013-06-21 09:51:04.000000000 +0200 @@ -684,7 +684,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) @@ -980,19 +980,14 @@ package: check-up-to-date check-tagversion check-textdomain package-local -check-up-to-date check-cvs-up-to-date check-svn-up-to-date: - if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ - else \ - cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ +# check if there is no modified files and all commits were pushed +check-up-to-date: + if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ + (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ fi check-tagversion: - @if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ - else \ - cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ - fi >/dev/null; \ + cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.23.2/VERSION new/yast2-ldap-client-2.24.1/VERSION --- old/yast2-ldap-client-2.23.2/VERSION 2013-01-03 16:01:42.000000000 +0100 +++ new/yast2-ldap-client-2.24.1/VERSION 2013-06-21 09:50:52.000000000 +0200 @@ -1 +1 @@ -2.23.2 +2.24.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.23.2/configure new/yast2-ldap-client-2.24.1/configure --- old/yast2-ldap-client-2.23.2/configure 2012-10-19 15:39:45.000000000 +0200 +++ new/yast2-ldap-client-2.24.1/configure 2013-06-21 09:51:03.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-ldap-client 2.23.1. +# Generated by GNU Autoconf 2.69 for yast2-ldap-client 2.24.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ldap-client' PACKAGE_TARNAME='yast2-ldap-client' -PACKAGE_VERSION='2.23.1' -PACKAGE_STRING='yast2-ldap-client 2.23.1' +PACKAGE_VERSION='2.24.1' +PACKAGE_STRING='yast2-ldap-client 2.24.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,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.23.1 to adapt to many kinds of systems. +\`configure' configures yast2-ldap-client 2.24.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1319,7 +1319,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ldap-client 2.23.1:";; + short | recursive ) echo "Configuration of yast2-ldap-client 2.24.1:";; esac cat <<\_ACEOF @@ -1399,7 +1399,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ldap-client configure 2.23.1 +yast2-ldap-client configure 2.24.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1416,7 +1416,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.23.1, which was +It was created by yast2-ldap-client $as_me 2.24.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2355,7 +2355,7 @@ # Define the identity of the package. PACKAGE='yast2-ldap-client' - VERSION='2.23.1' + VERSION='2.24.1' cat >>confdefs.h <<_ACEOF @@ -2478,7 +2478,7 @@ -VERSION="2.23.1" +VERSION="2.24.1" RPMNAME="yast2-ldap-client" MAINTAINER="Jiri Suchomel <[email protected]>" @@ -3404,7 +3404,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ldap-client $as_me 2.23.1, which was +This file was extended by yast2-ldap-client $as_me 2.24.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3457,7 +3457,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-ldap-client config.status 2.23.1 +yast2-ldap-client config.status 2.24.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.23.2/configure.in new/yast2-ldap-client-2.24.1/configure.in --- old/yast2-ldap-client-2.23.2/configure.in 2012-10-19 15:39:42.000000000 +0200 +++ new/yast2-ldap-client-2.24.1/configure.in 2013-06-21 09:51:00.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ldap-client dnl -dnl -- This file is generated by y2autoconf 2.23.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ldap-client, 2.23.1, http://bugs.opensuse.org/, yast2-ldap-client) +AC_INIT(yast2-ldap-client, 2.24.1, http://bugs.opensuse.org/, yast2-ldap-client) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.23.1" +VERSION="2.24.1" RPMNAME="yast2-ldap-client" MAINTAINER="Jiri Suchomel <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.23.2/src/Ldap.ycp new/yast2-ldap-client-2.24.1/src/Ldap.ycp --- old/yast2-ldap-client-2.23.2/src/Ldap.ycp 2012-10-19 15:39:16.000000000 +0200 +++ new/yast2-ldap-client-2.24.1/src/Ldap.ycp 2013-06-21 09:50:52.000000000 +0200 @@ -963,6 +963,14 @@ // true for SSSD by default, if not overriden by ldap_id_use_start_tls ldap_tls = true; } + + // replace nss_base_passwd with ldap_user_search_base (if it is set) + string user_base = (string) SCR::Read (add (domain, "ldap_user_search_base")); + if (user_base != nil) + nss_base_passwd = user_base; + string group_base = (string) SCR::Read (add (domain, "ldap_group_search_base")); + if (group_base != nil) + nss_base_group = group_base; } if (krb5_realm != "" && krb5_kdcip != "") { @@ -2281,6 +2289,12 @@ SCR::Write (add (domain, "ldap_tls_cacertdir"), tls_cacertdir == "" ? nil : tls_cacertdir); SCR::Write (add (domain, "ldap_tls_cacert"), tls_cacertfile == "" ? nil : tls_cacertfile); + // remove the keys if their value is same as default (base_dn) + SCR::Write (add (domain, "ldap_user_search_base"), + (nss_base_passwd != base_dn && nss_base_passwd != "") ? nss_base_passwd : nil); + SCR::Write (add (domain, "ldap_group_search_base"), + (nss_base_group != base_dn && nss_base_group != "") ? nss_base_group : nil); + if (!contains (sections, "domain/default")) { SCR::Write (add (.etc.sssd_conf.section_comment, "domain/default"), "\n# Section created by YaST\n"); @@ -2671,7 +2685,10 @@ { return false; } - return SCR::Write (.etc.nscd_conf.v.enable-cache, enable_cache); + boolean ret = SCR::Write (.etc.nscd_conf.v.enable-cache, enable_cache); + // ensure the changes are written + ret = ret && SCR::Write (.etc.nscd_conf, nil); + return ret; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.23.2/src/Makefile.in new/yast2-ldap-client-2.24.1/src/Makefile.in --- old/yast2-ldap-client-2.23.2/src/Makefile.in 2012-10-19 15:39:46.000000000 +0200 +++ new/yast2-ldap-client-2.24.1/src/Makefile.in 2013-06-21 09:51:05.000000000 +0200 @@ -610,7 +610,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.23.2/src/ui.ycp new/yast2-ldap-client-2.24.1/src/ui.ycp --- old/yast2-ldap-client-2.23.2/src/ui.ycp 2013-01-04 10:52:52.000000000 +0100 +++ new/yast2-ldap-client-2.24.1/src/ui.ycp 2013-06-21 09:50:52.000000000 +0200 @@ -805,6 +805,11 @@ _("<p>Press <b>Configure</b> to configure settings stored on the LDAP server. You will be asked for the password if you are not connected yet or have changed your configuration.</p> +"), + `searching: + // help text 1/1 + _("<p>Specify the search bases to use for specific maps (users or groups) if they are different from the base DN. These values are +set to the ldap_user_search_base and ldap_group_search_base attributes in /etc/sssd/sssd.conf file.</p> ") ]; @@ -822,6 +827,8 @@ string sssd_ldap_schema = Ldap::sssd_ldap_schema; boolean sssd_enumerate = Ldap::sssd_enumerate; boolean sssd_cache_credentials = Ldap::sssd_cache_credentials; + string nss_base_passwd = Ldap::nss_base_passwd; + string nss_base_group = Ldap::nss_base_group; list<term>member_attributes = [ `item (`id("member"), "member", member_attribute == "member"), @@ -858,11 +865,20 @@ "rfc2307bis" ]; + // mapping of browse button id's to appropriate text entries + map br2entry = $[ + `br : `base_config_dn, + `br_passwd : `nss_base_passwd, + `br_group : `nss_base_group + ]; + list<term> tabs = [ // tab label `item(`id(`client), _("C&lient Settings"), true), // tab label `item(`id(`admin), _("Ad&ministration Settings")), + // tab label + `item(`id(`searching), _("Naming Contexts")), ]; term contents = `VBox ( @@ -883,14 +899,43 @@ ); } + void set_searching_term () { + term cont = `Top (`HBox(`HSpacing (4), `VBox( + `VSpacing (1), + `VSpacing(0.4), + `HBox ( + `InputField (`id (`nss_base_passwd), `opt (`hstretch), + // textentry label + _("&User Map"), nss_base_passwd), + `VBox ( + `Label (""), + // button label + `PushButton (`id(`br_passwd), _("&Browse")) + ) + ), + `HBox ( + `InputField (`id (`nss_base_group), `opt (`hstretch), + // textentry label + _("&Group Map"), nss_base_group), + `VBox ( + `Label (""), + // button label + `PushButton (`id(`br_group), _("Bro&wse")) + ) + ), + `VSpacing(0.4) + ), `HSpacing (4))); + UI::ReplaceWidget (`tabContents, cont); + if (has_tabs) + UI::ChangeWidget (`id (`tabs), `CurrentItem, `searching); + } define void set_client_term () { term cont = `Top (`HBox(`HSpacing (4), `VBox( `VSpacing (1), - // checkbox label `Left (`CheckBox (`id (`sssd_with_krb), `opt (`notify), _("&Use Kerberos"), sssd_with_krb)), `VSpacing(0.4), @@ -1023,7 +1068,13 @@ sssd_ldap_schema= (string) UI::QueryWidget (`id (`sssd_ldap_schema), `Value); pam_password = (string) UI::QueryWidget(`id(`pam_password), `Value); - + } + if (current == `searching) + { + nss_base_passwd = (string) + UI::QueryWidget(`id(`nss_base_passwd),`Value); + nss_base_group = (string) + UI::QueryWidget(`id(`nss_base_group),`Value); } if (current == `admin) { @@ -1039,19 +1090,21 @@ } // 2. switch the tabs - if (result == `client || result == `admin) + if (result == `client || result == `admin || result == `searching) { current = (symbol) result; Wizard::SetHelpText (help_text[current]:""); if (result == `client) set_client_term (); - else + else if (result == `admin) set_admin_term (); + else if (result == `searching) + set_searching_term (); } // 3. other events - if (result == `br) - { + if (is (result, symbol) && haskey (br2entry, (symbol)result)) + { if (Ldap::ldap_initialized && Ldap::tls_when_initialized != Ldap::ldap_tls) { Ldap::LDAPClose (); @@ -1067,7 +1120,7 @@ ]); if (dn != "") { - UI::ChangeWidget (`id(`base_config_dn), `Value, dn); + UI::ChangeWidget (`id(br2entry[result]:nil), `Value, dn); } } if (result == `sssd_with_krb) @@ -1102,6 +1155,8 @@ Ldap::member_attribute != member_attribute || Ldap::create_ldap != create_ldap || Ldap::pam_password != pam_password || + Ldap::nss_base_passwd != nss_base_passwd || + Ldap::nss_base_group != nss_base_group || Ldap::krb5_realm != krb5_realm || Ldap::krb5_kdcip != krb5_kdcip || Ldap::sssd_cache_credentials != sssd_cache_credentials || @@ -1114,6 +1169,8 @@ Ldap::member_attribute = member_attribute; Ldap::create_ldap = create_ldap; Ldap::pam_password = pam_password; + Ldap::nss_base_passwd = nss_base_passwd; + Ldap::nss_base_group = nss_base_group; Ldap::krb5_realm = krb5_realm; Ldap::krb5_kdcip = krb5_kdcip; Ldap::sssd_with_krb = sssd_with_krb; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.23.2/testsuite/tests/Export2.out new/yast2-ldap-client-2.24.1/testsuite/tests/Export2.out --- old/yast2-ldap-client-2.23.2/testsuite/tests/Export2.out 2012-10-19 15:39:17.000000000 +0200 +++ new/yast2-ldap-client-2.24.1/testsuite/tests/Export2.out 2013-06-21 09:50:52.000000000 +0200 @@ -23,5 +23,7 @@ Read .etc.sssd_conf.v."domain/default"."cache_credentials" "true" Read .etc.sssd_conf.v."domain/default"."enumerate" "true" Read .etc.sssd_conf.v."domain/default"."ldap_id_use_start_tls" nil +Read .etc.sssd_conf.v."domain/default"."ldap_user_search_base" "ou=users,dc=suse,dc=cz" +Read .etc.sssd_conf.v."domain/default"."ldap_group_search_base" nil Return true -Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":true, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "sssd_with_krb":true, "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] +Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":true, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "nss_base_passwd":"ou=users,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "sssd_with_krb":true, "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.23.2/testsuite/tests/Export2.ycp new/yast2-ldap-client-2.24.1/testsuite/tests/Export2.ycp --- old/yast2-ldap-client-2.23.2/testsuite/tests/Export2.ycp 2012-10-19 15:39:17.000000000 +0200 +++ new/yast2-ldap-client-2.24.1/testsuite/tests/Export2.ycp 2013-06-21 09:50:52.000000000 +0200 @@ -66,6 +66,8 @@ "cache_credentials" : "true", "enumerate" : "true", "ldap_id_use_start_tls" : nil, // will lead to ldap_tls true + "ldap_user_search_base" : "ou=users,dc=suse,dc=cz", + "ldap_group_search_base": nil, ], ], ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.23.2/testsuite/tests/Export3.out new/yast2-ldap-client-2.24.1/testsuite/tests/Export3.out --- old/yast2-ldap-client-2.23.2/testsuite/tests/Export3.out 2012-10-19 15:39:17.000000000 +0200 +++ new/yast2-ldap-client-2.24.1/testsuite/tests/Export3.out 2013-06-21 09:50:52.000000000 +0200 @@ -23,5 +23,7 @@ Read .etc.sssd_conf.v."domain/default"."cache_credentials" "true" Read .etc.sssd_conf.v."domain/default"."enumerate" "true" Read .etc.sssd_conf.v."domain/default"."ldap_id_use_start_tls" "False" +Read .etc.sssd_conf.v."domain/default"."ldap_user_search_base" nil +Read .etc.sssd_conf.v."domain/default"."ldap_group_search_base" "ou=group,dc=suse,dc=cz" Return true Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_kdcip":"kdc.suse.cz,kdc.suse.de", "krb5_realm":"SUSE.CZ", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "sssd_with_krb":true, "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.23.2/testsuite/tests/Export3.ycp new/yast2-ldap-client-2.24.1/testsuite/tests/Export3.ycp --- old/yast2-ldap-client-2.23.2/testsuite/tests/Export3.ycp 2012-10-19 15:39:17.000000000 +0200 +++ new/yast2-ldap-client-2.24.1/testsuite/tests/Export3.ycp 2013-06-21 09:50:52.000000000 +0200 @@ -67,6 +67,8 @@ "cache_credentials" : "true", "enumerate" : "true", "ldap_id_use_start_tls" : "False", + "ldap_user_search_base" : nil, + "ldap_group_search_base": "ou=group,dc=suse,dc=cz" ], ], ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.23.2/testsuite/tests/Read2.out new/yast2-ldap-client-2.24.1/testsuite/tests/Read2.out --- old/yast2-ldap-client-2.23.2/testsuite/tests/Read2.out 2012-10-19 15:39:17.000000000 +0200 +++ new/yast2-ldap-client-2.24.1/testsuite/tests/Read2.out 2013-06-21 09:50:52.000000000 +0200 @@ -20,6 +20,10 @@ Read .etc.sssd_conf.v."domain/default"."cache_credentials" "True" Read .etc.sssd_conf.v."domain/default"."enumerate" nil Read .etc.sssd_conf.v."domain/default"."ldap_id_use_start_tls" nil +Read .etc.sssd_conf.v."domain/default"."ldap_user_search_base" nil +Read .etc.sssd_conf.v."domain/default"."ldap_group_search_base" "ou=group,dc=suse,dc=cz" Return true Dump ldap: -true- Dump sssd: -true- +Dump nss: -dc=suse,dc=cz- +Dump nss: -ou=group,dc=suse,dc=cz- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-2.23.2/testsuite/tests/Read2.ycp new/yast2-ldap-client-2.24.1/testsuite/tests/Read2.ycp --- old/yast2-ldap-client-2.23.2/testsuite/tests/Read2.ycp 2012-10-19 15:39:17.000000000 +0200 +++ new/yast2-ldap-client-2.24.1/testsuite/tests/Read2.ycp 2013-06-21 09:50:52.000000000 +0200 @@ -67,6 +67,8 @@ "cache_credentials" : "True", "enumerate" : nil, "ldap_id_use_start_tls" : nil, + "ldap_user_search_base" : nil, + "ldap_group_search_base" : "ou=group,dc=suse,dc=cz" ], ], ], @@ -118,4 +120,7 @@ Testsuite::Dump ( sformat ("sssd: -%1-", Ldap::sssd) ); + Testsuite::Dump ( sformat ("nss: -%1-", Ldap::nss_base_passwd) ); + Testsuite::Dump ( sformat ("nss: -%1-", Ldap::nss_base_group) ); + } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
