Hello community,
here is the log from the commit of package yast2-ldap-client for
openSUSE:Factory checked in at 2013-10-25 18:55:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-10-11 11:07:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-ldap-client.new/yast2-ldap-client.changes
2013-10-25 18:55:14.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Oct 23 09:39:33 UTC 2013 - ckornac...@suse.de
+
+- Use sssd for LDAP based automount maps (fate#313275)
+- 3.1.1
+
+-------------------------------------------------------------------
Old:
----
yast2-ldap-client-3.1.0.tar.bz2
New:
----
yast2-ldap-client-3.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ldap-client.spec ++++++
--- /var/tmp/diff_new_pack.Wdzwle/_old 2013-10-25 18:55:16.000000000 +0200
+++ /var/tmp/diff_new_pack.Wdzwle/_new 2013-10-25 18:55:16.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-ldap-client
-Version: 3.1.0
+Version: 3.1.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-ldap-client-3.1.0.tar.bz2 -> yast2-ldap-client-3.1.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ldap-client-3.1.0/COPYING
new/yast2-ldap-client-3.1.1/COPYING
--- old/yast2-ldap-client-3.1.0/COPYING 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ldap-client-3.1.1/COPYING 2013-10-23 14:35:30.000000000 +0200
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ldap-client-3.1.0/VERSION
new/yast2-ldap-client-3.1.1/VERSION
--- old/yast2-ldap-client-3.1.0/VERSION 2013-10-08 13:01:21.000000000 +0200
+++ new/yast2-ldap-client-3.1.1/VERSION 2013-10-23 14:35:30.000000000 +0200
@@ -1 +1 @@
-3.1.0
+3.1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-ldap-client-3.1.0/package/yast2-ldap-client.changes
new/yast2-ldap-client-3.1.1/package/yast2-ldap-client.changes
--- old/yast2-ldap-client-3.1.0/package/yast2-ldap-client.changes
2013-10-08 13:01:21.000000000 +0200
+++ new/yast2-ldap-client-3.1.1/package/yast2-ldap-client.changes
2013-10-23 14:35:30.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Oct 23 09:39:33 UTC 2013 - ckornac...@suse.de
+
+- Use sssd for LDAP based automount maps (fate#313275)
+- 3.1.1
+
+-------------------------------------------------------------------
Thu Sep 19 07:02:15 UTC 2013 - lsle...@suse.cz
- do not use *.spec.in template, use *.spec file with RPM macros
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ldap-client-3.1.0/src/include/ldap/ui.rb
new/yast2-ldap-client-3.1.1/src/include/ldap/ui.rb
--- old/yast2-ldap-client-3.1.0/src/include/ldap/ui.rb 2013-10-08
12:23:07.000000000 +0200
+++ new/yast2-ldap-client-3.1.1/src/include/ldap/ui.rb 2013-10-23
14:35:30.000000000 +0200
@@ -929,7 +929,7 @@
: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\nset to the
ldap_user_search_base and ldap_group_search_base attributes in
/etc/sssd/sssd.conf file.</p>\n"
+ "<p>Specify the search bases to use for specific maps (users or
groups) if they are different from the base DN. These values are\nset to the
ldap_user_search_base, ldap_group_search_base and ldap_autofs_search_base
attributes in /etc/sssd/sssd.conf file.</p>\n"
)
}
@@ -948,6 +948,7 @@
sssd_cache_credentials = Ldap.sssd_cache_credentials
nss_base_passwd = Ldap.nss_base_passwd
nss_base_group = Ldap.nss_base_group
+ nss_base_automount = Ldap.nss_base_automount
member_attributes = [
Item(Id("member"), "member", member_attribute == "member"),
@@ -995,7 +996,8 @@
br2entry = {
:br => :base_config_dn,
:br_passwd => :nss_base_passwd,
- :br_group => :nss_base_group
+ :br_group => :nss_base_group,
+ :br_autofs => :nss_base_automount
}
tabs = [
@@ -1061,6 +1063,20 @@
PushButton(Id(:br_group), _("Bro&wse"))
)
),
+ HBox(
+ InputField(
+ Id(:nss_base_automount),
+ Opt(:hstretch),
+ # textentry label
+ _("&Autofs Map"),
+ nss_base_automount
+ ),
+ VBox(
+ Label(""),
+ # button label
+ PushButton(Id(:br_autofs), _("Bro&wse"))
+ )
+ ),
VSpacing(0.4)
),
HSpacing(4)
@@ -1280,6 +1296,9 @@
nss_base_group = Convert.to_string(
UI.QueryWidget(Id(:nss_base_group), :Value)
)
+ nss_base_automount = Convert.to_string(
+ UI.QueryWidget(Id(:nss_base_automount), :Value)
+ )
end
if current == :admin
bind_dn = Convert.to_string(UI.QueryWidget(Id(:bind_dn), :Value))
@@ -1362,6 +1381,7 @@
Ldap.pam_password != pam_password ||
Ldap.nss_base_passwd != nss_base_passwd ||
Ldap.nss_base_group != nss_base_group ||
+ Ldap.nss_base_automount != nss_base_automount ||
Ldap.krb5_realm != krb5_realm ||
Ldap.krb5_kdcip != krb5_kdcip ||
Ldap.sssd_cache_credentials != sssd_cache_credentials ||
@@ -1374,6 +1394,7 @@
Ldap.pam_password = pam_password
Ldap.nss_base_passwd = nss_base_passwd
Ldap.nss_base_group = nss_base_group
+ Ldap.nss_base_automount = nss_base_automount
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-3.1.0/src/modules/Ldap.rb
new/yast2-ldap-client-3.1.1/src/modules/Ldap.rb
--- old/yast2-ldap-client-3.1.0/src/modules/Ldap.rb 2013-10-08
12:23:07.000000000 +0200
+++ new/yast2-ldap-client-3.1.1/src/modules/Ldap.rb 2013-10-23
14:35:30.000000000 +0200
@@ -131,9 +131,11 @@
@nss_base_passwd = ""
@nss_base_shadow = ""
@nss_base_group = ""
+ @nss_base_automount = ""
# settings from LDAP configuration objects
@user_base = ""
@group_base = ""
+ @autofs_base = ""
# stored values of /etc/nsswitch.conf
@nsswitch = {
@@ -416,6 +418,7 @@
@nss_base_passwd = Ops.get_string(settings, "nss_base_passwd", "")
@nss_base_shadow = Ops.get_string(settings, "nss_base_passwd", "")
@nss_base_group = Ops.get_string(settings, "nss_base_group", "")
+ @nss_base_automount = Ops.get_string(settings, "nss_base_automount", "")
@member_attribute = Ops.get_string(settings, "member_attribute",
"member")
@create_ldap = Ops.get_boolean(settings, "create_ldap", false)
@login_enabled = Ops.get_boolean(settings, "login_enabled", true)
@@ -505,6 +508,9 @@
if @nss_base_group != @base_dn
Ops.set(e, "nss_base_group", @nss_base_group)
end
+ if @nss_base_automount != @base_dn
+ Ops.set(e, "nss_base_automount", @nss_base_automount)
+ end
Ops.set(e, "start_autofs", @_start_autofs) if @_autofs_allowed
Ops.set(e, "krb5_realm", @krb5_realm) if @krb5_realm != ""
Ops.set(e, "krb5_kdcip", @krb5_kdcip) if @krb5_kdcip != ""
@@ -891,6 +897,7 @@
@nss_base_passwd = ReadLdapConfEntry("nss_base_passwd", @base_dn)
@nss_base_shadow = ReadLdapConfEntry("nss_base_shadow", @base_dn)
@nss_base_group = ReadLdapConfEntry("nss_base_group", @base_dn)
+ @nss_base_automount = ReadLdapConfEntry("nss_base_automount", @base_dn)
@pam_password = ReadLdapConfEntry("pam_password", "exop")
# check if Password Modify extenstion is supported (bnc#546398, c#6)
@@ -1014,6 +1021,10 @@
SCR.Read(Builtins.add(domain, "ldap_group_search_base"))
)
@nss_base_group = group_base if group_base != nil
+ autofs_base = Convert.to_string(
+ SCR.Read(Builtins.add(domain, "ldap_autofs_search_base"))
+ )
+ @nss_base_automount = autofs_base if autofs_base != nil
end
@sssd_with_krb = true if @krb5_realm != "" && @krb5_kdcip != ""
@@ -2315,9 +2326,16 @@
SCR.Write(path(".etc.sssd_conf.v.sssd.domains"), "default")
+ # Create autofs section if autofs is enabled
+ if @_start_autofs
+ SCR.Write(
+ Builtins.add(path(".etc.sssd_conf.section_comment"), "autofs"),
+ "\n# Section created by YaST\n"
+ )
+ end
- # "The "services" setting should have the value "nss, pam"
- SCR.Write(path(".etc.sssd_conf.v.sssd.services"), "nss,pam")
+ # "The "services" setting should have the value "nss, pam" and "autofs"
if autofs is enabled
+ SCR.Write(path(".etc.sssd_conf.v.sssd.services"), @_start_autofs ?
"nss,pam,autofs" : "nss,pam")
# " Make sure that "filter_groups" and "filter_users" in the "[nss]"
section contains "root".
f_g = Convert.to_string(
@@ -2393,6 +2411,10 @@
Builtins.add(domain, "ldap_group_search_base"),
@nss_base_group != @base_dn && @nss_base_group != "" ? @nss_base_group
: nil
)
+ SCR.Write(
+ Builtins.add(domain, "ldap_autofs_search_base"),
+ @nss_base_automount != @base_dn && @nss_base_automount != "" ?
@nss_base_automount : nil
+ )
if !Builtins.contains(sections, "domain/default")
SCR.Write(
@@ -2414,7 +2436,7 @@
end
if !SCR.Write(path(".etc.sssd_conf"), nil)
- Builtins.y2error("error writing ldap.conf file")
+ Builtins.y2error("error writing sssd.conf file")
end
true
end
@@ -2931,7 +2953,7 @@
)
WriteNscdCache(@start && @sssd)
end
- if @start # ldap used for authentocation
+ if @start # ldap used for authentication
# ---------- correct pam_password value for Novell eDirectory
if @pam_password != "nds" && @expert_ui
CheckNDS() if !@nds_checked && !Mode.autoinst
@@ -3110,7 +3132,7 @@
end
if @_autofs_allowed
- if Nsswitch.WriteAutofs(@start && @_start_autofs, "ldap")
+ if Nsswitch.WriteAutofs(@start && @_start_autofs, @sssd ? "sss" :
"ldap")
if @_start_autofs
Service.Adjust("autofs", "enable")
else
@@ -3261,6 +3283,7 @@
@nss_base_passwd = @base_dn
@nss_base_shadow = @base_dn
@nss_base_group = @base_dn
+ @nss_base_automount = @base_dn
end
Write(abort) == :next
@@ -3372,8 +3395,10 @@
publish :variable => :nss_base_passwd, :type => "string"
publish :variable => :nss_base_shadow, :type => "string"
publish :variable => :nss_base_group, :type => "string"
+ publish :variable => :nss_base_automount, :type => "string"
publish :variable => :user_base, :type => "string"
publish :variable => :group_base, :type => "string"
+ publish :variable => :autofs_base, :type => "string"
publish :variable => :nsswitch, :type => "map", :private => true
publish :variable => :anonymous, :type => "boolean"
publish :variable => :bind_pass, :type => "string"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ldap-client-3.1.0/testsuite/tests/Export.out
new/yast2-ldap-client-3.1.1/testsuite/tests/Export.out
--- old/yast2-ldap-client-3.1.0/testsuite/tests/Export.out 2013-10-08
12:23:07.000000000 +0200
+++ new/yast2-ldap-client-3.1.1/testsuite/tests/Export.out 2013-10-23
14:35:30.000000000 +0200
@@ -9,6 +9,7 @@
Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_passwd" nil
Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_shadow" nil
Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_group"
"ou=group,dc=suse,dc=cz"
+Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_automount" nil
Read .etc.ldap_conf.v."/etc/ldap.conf"."pam_password" "crypt"
Read .sysconfig.ldap.BASE_CONFIG_DN nil
Read .sysconfig.ldap.FILE_SERVER "no"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ldap-client-3.1.0/testsuite/tests/Export.rb
new/yast2-ldap-client-3.1.1/testsuite/tests/Export.rb
--- old/yast2-ldap-client-3.1.0/testsuite/tests/Export.rb 2013-10-08
12:23:07.000000000 +0200
+++ new/yast2-ldap-client-3.1.1/testsuite/tests/Export.rb 2013-10-23
14:35:30.000000000 +0200
@@ -26,6 +26,7 @@
"nss_base_passwd" => nil,
"nss_base_shadow" => nil,
"nss_base_group" => "ou=group,dc=suse,dc=cz",
+ "nss_base_automount" => nil,
"ldap_version" => nil,
"ssl" => nil,
"pam_password" => "crypt",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ldap-client-3.1.0/testsuite/tests/Export2.out
new/yast2-ldap-client-3.1.1/testsuite/tests/Export2.out
--- old/yast2-ldap-client-3.1.0/testsuite/tests/Export2.out 2013-10-08
12:23:07.000000000 +0200
+++ new/yast2-ldap-client-3.1.1/testsuite/tests/Export2.out 2013-10-23
14:35:30.000000000 +0200
@@ -8,6 +8,7 @@
Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_passwd" nil
Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_shadow" nil
Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_group"
"ou=group,dc=suse,dc=cz"
+Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_automount" nil
Read .etc.ldap_conf.v."/etc/ldap.conf"."pam_password" "crypt"
Read .sysconfig.ldap.BASE_CONFIG_DN nil
Read .sysconfig.ldap.FILE_SERVER "no"
@@ -25,5 +26,6 @@
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
+Read .etc.sssd_conf.v."domain/default"."ldap_autofs_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",
"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-3.1.0/testsuite/tests/Export2.rb
new/yast2-ldap-client-3.1.1/testsuite/tests/Export2.rb
--- old/yast2-ldap-client-3.1.0/testsuite/tests/Export2.rb 2013-10-08
12:23:07.000000000 +0200
+++ new/yast2-ldap-client-3.1.1/testsuite/tests/Export2.rb 2013-10-23
14:35:30.000000000 +0200
@@ -26,6 +26,7 @@
"nss_base_passwd" => nil,
"nss_base_shadow" => nil,
"nss_base_group" => "ou=group,dc=suse,dc=cz",
+ "nss_base_automount" => nil,
"ldap_version" => nil,
"ssl" => nil,
"pam_password" => "crypt",
@@ -58,7 +59,8 @@
"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
+ "ldap_group_search_base" => nil,
+ "ldap_autofs_search_base" => nil
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ldap-client-3.1.0/testsuite/tests/Export3.out
new/yast2-ldap-client-3.1.1/testsuite/tests/Export3.out
--- old/yast2-ldap-client-3.1.0/testsuite/tests/Export3.out 2013-10-08
12:23:07.000000000 +0200
+++ new/yast2-ldap-client-3.1.1/testsuite/tests/Export3.out 2013-10-23
14:35:30.000000000 +0200
@@ -8,6 +8,7 @@
Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_passwd" nil
Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_shadow" nil
Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_group"
"ou=group,dc=suse,dc=cz"
+Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_automount" nil
Read .etc.ldap_conf.v."/etc/ldap.conf"."pam_password" "crypt"
Read .sysconfig.ldap.BASE_CONFIG_DN nil
Read .sysconfig.ldap.FILE_SERVER "no"
@@ -25,5 +26,6 @@
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"
+Read .etc.sssd_conf.v."domain/default"."ldap_autofs_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,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-3.1.0/testsuite/tests/Export3.rb
new/yast2-ldap-client-3.1.1/testsuite/tests/Export3.rb
--- old/yast2-ldap-client-3.1.0/testsuite/tests/Export3.rb 2013-10-08
12:23:07.000000000 +0200
+++ new/yast2-ldap-client-3.1.1/testsuite/tests/Export3.rb 2013-10-23
14:35:30.000000000 +0200
@@ -26,6 +26,7 @@
"nss_base_passwd" => nil,
"nss_base_shadow" => nil,
"nss_base_group" => "ou=group,dc=suse,dc=cz",
+ "nss_base_automount" => nil,
"ldap_version" => nil,
"ssl" => nil,
"pam_password" => "crypt",
@@ -58,7 +59,8 @@
"enumerate" => "true",
"ldap_id_use_start_tls" => "False",
"ldap_user_search_base" => nil,
- "ldap_group_search_base" => "ou=group,dc=suse,dc=cz"
+ "ldap_group_search_base" => "ou=group,dc=suse,dc=cz",
+ "ldap_autofs_search_base" => nil
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ldap-client-3.1.0/testsuite/tests/Read.out
new/yast2-ldap-client-3.1.1/testsuite/tests/Read.out
--- old/yast2-ldap-client-3.1.0/testsuite/tests/Read.out 2013-10-08
12:23:07.000000000 +0200
+++ new/yast2-ldap-client-3.1.1/testsuite/tests/Read.out 2013-10-23
14:35:30.000000000 +0200
@@ -8,6 +8,7 @@
Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_passwd" nil
Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_shadow" nil
Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_group" nil
+Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_automount" nil
Read .etc.ldap_conf.v."/etc/ldap.conf"."pam_password" "crypt"
Read .sysconfig.ldap.BASE_CONFIG_DN nil
Read .sysconfig.ldap.FILE_SERVER "no"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ldap-client-3.1.0/testsuite/tests/Read.rb
new/yast2-ldap-client-3.1.1/testsuite/tests/Read.rb
--- old/yast2-ldap-client-3.1.0/testsuite/tests/Read.rb 2013-10-08
12:23:07.000000000 +0200
+++ new/yast2-ldap-client-3.1.1/testsuite/tests/Read.rb 2013-10-23
14:35:30.000000000 +0200
@@ -26,6 +26,7 @@
"nss_base_passwd" => nil,
"nss_base_shadow" => nil,
"nss_base_group" => nil,
+ "nss_base_automount" => nil,
"ldap_version" => nil,
"ssl" => nil,
"pam_password" => "crypt",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ldap-client-3.1.0/testsuite/tests/Read2.out
new/yast2-ldap-client-3.1.1/testsuite/tests/Read2.out
--- old/yast2-ldap-client-3.1.0/testsuite/tests/Read2.out 2013-10-08
12:23:07.000000000 +0200
+++ new/yast2-ldap-client-3.1.1/testsuite/tests/Read2.out 2013-10-23
14:35:30.000000000 +0200
@@ -7,6 +7,7 @@
Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_passwd" nil
Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_shadow" nil
Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_group" nil
+Read .etc.ldap_conf.v."/etc/ldap.conf"."nss_base_automount" nil
Read .etc.ldap_conf.v."/etc/ldap.conf"."pam_password" "crypt"
Read .sysconfig.ldap.BASE_CONFIG_DN nil
Read .sysconfig.ldap.FILE_SERVER "no"
@@ -22,8 +23,10 @@
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"
+Read .etc.sssd_conf.v."domain/default"."ldap_autofs_search_base" nil
Return true
Dump ldap: -true-
Dump sssd: -true-
Dump nss: -dc=suse,dc=cz-
Dump nss: -ou=group,dc=suse,dc=cz-
+Dump nss: -dc=suse,dc=cz-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ldap-client-3.1.0/testsuite/tests/Read2.rb
new/yast2-ldap-client-3.1.1/testsuite/tests/Read2.rb
--- old/yast2-ldap-client-3.1.0/testsuite/tests/Read2.rb 2013-10-08
12:23:07.000000000 +0200
+++ new/yast2-ldap-client-3.1.1/testsuite/tests/Read2.rb 2013-10-23
14:35:30.000000000 +0200
@@ -28,6 +28,7 @@
"nss_base_passwd" => nil,
"nss_base_shadow" => nil,
"nss_base_group" => nil,
+ "nss_base_automount" => nil,
"ldap_version" => nil,
"ssl" => nil,
"pam_password" => "crypt",
@@ -59,7 +60,8 @@
"enumerate" => nil,
"ldap_id_use_start_tls" => nil,
"ldap_user_search_base" => nil,
- "ldap_group_search_base" => "ou=group,dc=suse,dc=cz"
+ "ldap_group_search_base" => "ou=group,dc=suse,dc=cz",
+ "ldap_autofs_search_base" => nil
}
}
}
@@ -94,6 +96,7 @@
Testsuite.Dump(Builtins.sformat("nss: -%1-", Ldap.nss_base_passwd))
Testsuite.Dump(Builtins.sformat("nss: -%1-", Ldap.nss_base_group))
+ Testsuite.Dump(Builtins.sformat("nss: -%1-", Ldap.nss_base_automount))
nil
end
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
