summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornalin <nalin>2002-11-18 22:05:08 +0000
committernalin <nalin>2002-11-18 22:05:08 +0000
commitdbf919855d755917146a86ab4e3201041ade0332 (patch)
tree07af350ac300b38df79a96f11ff80f729644613d
parent4e355429e4b3f16de43ef0ac94eafe0a820b0406 (diff)
downloadnss_directories-dbf919855d755917146a86ab4e3201041ade0332.tar.gz
nss_directories-dbf919855d755917146a86ab4e3201041ade0332.tar.xz
nss_directories-dbf919855d755917146a86ab4e3201041ade0332.zip
* src/files-parse.c, src/glibc-parse.c: add glibc-based parsing internally
* src/passwd.c,src/services.c,src/group.c,src/protocols.c,src/shadow.c: use the new parsing code * src/generic.c (setent): return SUCCESS on successful open, not UNAVAIL * src/Makefile.am: export only _nss_directories_[sge]*, to export the setent, getent/getby, and endent functions, but not the parsers.
-rw-r--r--COPYING482
-rw-r--r--ChangeLog10
-rw-r--r--Makefile.am2
-rw-r--r--README5
-rw-r--r--configure.ac6
-rw-r--r--nss_directories.spec7
-rw-r--r--src/Makefile.am6
-rw-r--r--src/files-parse.c266
-rw-r--r--src/generic.c24
-rw-r--r--src/glibc-parse.c191
-rw-r--r--src/group.c20
-rw-r--r--src/passwd.c20
-rw-r--r--src/protocols.c26
-rw-r--r--src/services.c29
-rw-r--r--src/shadow.c20
15 files changed, 1072 insertions, 42 deletions
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..bf50f20
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,482 @@
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL. It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it. You can use it for
+your libraries, 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 library, or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library. If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, 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 companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software. To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+ Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs. This
+license, the GNU Library General Public License, applies to certain
+designated libraries. This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+ The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it. Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program. However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+ Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries. We
+concluded that weaker conditions might promote sharing better.
+
+ However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves. This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them. (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.) The hope is that this
+will lead to faster development of free libraries.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+ Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+ GNU LIBRARY GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License"). Each licensee is
+addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, 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 library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete 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 distribute a copy of this License along with the
+Library.
+
+ 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 Library or any portion
+of it, thus forming a work based on the Library, 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) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+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 Library, 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 Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you 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.
+
+ If distribution of 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 satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ c) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ d) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. 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.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library 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.
+
+ 9. 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 Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+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.
+
+ 11. 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 Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library 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 Library.
+
+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.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library 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.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Library 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 Library
+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 Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+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
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. 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 LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. 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 library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/ChangeLog b/ChangeLog
index e69de29..dfffad6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,10 @@
+2002-11-18 nalin
+* src/files-parse.c, src/glibc-parse.c: add glibc-based parsing internally
+* src/passwd.c,src/services.c,src/group.c,src/protocols.c,src/shadow.c: use
+ the new parsing code
+* src/generic.c (setent): return SUCCESS on successful open, not UNAVAIL
+* src/Makefile.am: export only _nss_directories_[sge]*, to export the setent,
+ getent/getby, and endent functions, but not the parsers.
+
+2002-11-18 nalin
+- initial check-in
diff --git a/Makefile.am b/Makefile.am
index d558585..7a30022 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
SUBDIRS = src
-EXTRA_DIST = README nss_directories.spec
+EXTRA_DIST = ChangeLog COPYING README nss_directories.spec
DISTCHECK_CONFIGURE_FLAGS = --with-moduledir=$$dc_install_base/modules
NAME = nss_directories
diff --git a/README b/README
index f1f6703..7604065 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
nss_directories
nss_directories is a set of C library extensions which allow a directory
-full of files to be used as a primary source of user, group, and service
-information instead of or in addition to flat files or NIS.
+full of files to be used as a primary source of user, group, protocol, and
+service information instead of or in addition to flat files or NIS.
nss_files nss_directories
========= ===============
@@ -10,3 +10,4 @@ nss_files nss_directories
/etc/shadow /etc/shadow.d/*
/etc/group /etc/group.d/*
/etc/services /etc/services.d/*
+/etc/protocols /etc/protocols.d/*
diff --git a/configure.ac b/configure.ac
index 0d4bb7f..383940d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,12 +19,6 @@ then
fi
AC_SUBST(moduledir)
-AC_CHECK_LIB(nss_files,_nss_files_parse_pwent)
-AC_CHECK_LIB(nss_files,_nss_files_parse_grent)
-AC_CHECK_LIB(nss_files,_nss_files_parse_spent)
-AC_CHECK_LIB(nss_files,_nss_files_parse_servent)
-AC_CHECK_LIB(nss_files,_nss_files_parse_protoent)
-
nss_files=`ls -1 "$moduledir"/libnss_files-*.so | head -1`
GLIBC_VERSION=`basename "$nss_files" .so | cut -f2 -d-`
AC_SUBST(GLIBC_VERSION)
diff --git a/nss_directories.spec b/nss_directories.spec
index 793a586..fbfbfda 100644
--- a/nss_directories.spec
+++ b/nss_directories.spec
@@ -1,5 +1,5 @@
Name: nss_directories
-Version: 0.1
+Version: 0.2
Release: 1
Source: %{name}-%{version}.tar.gz
License: LGPL
@@ -29,9 +29,12 @@ rm -fr $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%doc README
+%doc README ChangeLog COPYING
/%{_lib}/libnss_directories-*.so
%changelog
+* Mon Nov 18 2002 Nalin Dahyabhai <nalin@redhat.com> 0.2-1
+- swallow parsing functions from glibc to avoid dependencies on private symbols
+
* Sun Nov 17 2002 Nalin Dahyabhai <nalin@redhat.com> 0.1-1
- initial version
diff --git a/src/Makefile.am b/src/Makefile.am
index 07e0264..e8c3cca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,11 @@ moduleexecdir = @moduledir@
moduleexec_LTLIBRARIES = libnss_directories.la
EXTRA_libnss_directories_la_SOURCES = \
+ files-parse.c \
generic.c
+
libnss_directories_la_SOURCES = \
- parsers.h \
+ glibc-parse.c \
group.c \
passwd.c \
protocols.c \
@@ -12,7 +14,7 @@ libnss_directories_la_SOURCES = \
shadow.c
libnss_directories_la_LDFLAGS = \
- -version-info 2 -export-symbols-regex "_nss_directories.*"
+ -version-info 2 -export-symbols-regex "_nss_directories_[sge].*"
install-exec-hook:
mv $(DESTDIR)/$(moduleexecdir)/libnss_directories.so.2.0.0 \
diff --git a/src/files-parse.c b/src/files-parse.c
new file mode 100644
index 0000000..739ee54
--- /dev/null
+++ b/src/files-parse.c
@@ -0,0 +1,266 @@
+/* Common code for file-based database parsers in nss_files module.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+
+/* These symbols are defined by the including source file:
+
+ ENTNAME -- database name of the structure and functions (hostent, pwent).
+ STRUCTURE -- struct name, define only if not ENTNAME (passwd, group).
+ DATABASE -- string of the database file's name ("hosts", "passwd").
+
+ ENTDATA -- if defined, `struct ENTDATA' is used by the parser to store
+ things pointed to by the resultant `struct STRUCTURE'.
+
+ NEED_H_ERRNO - defined iff an arg `int *herrnop' is used.
+
+ EXTRA_ARGS -- defined iff extra parameters must be passed to the parser
+ EXTRA_ARGS_DECL -- declaration for these extra parameters
+ EXTRA_ARGS_VALUE -- values to be passed for these parameters
+
+ Also see files-XXX.c. */
+
+#ifndef EXTRA_ARGS
+# define EXTRA_ARGS
+# define EXTRA_ARGS_DECL
+# define EXTRA_ARGS_VALUE
+#endif
+
+#define CONCAT(a,b) CONCAT1(a,b)
+#define CONCAT1(a,b) a##b
+
+#ifndef STRUCTURE
+# define STRUCTURE ENTNAME
+#endif
+
+
+struct parser_data
+ {
+#ifdef ENTDATA
+ struct ENTDATA entdata;
+# define ENTDATA_DECL(data) struct ENTDATA *const entdata = &data->entdata;
+#else
+# define ENTDATA_DECL(data)
+#endif
+ char linebuffer[0];
+ };
+
+#ifdef ENTDATA
+/* The function can't be exported, because the entdata structure
+ is defined only in files-foo.c. */
+# define parser_stclass static inline
+# define nss_files_parse_hidden_def(name)
+#else
+/* Export the line parser function so it can be used in nss_db. */
+# define parser_stclass /* Global */
+# define parse_line CONCAT(_nss_files_parse_,ENTNAME)
+# define nss_files_parse_hidden_def(name) libc_hidden_def (name)
+#endif
+
+
+#ifdef EXTERN_PARSER
+
+/* The parser is defined in a different module. */
+extern int parse_line (char *line, struct STRUCTURE *result,
+ struct parser_data *data, size_t datalen, int *errnop
+ EXTRA_ARGS_DECL);
+
+# define LINE_PARSER(EOLSET, BODY) /* Do nothing */
+
+#else
+
+/* Define a line parsing function. */
+
+# define LINE_PARSER(EOLSET, BODY) \
+parser_stclass int \
+parse_line (char *line, struct STRUCTURE *result, \
+ struct parser_data *data, size_t datalen, int *errnop \
+ EXTRA_ARGS_DECL) \
+{ \
+ ENTDATA_DECL (data) \
+ char *p = strpbrk (line, EOLSET "\n"); \
+ if (p != NULL) \
+ *p = '\0'; \
+ BODY; \
+ TRAILING_LIST_PARSER; \
+ return 1; \
+} \
+nss_files_parse_hidden_def (parse_line)
+
+
+# define STRING_FIELD(variable, terminator_p, swallow) \
+ { \
+ variable = line; \
+ while (*line != '\0' && !terminator_p (*line)) \
+ ++line; \
+ if (*line != '\0') \
+ { \
+ *line = '\0'; \
+ do \
+ ++line; \
+ while (swallow && terminator_p (*line)); \
+ } \
+ }
+
+# define INT_FIELD(variable, terminator_p, swallow, base, convert) \
+ { \
+ char *endp; \
+ variable = convert (strtoul (line, &endp, base)); \
+ if (endp == line) \
+ return 0; \
+ else if (terminator_p (*endp)) \
+ do \
+ ++endp; \
+ while (swallow && terminator_p (*endp)); \
+ else if (*endp != '\0') \
+ return 0; \
+ line = endp; \
+ }
+
+# define INT_FIELD_MAYBE_NULL(variable, terminator_p, swallow, base, convert, default) \
+ { \
+ char *endp; \
+ if (*line == '\0') \
+ /* We expect some more input, so don't allow the string to end here. */ \
+ return 0; \
+ variable = convert (strtoul (line, &endp, base)); \
+ if (endp == line) \
+ variable = default; \
+ if (terminator_p (*endp)) \
+ do \
+ ++endp; \
+ while (swallow && terminator_p (*endp)); \
+ else if (*endp != '\0') \
+ return 0; \
+ line = endp; \
+ }
+
+# define ISCOLON(c) ((c) == ':')
+
+
+# ifndef TRAILING_LIST_MEMBER
+# define TRAILING_LIST_PARSER /* Nothing to do. */
+# else
+
+# define TRAILING_LIST_PARSER \
+{ \
+ char **list = parse_list (line, data, datalen, errnop); \
+ if (list) \
+ result->TRAILING_LIST_MEMBER = list; \
+ else \
+ return -1; /* -1 indicates we ran out of space. */ \
+}
+
+static inline char **
+parse_list (char *line, struct parser_data *data, size_t datalen, int *errnop)
+{
+ char *eol, **list, **p;
+
+ if (line >= data->linebuffer && line < (char *) data + datalen)
+ /* Find the end of the line buffer, we will use the space in DATA after
+ it for storing the vector of pointers. */
+ eol = strchr (line, '\0') + 1;
+ else
+ /* LINE does not point within DATA->linebuffer, so that space is
+ not being used for scratch space right now. We can use all of
+ it for the pointer vector storage. */
+ eol = data->linebuffer;
+ /* Adjust the pointer so it is aligned for storing pointers. */
+ eol += __alignof__ (char *) - 1;
+ eol -= (eol - (char *) 0) % __alignof__ (char *);
+ /* We will start the storage here for the vector of pointers. */
+ list = (char **) eol;
+
+ p = list;
+ while (1)
+ {
+ char *elt;
+
+ if ((size_t) ((char *) &p[1] - (char *) data) > datalen)
+ {
+ /* We cannot fit another pointer in the buffer. */
+ *errnop = ERANGE;
+ return NULL;
+ }
+ if (*line == '\0')
+ break;
+
+ /* Skip leading white space. This might not be portable but useful. */
+ while (isspace (*line))
+ ++line;
+
+ elt = line;
+ while (1)
+ {
+ if (*line == '\0' || TRAILING_LIST_SEPARATOR_P (*line))
+ {
+ /* End of the next entry. */
+ if (line > elt)
+ /* We really found some data. */
+ *p++ = elt;
+
+ /* Terminate string if necessary. */
+ if (*line != '\0')
+ *line++ = '\0';
+ break;
+ }
+ ++line;
+ }
+ }
+ *p = NULL;
+
+ return list;
+}
+
+# endif /* TRAILING_LIST_MEMBER */
+#endif /* EXTERN_PARSER */
+
+
+#define LOOKUP_NAME(nameelt, aliaselt) \
+{ \
+ char **ap; \
+ if (! strcmp (name, result->nameelt)) \
+ break; \
+ for (ap = result->aliaselt; *ap; ++ap) \
+ if (! strcmp (name, *ap)) \
+ break; \
+ if (*ap) \
+ break; \
+}
+
+#define LOOKUP_NAME_CASE(nameelt, aliaselt) \
+{ \
+ char **ap; \
+ if (! __strcasecmp (name, result->nameelt)) \
+ break; \
+ for (ap = result->aliaselt; *ap; ++ap) \
+ if (! __strcasecmp (name, *ap)) \
+ break; \
+ if (*ap) \
+ break; \
+}
+
+
+/* This is defined by db-*.c to include "../nss_db/db-XXX.c" instead. */
+#ifndef GENERIC
+# define GENERIC "files-XXX.c"
+#endif
diff --git a/src/generic.c b/src/generic.c
index f23792d..d604da8 100644
--- a/src/generic.c
+++ b/src/generic.c
@@ -16,7 +16,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ident "$Id: generic.c,v 1.1 2002/11/18 19:53:21 nalin Exp $"
+#ident "$Id: generic.c,v 1.2 2002/11/18 22:08:14 nalin Exp $"
#include "../config.h"
@@ -32,13 +32,11 @@
#include <stdlib.h>
#include <string.h>
-#include "parsers.h"
-#include <pwd.h>
-
#define CHUNK_SIZE LINE_MAX
#define FALSE 0
#define TRUE (!FALSE)
+/* Array of file name patterns we ignore. */
static const char *skip_names[] = {
"*~",
"*.rpmsave",
@@ -46,6 +44,7 @@ static const char *skip_names[] = {
"*.rpmnew",
};
+/* Return TRUE if we should ignore the file based on its name. */
static int
skip_file_by_name(const char *filename)
{
@@ -58,6 +57,7 @@ skip_file_by_name(const char *filename)
return FALSE;
}
+/* Read a line from the given file, no matter the length. */
static char *
read_line(FILE *fp)
{
@@ -117,7 +117,7 @@ getgen(struct STRUCTURE *result,
char path[PATH_MAX], *line;
/* Start reading the directory. */
- dir = opendir(SYSCONFDIR "/" FILENAME ".d");
+ dir = opendir(SYSCONFDIR "/" DATABASE ".d");
if (dir == NULL) {
*errnop = errno;
return NSS_STATUS_NOTFOUND;
@@ -131,7 +131,7 @@ getgen(struct STRUCTURE *result,
}
/* Figure out the full name of the file. */
- snprintf(path, sizeof(path), SYSCONFDIR "/" FILENAME ".d/%s",
+ snprintf(path, sizeof(path), SYSCONFDIR "/" DATABASE ".d/%s",
ent->d_name);
/* If we can't open it, skip it. */
@@ -268,9 +268,9 @@ setent(int stayopen)
/* Close and reopen the directory. */
endent();
LOCK();
- dir = opendir(SYSCONFDIR "/" FILENAME ".d");
+ dir = opendir(SYSCONFDIR "/" DATABASE ".d");
UNLOCK();
- return NSS_STATUS_UNAVAIL;
+ return (dir == NULL) ? NSS_STATUS_UNAVAIL : NSS_STATUS_SUCCESS;
}
enum nss_status
getent(struct STRUCTURE *result, char *buffer, size_t buflen, int *errnop)
@@ -319,7 +319,7 @@ getent(struct STRUCTURE *result, char *buffer, size_t buflen, int *errnop)
/* Formulate the full path name and try to
* open it. */
snprintf(path, sizeof(path),
- SYSCONFDIR "/" FILENAME ".d/%s",
+ SYSCONFDIR "/" DATABASE ".d/%s",
ent->d_name);
fp = fopen(path, "r");
@@ -361,9 +361,9 @@ getent(struct STRUCTURE *result, char *buffer, size_t buflen, int *errnop)
}
/* Try to parse the line. */
- if (parser(line, &structure,
- (struct parser_data*) buffer, buflen,
- errnop) != 0) {
+ if (parse_line(line, &structure,
+ (struct parser_data*) buffer, buflen,
+ errnop) != 0) {
free(line);
*result = structure;
UNLOCK();
diff --git a/src/glibc-parse.c b/src/glibc-parse.c
new file mode 100644
index 0000000..5d029b2
--- /dev/null
+++ b/src/glibc-parse.c
@@ -0,0 +1,191 @@
+/* Copyright (C) 1991, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+ This file is assembled from parts of the GNU C Library:
+ pwd/fgetpwent_r.c
+ grp/fgetgrent_r.c
+ shadow/sgetspent_r.c
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <grp.h>
+#include <pwd.h>
+#include <shadow.h>
+
+#define libc_hidden_def(ignored)
+#define _nss_files_parse_ _nss_directories_parse_
+
+/******************************************************************************/
+#undef STRUCTURE
+#undef ENTNAME
+#undef FALSE
+#undef parser_data
+#undef TRAILING_LIST_MEMBER
+#undef TRAILING_LIST_PARSER
+#undef TRAILING_LIST_SEPARATOR_P
+
+/* Define a line parsing function using the common code
+ used in the nss_files module. */
+
+#define STRUCTURE passwd
+#define ENTNAME pwent
+#define parser_data pwent_data
+
+#include "files-parse.c"
+LINE_PARSER
+(,
+ STRING_FIELD (result->pw_name, ISCOLON, 0);
+ if (line[0] == '\0'
+ && (result->pw_name[0] == '+' || result->pw_name[0] == '-'))
+ {
+ /* This a special case. We allow lines containing only a `+' sign
+ since this is used for nss_compat. All other services will
+ reject this entry later. Initialize all other fields now. */
+ result->pw_passwd = NULL;
+ result->pw_uid = 0;
+ result->pw_gid = 0;
+ result->pw_gecos = NULL;
+ result->pw_dir = NULL;
+ result->pw_shell = NULL;
+ }
+ else
+ {
+ STRING_FIELD (result->pw_passwd, ISCOLON, 0);
+ if (result->pw_name[0] == '+' || result->pw_name[0] == '-')
+ {
+ INT_FIELD_MAYBE_NULL (result->pw_uid, ISCOLON, 0, 10, , 0)
+ INT_FIELD_MAYBE_NULL (result->pw_gid, ISCOLON, 0, 10, , 0)
+ }
+ else
+ {
+ INT_FIELD (result->pw_uid, ISCOLON, 0, 10,)
+ INT_FIELD (result->pw_gid, ISCOLON, 0, 10,)
+ }
+ STRING_FIELD (result->pw_gecos, ISCOLON, 0);
+ STRING_FIELD (result->pw_dir, ISCOLON, 0);
+ result->pw_shell = line;
+ }
+ )
+
+/******************************************************************************/
+#undef STRUCTURE
+#undef ENTNAME
+#undef FALSE
+#undef parser_data
+#undef TRAILING_LIST_MEMBER
+#undef TRAILING_LIST_PARSER
+#undef TRAILING_LIST_SEPARATOR_P
+
+/* Define a line parsing function using the common code
+ used in the nss_files module. */
+
+#define STRUCTURE group
+#define ENTNAME grent
+#define parser_data grent_data
+
+#define TRAILING_LIST_MEMBER gr_mem
+#define TRAILING_LIST_SEPARATOR_P(c) ((c) == ',')
+#include "files-parse.c"
+LINE_PARSER
+(,
+ STRING_FIELD (result->gr_name, ISCOLON, 0);
+ if (line[0] == '\0'
+ && (result->gr_name[0] == '+' || result->gr_name[0] == '-'))
+ {
+ result->gr_passwd = NULL;
+ result->gr_gid = 0;
+ }
+ else
+ {
+ STRING_FIELD (result->gr_passwd, ISCOLON, 0);
+ if (result->gr_name[0] == '+' || result->gr_name[0] == '-')
+ INT_FIELD_MAYBE_NULL (result->gr_gid, ISCOLON, 0, 10, , 0)
+ else
+ INT_FIELD (result->gr_gid, ISCOLON, 0, 10,)
+ }
+ )
+
+/******************************************************************************/
+#undef STRUCTURE
+#undef ENTNAME
+#undef FALSE
+#undef parser_data
+#undef TRAILING_LIST_MEMBER
+#undef TRAILING_LIST_PARSER
+#undef TRAILING_LIST_SEPARATOR_P
+
+/* Define a line parsing function using the common code
+ used in the nss_files module. */
+
+#define STRUCTURE spwd
+#define ENTNAME spent
+#define parser_data spent_data
+
+/* Predicate which always returns false, needed below. */
+#define FALSE(arg) 0
+
+#include "files-parse.c"
+LINE_PARSER
+(,
+ STRING_FIELD (result->sp_namp, ISCOLON, 0);
+ if (line[0] == '\0'
+ && (result->sp_namp[0] == '+' || result->sp_namp[0] == '-'))
+ {
+ result->sp_pwdp = NULL;
+ result->sp_lstchg = 0;
+ result->sp_min = 0;
+ result->sp_max = 0;
+ result->sp_warn = -1l;
+ result->sp_inact = -1l;
+ result->sp_expire = -1l;
+ result->sp_flag = ~0ul;
+ }
+ else
+ {
+ STRING_FIELD (result->sp_pwdp, ISCOLON, 0);
+ INT_FIELD_MAYBE_NULL (result->sp_lstchg, ISCOLON, 0, 10, (long int),
+ (long int) -1);
+ INT_FIELD_MAYBE_NULL (result->sp_min, ISCOLON, 0, 10, (long int),
+ (long int) -1);
+ INT_FIELD_MAYBE_NULL (result->sp_max, ISCOLON, 0, 10, (long int),
+ (long int) -1);
+ while (isspace (*line))
+ ++line;
+ if (*line == '\0')
+ {
+ /* The old form. */
+ result->sp_warn = -1l;
+ result->sp_inact = -1l;
+ result->sp_expire = -1l;
+ result->sp_flag = ~0ul;
+ }
+ else
+ {
+ INT_FIELD_MAYBE_NULL (result->sp_warn, ISCOLON, 0, 10, (long int),
+ (long int) -1);
+ INT_FIELD_MAYBE_NULL (result->sp_inact, ISCOLON, 0, 10, (long int),
+ (long int) -1);
+ INT_FIELD_MAYBE_NULL (result->sp_expire, ISCOLON, 0, 10, (long int),
+ (long int) -1);
+ if (*line != '\0')
+ INT_FIELD_MAYBE_NULL (result->sp_flag, FALSE, 0, 10,
+ (unsigned long int), ~0ul)
+ else
+ result->sp_flag = ~0ul;
+ }
+ }
+ )
diff --git a/src/group.c b/src/group.c
index 6aebecb..5a13a6d 100644
--- a/src/group.c
+++ b/src/group.c
@@ -16,14 +16,28 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ident "$Id: group.c,v 1.1 2002/11/18 19:53:21 nalin Exp $"
+#ident "$Id: group.c,v 1.2 2002/11/18 22:08:14 nalin Exp $"
#include <sys/types.h>
#include <grp.h>
+/* Shared information. */
#define STRUCTURE group
-#define FILENAME "group"
+#define DATABASE "group"
+/* Parser. */
+#define ENTNAME grent
+#define ENTDATA grent_data
+struct grent_data {};
+
+#define libc_hidden_def(ignored)
+#define _nss_files_parse_ _nss_directories_parse_
+
+#define EXTERN_PARSER
+
+#include "files-parse.c"
+
+/* Lookup. */
#define getnam _nss_directories_getgrnam_r
#define getnam_field gr_name
@@ -35,6 +49,6 @@
#define getent _nss_directories_getgrent_r
#define endent _nss_directories_endgrent
-#define parser _nss_files_parse_grent
+#define parse_line _nss_directories_parse_grent
#include "generic.c"
diff --git a/src/passwd.c b/src/passwd.c
index 53b3159..8075f19 100644
--- a/src/passwd.c
+++ b/src/passwd.c
@@ -16,14 +16,28 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ident "$Id: passwd.c,v 1.1 2002/11/18 19:53:21 nalin Exp $"
+#ident "$Id: passwd.c,v 1.2 2002/11/18 22:08:14 nalin Exp $"
#include <sys/types.h>
#include <pwd.h>
+/* Shared information. */
#define STRUCTURE passwd
-#define FILENAME "passwd"
+#define DATABASE "passwd"
+/* Parser. */
+#define ENTNAME pwent
+#define ENTDATA pwent_data
+struct pwent_data {};
+
+#define libc_hidden_def(ignored)
+#define _nss_files_parse_ _nss_directories_parse_
+
+#define EXTERN_PARSER
+
+#include "files-parse.c"
+
+/* Lookup. */
#define getnam _nss_directories_getpwnam_r
#define getnam_field pw_name
@@ -35,6 +49,6 @@
#define getent _nss_directories_getpwent_r
#define endent _nss_directories_endpwent
-#define parser _nss_files_parse_pwent
+#define parse_line _nss_directories_parse_pwent
#include "generic.c"
diff --git a/src/protocols.c b/src/protocols.c
index 0a89a81..a7c3074 100644
--- a/src/protocols.c
+++ b/src/protocols.c
@@ -16,14 +16,34 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ident "$Id: protocols.c,v 1.1 2002/11/18 19:53:21 nalin Exp $"
+#ident "$Id: protocols.c,v 1.2 2002/11/18 22:08:14 nalin Exp $"
#include <sys/types.h>
#include <netdb.h>
+/* Shared information. */
#define STRUCTURE protoent
-#define FILENAME "protocols"
+#define DATABASE "protocols"
+/* Parser. */
+#define ENTNAME protoent
+struct protoent_data {};
+
+#define libc_hidden_def(ignored)
+#define _nss_files_parse_ _nss_directories_parse_
+
+#define TRAILING_LIST_MEMBER p_aliases
+#define TRAILING_LIST_SEPARATOR_P isspace
+
+#include "files-parse.c"
+
+LINE_PARSER
+("#",
+ STRING_FIELD (result->p_name, isspace, 1);
+ INT_FIELD (result->p_proto, isspace, 1, 10,);
+)
+
+/* Lookups. */
#define getnam _nss_directories_getprotobyname_r
#define getnam_field p_name
#define getnam_fields p_aliases
@@ -36,6 +56,4 @@
#define getent _nss_directories_getprotoent_r
#define endent _nss_directories_endprotoent
-#define parser _nss_files_parse_protoent
-
#include "generic.c"
diff --git a/src/services.c b/src/services.c
index 1ca091f..51ceb34 100644
--- a/src/services.c
+++ b/src/services.c
@@ -16,14 +16,37 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ident "$Id: services.c,v 1.1 2002/11/18 19:53:21 nalin Exp $"
+#ident "$Id: services.c,v 1.2 2002/11/18 22:08:14 nalin Exp $"
#include <sys/types.h>
#include <netdb.h>
+/* Shared settings. */
#define STRUCTURE servent
-#define FILENAME "services"
+#define DATABASE "services"
+/* Parser. */
+#define ENTNAME servent
+struct servent_data {};
+
+#define libc_hidden_def(ignored)
+#define _nss_files_parse_ _nss_directories_parse_
+
+#define TRAILING_LIST_MEMBER s_aliases
+#define TRAILING_LIST_SEPARATOR_P isspace
+
+#include "files-parse.c"
+
+#define ISSLASH(__c) ((__c) == '/')
+
+LINE_PARSER
+("#",
+ STRING_FIELD (result->s_name, isspace, 1);
+ INT_FIELD (result->s_port, ISSLASH, 10, 0, htons);
+ STRING_FIELD (result->s_proto, isspace, 1);
+)
+
+/* Lookups. */
#define getnam _nss_directories_getservbyname_r
#define getnam_field s_name
#define getnam_fields s_aliases
@@ -36,8 +59,6 @@
#define getent _nss_directories_getservent_r
#define endent _nss_directories_endservent
-#define parser _nss_files_parse_servent
-
#define GET_EXTRA_CRITERIA const char *protocol
#define EXTRA_CRITERIA_NAMES protocol
#define CHECK_EXTRA_CRITERIA(__s) (((__s)->s_proto != NULL) && strcmp((__s)->s_proto, protocol) == 0)
diff --git a/src/shadow.c b/src/shadow.c
index 0622f63..a2e90ee 100644
--- a/src/shadow.c
+++ b/src/shadow.c
@@ -16,14 +16,28 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ident "$Id: shadow.c,v 1.1 2002/11/18 19:53:21 nalin Exp $"
+#ident "$Id: shadow.c,v 1.2 2002/11/18 22:08:14 nalin Exp $"
#include <sys/types.h>
#include <shadow.h>
+/* Shared information. */
#define STRUCTURE spwd
-#define FILENAME "shadow"
+#define DATABASE "shadow"
+/* Parser. */
+#define ENTNAME spent
+#define ENTDATA spent_data
+struct spent_data {};
+
+#define libc_hidden_def(ignored)
+#define _nss_files_parse_ _nss_directories_parse_
+
+#define EXTERN_PARSER
+
+#include "files-parse.c"
+
+/* Lookups. */
#define getnam _nss_directories_getspnam_r
#define getnam_field sp_namp
@@ -31,6 +45,6 @@
#define getent _nss_directories_getspent_r
#define endent _nss_directories_endspent
-#define parser _nss_files_parse_spent
+#define parse_line _nss_directories_parse_spent
#include "generic.c"