From 6b21f0cf45ea2a8cd5926393a4c056b3a716c8af Mon Sep 17 00:00:00 2001 From: lennart Date: Sat, 19 Nov 2005 18:19:39 +0000 Subject: [PATCH 01/16] initial commit git-svn-id: svn+ssh://rootserver/home/lennart/svn/private/projects/nss-myhostname@83 bf9bc1cc-28ce-0310-abfb-9041aa761afb --- Makefile | 13 ++++ nss-myhostname.c | 164 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+) create mode 100644 Makefile create mode 100644 nss-myhostname.c diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000..9301fab9f2 --- /dev/null +++ b/Makefile @@ -0,0 +1,13 @@ +CFLAGS=-Wall -pipe -W -O2 -Wextra -Wno-unused-parameter + +libnss_myhostname.so.2: nss-myhostname.o + $(CC) -shared -o $@ -Wl,-soname,$@ $^ + strip $@ + +install: + install -D -g root -m 644 -o root -s -v libnss_myhostname.so.2 /usr/lib/libnss_myhostname.so.2 + +clean: + rm -f *.o *~ libnss_myhostname.so.2 + +.PHONY: clean diff --git a/nss-myhostname.c b/nss-myhostname.c new file mode 100644 index 0000000000..a459fd0ea0 --- /dev/null +++ b/nss-myhostname.c @@ -0,0 +1,164 @@ +/* + * This file is part of nss-myhostname. + * + * nss-myhostname 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. + * + * nss-myhostname 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 nss-myhostname; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define LOCALADDRESS (htonl(0x7F0002)) + +static enum nss_status fill_in_hostent( + const char *hn, + struct hostent *result, + char *buffer, + size_t buflen, + int *errnop, + int *h_errnop) { + + size_t l, idx; + char *r_addr, *r_name, *r_aliases, *r_addr_list; + + l = strlen(hn); + if (buflen < l+1+sizeof(char*)+4+sizeof(char*)*2) { + *errnop = ENOMEM; + *h_errnop = NO_RECOVERY; + return NSS_STATUS_TRYAGAIN; + } + + r_name = buffer; + strcpy(buffer, hn); + + idx = l+1; + + *(char**) (buffer + idx) = NULL; + r_aliases = buffer + idx; + idx += sizeof(char*); + + r_addr = buffer + idx; + *(uint32_t*) &buffer[idx] = LOCALADDRESS; + idx += 4; + + r_addr_list = buffer + idx; + * (char**) (buffer + idx) = r_addr; + * (((char**) (buffer + idx)) +1) = NULL; + + result->h_name = r_name; + result->h_aliases = (char**) r_aliases; + result->h_addrtype = AF_INET; + result->h_length = 4; + result->h_addr_list = (char**) r_addr_list; + + return NSS_STATUS_SUCCESS; +} + +enum nss_status _nss_hostname_gethostbyname2_r( + const char *name, + int af, + struct hostent * result, + char *buffer, + size_t buflen, + int *errnop, + int *h_errnop) { + + char hn[HOST_NAME_MAX+1]; + + assert(errnop); + assert(h_errnop); + + if (af == AF_UNSPEC) + af = AF_INET; + + if (af != AF_INET) { + *errnop = ENOENT; + *h_errnop = HOST_NOT_FOUND; + return NSS_STATUS_NOTFOUND; + } + + if (gethostname(hn, sizeof(hn)-1) < 0) { + *errnop = errno; + *h_errnop = NO_RECOVERY; + return NSS_STATUS_TRYAGAIN; + } + + hn[sizeof(hn)-1] = 0; + + if (strcasecmp(name, hn) != 0) { + *errnop = ENOENT; + *h_errnop = HOST_NOT_FOUND; + return NSS_STATUS_NOTFOUND; + } + + return fill_in_hostent(hn, result, buffer, buflen, errnop, h_errnop); +} + +enum nss_status _nss_hostname_gethostbyname_r ( + const char *name, + struct hostent *result, + char *buffer, + size_t buflen, + int *errnop, + int *h_errnop) { + + return _nss_hostname_gethostbyname2_r( + name, + AF_UNSPEC, + result, + buffer, + buflen, + errnop, + h_errnop); +} + +enum nss_status _nss_hostname_gethostbyaddr_r( + const void* addr, + int len, + int af, + struct hostent *result, + char *buffer, + size_t buflen, + int *errnop, + int *h_errnop) { + + char hn[HOST_NAME_MAX+1]; + + assert(errnop); + assert(h_errnop); + + if (af != AF_INET || len != 4 || (*(uint32_t*) addr) != LOCALADDRESS) { + *errnop = ENOENT; + *h_errnop = HOST_NOT_FOUND; + return NSS_STATUS_NOTFOUND; + } + + if (gethostname(hn, sizeof(hn)-1) < 0) { + *errnop = errno; + *h_errnop = NO_RECOVERY; + return NSS_STATUS_TRYAGAIN; + } + + hn[sizeof(hn)-1] = 0; + + return fill_in_hostent(hn, result, buffer, buflen, errnop, h_errnop); +} From afbb33b5242fa09ef6097ba921113ebee92d9780 Mon Sep 17 00:00:00 2001 From: lennart Date: Sat, 19 Nov 2005 18:50:07 +0000 Subject: [PATCH 02/16] update nss-myhostname git-svn-id: svn+ssh://rootserver/home/lennart/svn/private/projects/nss-myhostname@84 bf9bc1cc-28ce-0310-abfb-9041aa761afb --- Makefile | 4 ++-- nss-myhostname.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 9301fab9f2..6b129dfc9b 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ CFLAGS=-Wall -pipe -W -O2 -Wextra -Wno-unused-parameter libnss_myhostname.so.2: nss-myhostname.o - $(CC) -shared -o $@ -Wl,-soname,$@ $^ + $(CC) $(CFLAGS) -shared -o $@ -Wl,-soname,$@ $^ strip $@ install: - install -D -g root -m 644 -o root -s -v libnss_myhostname.so.2 /usr/lib/libnss_myhostname.so.2 + install -D -g root -m 644 -o root -v libnss_myhostname.so.2 /lib/libnss_myhostname.so.2 clean: rm -f *.o *~ libnss_myhostname.so.2 diff --git a/nss-myhostname.c b/nss-myhostname.c index a459fd0ea0..22eddd8f2a 100644 --- a/nss-myhostname.c +++ b/nss-myhostname.c @@ -27,7 +27,7 @@ #include #include -#define LOCALADDRESS (htonl(0x7F0002)) +#define LOCALADDRESS (htonl(0x7F000002)) static enum nss_status fill_in_hostent( const char *hn, @@ -73,7 +73,7 @@ static enum nss_status fill_in_hostent( return NSS_STATUS_SUCCESS; } -enum nss_status _nss_hostname_gethostbyname2_r( +enum nss_status _nss_myhostname_gethostbyname2_r( const char *name, int af, struct hostent * result, @@ -113,7 +113,7 @@ enum nss_status _nss_hostname_gethostbyname2_r( return fill_in_hostent(hn, result, buffer, buflen, errnop, h_errnop); } -enum nss_status _nss_hostname_gethostbyname_r ( +enum nss_status _nss_myhostname_gethostbyname_r ( const char *name, struct hostent *result, char *buffer, @@ -121,7 +121,7 @@ enum nss_status _nss_hostname_gethostbyname_r ( int *errnop, int *h_errnop) { - return _nss_hostname_gethostbyname2_r( + return _nss_myhostname_gethostbyname2_r( name, AF_UNSPEC, result, @@ -131,7 +131,7 @@ enum nss_status _nss_hostname_gethostbyname_r ( h_errnop); } -enum nss_status _nss_hostname_gethostbyaddr_r( +enum nss_status _nss_myhostname_gethostbyaddr_r( const void* addr, int len, int af, @@ -146,7 +146,7 @@ enum nss_status _nss_hostname_gethostbyaddr_r( assert(errnop); assert(h_errnop); - if (af != AF_INET || len != 4 || (*(uint32_t*) addr) != LOCALADDRESS) { + if (af != AF_INET || len < 4 || (*(uint32_t*) addr) != LOCALADDRESS) { *errnop = ENOENT; *h_errnop = HOST_NOT_FOUND; return NSS_STATUS_NOTFOUND; From df2ce9dbb6e0d55aa375f57293a7b2bf31f44be7 Mon Sep 17 00:00:00 2001 From: lennart Date: Sat, 19 Nov 2005 19:05:05 +0000 Subject: [PATCH 03/16] clean up for distribution git-svn-id: svn+ssh://rootserver/home/lennart/svn/private/projects/nss-myhostname@85 bf9bc1cc-28ce-0310-abfb-9041aa761afb --- Makefile | 14 +++++++++++++- README | 17 +++++++++++++++++ nss-myhostname.c | 2 ++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 README diff --git a/Makefile b/Makefile index 6b129dfc9b..9a528a17e9 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,7 @@ +# $Id$ + CFLAGS=-Wall -pipe -W -O2 -Wextra -Wno-unused-parameter +VERSION=0.1 libnss_myhostname.so.2: nss-myhostname.o $(CC) $(CFLAGS) -shared -o $@ -Wl,-soname,$@ $^ @@ -10,4 +13,13 @@ install: clean: rm -f *.o *~ libnss_myhostname.so.2 -.PHONY: clean +nss-myhostname.tar.gz: + rm -rf "nss-myhostname-$(VERSION)" + mkdir "nss-myhostname-$(VERSION)" + cp Makefile README *.c "nss-myhostname-$(VERSION)"/ + tar czf "nss-myhostname-$(VERSION).tar.gz" "nss-myhostname-$(VERSION)"/ + rm -rf "nss-myhostname-$(VERSION)" + +tar: nss-myhostname.tar.gz + +.PHONY: clean install tar diff --git a/README b/README new file mode 100644 index 0000000000..205118d4ec --- /dev/null +++ b/README @@ -0,0 +1,17 @@ +nss-myhostname is a GNU libc NSS module that statically translates the +local host name to the IP address 127.0.0.2 (which is on the loopback +device) and vice versa. + +This is useful to make sure that the local host name is always +resolvable. Some programs (such as sudo) require this functionality. + +Especially on embedded systems it may not be desirable to modify +/etc/hosts to match the current host name. + +It is a good idea to put this module as last resort in +/etc/nsswitch.conf, to make sure that other name service take +precedence. + +-- Lennart Poettering, lennart [at] poettering [dot] de + +$Id$ diff --git a/nss-myhostname.c b/nss-myhostname.c index 22eddd8f2a..b8a81ef558 100644 --- a/nss-myhostname.c +++ b/nss-myhostname.c @@ -1,3 +1,5 @@ +/* $Id$ */ + /* * This file is part of nss-myhostname. * From 4e714a2b1a65876c258d88863fd49b39a7f24d8e Mon Sep 17 00:00:00 2001 From: lennart Date: Sat, 19 Nov 2005 19:09:25 +0000 Subject: [PATCH 04/16] add LICENSE git-svn-id: svn+ssh://rootserver/home/lennart/svn/private/projects/nss-myhostname@86 bf9bc1cc-28ce-0310-abfb-9041aa761afb --- LICENSE | 510 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 3 +- 2 files changed, 512 insertions(+), 1 deletion(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..2d2d780e60 --- /dev/null +++ b/LICENSE @@ -0,0 +1,510 @@ + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin St, 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. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + 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 Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations +below. + + When we speak of free software, we are referring to freedom of use, +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 and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +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 other code 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. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it +becomes a de-facto standard. To achieve this, non-free programs must +be allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + 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, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser 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 combine 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) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) 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. + + d) 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. + + e) 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 materials to be 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 with +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 Lesser 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. + + + + Copyright (C) + + This 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. + + 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/Makefile b/Makefile index 9a528a17e9..af32519dde 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,8 @@ clean: nss-myhostname.tar.gz: rm -rf "nss-myhostname-$(VERSION)" mkdir "nss-myhostname-$(VERSION)" - cp Makefile README *.c "nss-myhostname-$(VERSION)"/ + cp Makefile LICENSE README *.c "nss-myhostname-$(VERSION)"/ + rm -f "nss-myhostname-$(VERSION).tar.gz" tar czf "nss-myhostname-$(VERSION).tar.gz" "nss-myhostname-$(VERSION)"/ rm -rf "nss-myhostname-$(VERSION)" From 58c4c59eeffb6ae45c077bd6162a2a5d67748a0c Mon Sep 17 00:00:00 2001 From: lennart Date: Sat, 19 Nov 2005 19:34:10 +0000 Subject: [PATCH 05/16] add homepage target git-svn-id: svn+ssh://rootserver/home/lennart/svn/private/projects/nss-myhostname@87 bf9bc1cc-28ce-0310-abfb-9041aa761afb --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index af32519dde..f833d1e504 100644 --- a/Makefile +++ b/Makefile @@ -23,4 +23,10 @@ nss-myhostname.tar.gz: tar: nss-myhostname.tar.gz +homepage: tar + test -d $$HOME/homepage/private + mkdir -p $$HOME/homepage/private/projects/nss-myhostname + cp nss-myhostname-$(VERSION).tar.gz README $$HOME/homepage/private/projects/nss-myhostname + ln -sf README $$HOME/homepage/private/projects/nss-myhostname/README.txt + .PHONY: clean install tar From accd92cf4347269b5a58e425c7f55e652f0fdedf Mon Sep 17 00:00:00 2001 From: lennart Date: Sat, 19 Nov 2005 19:58:29 +0000 Subject: [PATCH 06/16] beef up peekvc a little git-svn-id: svn+ssh://rootserver/home/lennart/svn/private/projects/nss-myhostname@88 bf9bc1cc-28ce-0310-abfb-9041aa761afb --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f833d1e504..5ebafc1532 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ install: clean: rm -f *.o *~ libnss_myhostname.so.2 -nss-myhostname.tar.gz: +nss-myhostname-$(VERSION).tar.gz: rm -rf "nss-myhostname-$(VERSION)" mkdir "nss-myhostname-$(VERSION)" cp Makefile LICENSE README *.c "nss-myhostname-$(VERSION)"/ @@ -21,12 +21,12 @@ nss-myhostname.tar.gz: tar czf "nss-myhostname-$(VERSION).tar.gz" "nss-myhostname-$(VERSION)"/ rm -rf "nss-myhostname-$(VERSION)" -tar: nss-myhostname.tar.gz +tar: nss-myhostname-$(VERSION).tar.gz homepage: tar test -d $$HOME/homepage/private mkdir -p $$HOME/homepage/private/projects/nss-myhostname cp nss-myhostname-$(VERSION).tar.gz README $$HOME/homepage/private/projects/nss-myhostname ln -sf README $$HOME/homepage/private/projects/nss-myhostname/README.txt - -.PHONY: clean install tar + +.PHONY: clean install tar homepage From 4e8c8252476aaaaa826104362557c084a5d5b978 Mon Sep 17 00:00:00 2001 From: lennart Date: Sun, 26 Oct 2008 23:02:23 +0000 Subject: [PATCH 07/16] big big update git-svn-id: svn+ssh://rootserver/home/lennart/svn/private/projects/nss-myhostname@157 bf9bc1cc-28ce-0310-abfb-9041aa761afb --- Makefile | 2 +- nss-myhostname.c | 393 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 267 insertions(+), 128 deletions(-) diff --git a/Makefile b/Makefile index 5ebafc1532..b0cd5119ed 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # $Id$ -CFLAGS=-Wall -pipe -W -O2 -Wextra -Wno-unused-parameter +CFLAGS=-Wall -pipe -W -O2 -Wextra -Wno-unused-parameter -fPIC VERSION=0.1 libnss_myhostname.so.2: nss-myhostname.o diff --git a/nss-myhostname.c b/nss-myhostname.c index b8a81ef558..d3404de5ae 100644 --- a/nss-myhostname.c +++ b/nss-myhostname.c @@ -1,23 +1,25 @@ -/* $Id$ */ +/*-*- Mode: C; c-basic-offset: 8 -*-*/ -/* - * This file is part of nss-myhostname. - * - * nss-myhostname 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. - * - * nss-myhostname 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 nss-myhostname; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - */ + +/*** + This file is part of nss-myhostname. + + Copyright 2008 Lennart Poettering + + nss-myhostname 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. + + nss-myhostname 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 nss-myhostname. If not, If not, see + . +***/ #include #include @@ -28,139 +30,276 @@ #include #include #include +#include -#define LOCALADDRESS (htonl(0x7F000002)) +/* We use 127.0.0.2 as IPv4 address. This has the advantage over + * 127.0.0.1 that it can be translated back to the local hostname. For + * IPv6 we use ::1 which unfortunately will not translate back to the + * hostname but instead something like "localhost6" or so. */ + +#define LOCALADDRESS_IPV4 (htonl(0x7F000002)) +#define LOCALADDRESS_IPV6 &in6addr_loopback +#define LOOPBACK_INTERFACE "lo" + +#define ALIGN(a) (((a+sizeof(void*)-1)/sizeof(void*))*sizeof(void*)) + +enum nss_status _nss_myhostname_gethostbyname4_r( + const char *name, + struct gaih_addrtuple **pat, + char *buffer, size_t buflen, + int *errnop, int *h_errnop, + int32_t *ttlp) { + + unsigned ifi; + char hn[HOST_NAME_MAX+1]; + size_t l, idx, ms; + char *r_name; + struct gaih_addrtuple *r_tuple1, *r_tuple2; + + memset(hn, 0, sizeof(hn)); + if (gethostname(hn, sizeof(hn)-1) < 0) { + *errnop = errno; + *h_errnop = NO_RECOVERY; + return NSS_STATUS_UNAVAIL; + } + + if (strcasecmp(name, hn) != 0) { + *errnop = ENOENT; + *h_errnop = HOST_NOT_FOUND; + return NSS_STATUS_NOTFOUND; + } + + /* If this call fails we fill in 0 as scope. Which is fine */ + ifi = if_nametoindex(LOOPBACK_INTERFACE); + + l = strlen(hn); + ms = ALIGN(l+1)+ALIGN(sizeof(struct gaih_addrtuple))*2; + if (buflen < ms) { + *errnop = ENOMEM; + *h_errnop = NO_RECOVERY; + return NSS_STATUS_TRYAGAIN; + } + + /* First, fill in hostname */ + r_name = buffer; + memcpy(r_name, hn, l+1); + idx = ALIGN(l+1); + + /* Second, fill in IPv4 tuple */ + r_tuple1 = (struct gaih_addrtuple*) (buffer + idx); + r_tuple1->next = NULL; + r_tuple1->name = r_name; + r_tuple1->family = AF_INET; + *(uint32_t*) r_tuple1->addr = LOCALADDRESS_IPV4; + r_tuple1->scopeid = (uint32_t) ifi; + idx += ALIGN(sizeof(struct gaih_addrtuple)); + + /* Third, fill in IPv6 tuple */ + r_tuple2 = (struct gaih_addrtuple*) (buffer + idx); + r_tuple2->next = r_tuple1; + r_tuple2->name = r_name; + r_tuple2->family = AF_INET6; + memcpy(r_tuple2->addr, LOCALADDRESS_IPV6, 16); + r_tuple1->scopeid = (uint32_t) ifi; + idx += ALIGN(sizeof(struct gaih_addrtuple)); + + /* Verify the size matches */ + assert(idx == ms); + + *pat = r_tuple2; + + if (ttlp) + *ttlp = 0; + + return NSS_STATUS_SUCCESS; +} static enum nss_status fill_in_hostent( - const char *hn, - struct hostent *result, - char *buffer, - size_t buflen, - int *errnop, - int *h_errnop) { + const char *hn, + int af, + struct hostent *result, + char *buffer, size_t buflen, + int *errnop, int *h_errnop, + int32_t *ttlp, + char **canonp) { - size_t l, idx; - char *r_addr, *r_name, *r_aliases, *r_addr_list; + size_t l, idx, ms; + char *r_addr, *r_name, *r_aliases, *r_addr_list; + size_t alen; - l = strlen(hn); - if (buflen < l+1+sizeof(char*)+4+sizeof(char*)*2) { - *errnop = ENOMEM; - *h_errnop = NO_RECOVERY; - return NSS_STATUS_TRYAGAIN; - } - - r_name = buffer; - strcpy(buffer, hn); + alen = af == AF_INET ? 4 : 16; - idx = l+1; + l = strlen(hn); + ms = ALIGN(l+1)+sizeof(char*)+ALIGN(alen)+sizeof(char*)*2; + if (buflen < ms) { + *errnop = ENOMEM; + *h_errnop = NO_RECOVERY; + return NSS_STATUS_TRYAGAIN; + } - *(char**) (buffer + idx) = NULL; - r_aliases = buffer + idx; - idx += sizeof(char*); - - r_addr = buffer + idx; - *(uint32_t*) &buffer[idx] = LOCALADDRESS; - idx += 4; + /* First, fill in hostname */ + r_name = buffer; + memcpy(r_name, hn, l+1); + idx = ALIGN(l+1); - r_addr_list = buffer + idx; - * (char**) (buffer + idx) = r_addr; - * (((char**) (buffer + idx)) +1) = NULL; - - result->h_name = r_name; - result->h_aliases = (char**) r_aliases; - result->h_addrtype = AF_INET; - result->h_length = 4; - result->h_addr_list = (char**) r_addr_list; + /* Second, create aliases array */ + r_aliases = buffer + idx; + *(char**) r_aliases = NULL; + idx += sizeof(char*); - return NSS_STATUS_SUCCESS; + /* Third, add address */ + r_addr = buffer + idx; + if (af == AF_INET) + *(uint32_t*) r_addr = LOCALADDRESS_IPV4; + else + memcpy(r_addr, LOCALADDRESS_IPV6, 16); + idx += ALIGN(alen); + + /* Fourth, add address pointer array */ + r_addr_list = buffer + idx; + ((char**) r_addr_list)[0] = r_addr; + ((char**) r_addr_list)[1] = NULL; + idx += sizeof(char*)*2; + + /* Verify the size matches */ + assert(idx == ms); + + result->h_name = r_name; + result->h_aliases = (char**) r_aliases; + result->h_addrtype = af; + result->h_length = alen; + result->h_addr_list = (char**) r_addr_list; + + if (ttlp) + *ttlp = 0; + + if (canonp) + *canonp = r_name; + + return NSS_STATUS_SUCCESS; +} + +enum nss_status _nss_myhostname_gethostbyname3_r( + const char *name, + int af, + struct hostent *host, + char *buffer, size_t buflen, + int *errnop, int *h_errnop, + int32_t *ttlp, + char **canonp) { + + char hn[HOST_NAME_MAX+1]; + + if (af == AF_UNSPEC) + af = AF_INET; + + if (af != AF_INET && af != AF_INET6) { + *errnop = EAFNOSUPPORT; + *h_errnop = NO_DATA; + return NSS_STATUS_UNAVAIL; + } + + memset(hn, 0, sizeof(hn)); + if (gethostname(hn, sizeof(hn)-1) < 0) { + *errnop = errno; + *h_errnop = NO_RECOVERY; + return NSS_STATUS_UNAVAIL; + } + + if (strcasecmp(name, hn) != 0) { + *errnop = ENOENT; + *h_errnop = HOST_NOT_FOUND; + return NSS_STATUS_NOTFOUND; + } + + return fill_in_hostent(hn, af, host, buffer, buflen, errnop, h_errnop, ttlp, canonp); } enum nss_status _nss_myhostname_gethostbyname2_r( - const char *name, - int af, - struct hostent * result, - char *buffer, - size_t buflen, - int *errnop, - int *h_errnop) { + const char *name, + int af, + struct hostent *host, + char *buffer, size_t buflen, + int *errnop, int *h_errnop) { - char hn[HOST_NAME_MAX+1]; - - assert(errnop); - assert(h_errnop); - - if (af == AF_UNSPEC) - af = AF_INET; - - if (af != AF_INET) { - *errnop = ENOENT; - *h_errnop = HOST_NOT_FOUND; - return NSS_STATUS_NOTFOUND; - } - - if (gethostname(hn, sizeof(hn)-1) < 0) { - *errnop = errno; - *h_errnop = NO_RECOVERY; - return NSS_STATUS_TRYAGAIN; - } - - hn[sizeof(hn)-1] = 0; - - if (strcasecmp(name, hn) != 0) { - *errnop = ENOENT; - *h_errnop = HOST_NOT_FOUND; - return NSS_STATUS_NOTFOUND; - } - - return fill_in_hostent(hn, result, buffer, buflen, errnop, h_errnop); + return _nss_myhostname_gethostbyname3_r( + name, + af, + host, + buffer, buflen, + errnop, h_errnop, + NULL, + NULL); } enum nss_status _nss_myhostname_gethostbyname_r ( - const char *name, - struct hostent *result, - char *buffer, - size_t buflen, - int *errnop, - int *h_errnop) { + const char *name, + struct hostent *host, + char *buffer, size_t buflen, + int *errnop, int *h_errnop) { - return _nss_myhostname_gethostbyname2_r( - name, - AF_UNSPEC, - result, - buffer, - buflen, - errnop, - h_errnop); + return _nss_myhostname_gethostbyname3_r( + name, + AF_UNSPEC, + host, + buffer, buflen, + errnop, h_errnop, + NULL, + NULL); } -enum nss_status _nss_myhostname_gethostbyaddr_r( - const void* addr, - int len, - int af, - struct hostent *result, - char *buffer, - size_t buflen, - int *errnop, - int *h_errnop) { +enum nss_status _nss_myhostname_gethostbyaddr2_r( + const void* addr, socklen_t len, + int af, + struct hostent *host, + char *buffer, size_t buflen, + int *errnop, int *h_errnop, + int32_t *ttlp) { - char hn[HOST_NAME_MAX+1]; + char hn[HOST_NAME_MAX+1]; - assert(errnop); - assert(h_errnop); + if (af == AF_INET) { + if (len != 4 || + (*(uint32_t*) addr) != LOCALADDRESS_IPV4) + goto not_found; - if (af != AF_INET || len < 4 || (*(uint32_t*) addr) != LOCALADDRESS) { + } else if (af == AF_INET6) { + if (len != 16 || + memcmp(addr, LOCALADDRESS_IPV6, 16) != 0) + goto not_found; + } else { + *errnop = EAFNOSUPPORT; + *h_errnop = NO_DATA; + return NSS_STATUS_UNAVAIL; + } + + memset(hn, 0, sizeof(hn)); + if (gethostname(hn, sizeof(hn)-1) < 0) { + *errnop = errno; + *h_errnop = NO_RECOVERY; + return NSS_STATUS_UNAVAIL; + } + + return fill_in_hostent(hn, af, host, buffer, buflen, errnop, h_errnop, ttlp, NULL); + +not_found: *errnop = ENOENT; *h_errnop = HOST_NOT_FOUND; return NSS_STATUS_NOTFOUND; - } +} - if (gethostname(hn, sizeof(hn)-1) < 0) { - *errnop = errno; - *h_errnop = NO_RECOVERY; - return NSS_STATUS_TRYAGAIN; - } +enum nss_status _nss_myhostname_gethostbyaddr_r( + const void* addr, socklen_t len, + int af, + struct hostent *host, + char *buffer, size_t buflen, + int *errnop, int *h_errnop) { - hn[sizeof(hn)-1] = 0; - - return fill_in_hostent(hn, result, buffer, buflen, errnop, h_errnop); + return _nss_myhostname_gethostbyaddr2_r( + addr, len, + af, + host, + buffer, buflen, + errnop, h_errnop, + NULL); } From ab1ecd3c9a303765f5158a9d4692f6fcbea02540 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 27 Oct 2008 19:46:50 +0100 Subject: [PATCH 08/16] autoconfization --- .gitignore | 23 ++++ Makefile | 32 ------ Makefile.am | 51 +++++++++ bootstrap.sh | 66 ++++++++++++ configure.ac | 76 +++++++++++++ doc/.gitignore | 2 + doc/Makefile.am | 38 +++++++ doc/README.html.in | 158 +++++++++++++++++++++++++++ doc/style.css | 25 +++++ m4/attributes.m4 | 258 +++++++++++++++++++++++++++++++++++++++++++++ m4/zp_lynx_doc.m4 | 24 +++++ nss-myhostname.c | 5 +- 12 files changed, 725 insertions(+), 33 deletions(-) create mode 100644 .gitignore delete mode 100644 Makefile create mode 100644 Makefile.am create mode 100755 bootstrap.sh create mode 100644 configure.ac create mode 100644 doc/.gitignore create mode 100644 doc/Makefile.am create mode 100644 doc/README.html.in create mode 100644 doc/style.css create mode 100644 m4/attributes.m4 create mode 100644 m4/zp_lynx_doc.m4 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..8f31d72968 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +.deps +.libs +*.cache +configure +Makefile +stamp-* +*.la +*.lo +*.log +*.so.2 +Makefile.in +aclocal.m4 +config.guess +config.h +config.h.in +config.rpath +config.status +config.sub +depcomp +install-sh +libtool +ltmain.sh +missing diff --git a/Makefile b/Makefile deleted file mode 100644 index b0cd5119ed..0000000000 --- a/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# $Id$ - -CFLAGS=-Wall -pipe -W -O2 -Wextra -Wno-unused-parameter -fPIC -VERSION=0.1 - -libnss_myhostname.so.2: nss-myhostname.o - $(CC) $(CFLAGS) -shared -o $@ -Wl,-soname,$@ $^ - strip $@ - -install: - install -D -g root -m 644 -o root -v libnss_myhostname.so.2 /lib/libnss_myhostname.so.2 - -clean: - rm -f *.o *~ libnss_myhostname.so.2 - -nss-myhostname-$(VERSION).tar.gz: - rm -rf "nss-myhostname-$(VERSION)" - mkdir "nss-myhostname-$(VERSION)" - cp Makefile LICENSE README *.c "nss-myhostname-$(VERSION)"/ - rm -f "nss-myhostname-$(VERSION).tar.gz" - tar czf "nss-myhostname-$(VERSION).tar.gz" "nss-myhostname-$(VERSION)"/ - rm -rf "nss-myhostname-$(VERSION)" - -tar: nss-myhostname-$(VERSION).tar.gz - -homepage: tar - test -d $$HOME/homepage/private - mkdir -p $$HOME/homepage/private/projects/nss-myhostname - cp nss-myhostname-$(VERSION).tar.gz README $$HOME/homepage/private/projects/nss-myhostname - ln -sf README $$HOME/homepage/private/projects/nss-myhostname/README.txt - -.PHONY: clean install tar homepage diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000000..9b1dcab7e4 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,51 @@ +# This file is part of nss-myhostname. +# +# Copyright 2008 Lennart Poettering +# +# nss-myhostname 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. +# +# nss-myhostname 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 nss-myhostname. If not, If not, see +# . + +ACLOCAL_AMFLAGS = -I m4 + +lib_LTLIBRARIES = libnss_myhostname.la + +EXTRA_DIST=bootstrap.sh README LICENSE +SUBDIRS=doc + +MAINTAINERCLEANFILES=README +noinst_DATA = README + +README: + rm -f README + $(MAKE) -C doc README + cd $(srcdir) && ln -s doc/README README + +homepage: all dist + test -d $$HOME/homepage/private + mkdir -p $$HOME/homepage/private/projects/nss-myhostname + cp nss-myhostname-@PACKAGE_VERSION@.tar.gz doc/README.html doc/style.css $$HOME/homepage/private/projects/nss-myhostname + ln -sf README.html $$HOME/homepage/private/projects/nss-myhostname/index.html + +.PHONY: homepage + +libnss_myhostname_la_SOURCES = nss-myhostname.c +libnss_myhostname_la_LDFLAGS = -avoid-version -module -export-dynamic -shrext .so.2 + +install-exec-hook: + rm -f $(DESTDIR)$(libdir)/libnss_myhostname.la + rm -f $(DESTDIR)$(libdir)/libnss_myhostname_minimal.la + +uninstall-hook: + rm -f $(DESTDIR)$(libdir)/libnss_myhostname.so.2 + rm -f $(DESTDIR)$(libdir)/libnss_myhostname_minimal.so.2 diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100755 index 0000000000..d224f31fb5 --- /dev/null +++ b/bootstrap.sh @@ -0,0 +1,66 @@ +#!/bin/bash + +# This file is part of nss-myhostname. +# +# Copyright 2008 Lennart Poettering +# +# nss-myhostname 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. +# +# nss-myhostname 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 nss-myhostname. If not, If not, see +# . + +VERSION=1.9 + +run_versioned() { + local P + local V + + V=$(echo "$2" | sed -e 's,\.,,g') + + if [ -e "`which $1$V 2> /dev/null`" ] ; then + P="$1$V" + else + if [ -e "`which $1-$2 2> /dev/null`" ] ; then + P="$1-$2" + else + P="$1" + fi + fi + + shift 2 + "$P" "$@" +} + +set -ex + +if [ "x$1" = "xam" ] ; then + run_versioned automake "$VERSION" -a -c --foreign + ./config.status +else + rm -rf autom4te.cache + rm -f config.cache + + touch config.rpath + test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize + + mkdir -p m4 + "$LIBTOOLIZE" -c --force + run_versioned aclocal "$VERSION" -I m4 + run_versioned autoconf 2.59 -Wall + run_versioned autoheader 2.59 + run_versioned automake "$VERSION" --copy --foreign --add-missing + + if test "x$NOCONFIGURE" = "x"; then + CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@" + make clean + fi +fi diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000000..e1fbb79e33 --- /dev/null +++ b/configure.ac @@ -0,0 +1,76 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +# This file is part of nss-myhostname. +# +# Copyright 2008 Lennart Poettering +# +# nss-myhostname 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. +# +# nss-myhostname 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 nss-myhostname. If not, If not, see +# . + +AC_PREREQ(2.62) +AC_INIT([nss-myhostname],[0.2],[mzzlubfganzr (at) 0pointer (dot) de]) +AC_CONFIG_SRCDIR([nss-myhostname.c]) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR(m4) + +AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) + +AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/nss-myhostname/]) + +ac_default_prefix="/" + +# Checks for programs. +AC_PROG_CC +AC_PROG_CC_C99 +AC_USE_SYSTEM_EXTENSIONS +AC_PROG_CPP +AC_PROG_INSTALL +AC_PROG_LN_S +AC_PROG_MAKE_SET + +# GCC flags + +DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissin +g-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Winline -Wno-un +used-parameter -ffast-math" + +for flag in $DESIRED_FLAGS ; do + CC_CHECK_CFLAGS([$flag], [CFLAGS="$CFLAGS $flag"]) +done + +# libtool stuff +AC_DISABLE_STATIC +AC_PROG_LIBTOOL + +# Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h nss.h sys/ioctl.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_TYPE_SIZE_T +AC_HEADER_TIME + +# Checks for library functions. +AC_FUNC_MALLOC +AC_FUNC_SELECT_ARGTYPES +AC_CHECK_FUNCS([gethostbyaddr gethostbyname gettimeofday inet_ntoa memset select socket strcspn strdup strerror strncasecmp strcasecmp strspn]) + +# LYNX documentation generation +ZP_LYNX_DOC + +AC_CONFIG_FILES([Makefile doc/Makefile doc/README.html ]) + +AC_OUTPUT diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 0000000000..bc63974b07 --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,2 @@ +README +README.html diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000000..4f773ac2c6 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,38 @@ +# This file is part of nss-myhostname. +# +# Copyright 2008 Lennart Poettering +# +# nss-myhostname 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. +# +# nss-myhostname 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 nss-myhostname. If not, If not, see +# . + +dist_html_DATA = README.html style.css +EXTRA_DIST = README.html.in + +MAINTAINERCLEANFILES = README.html +CLEANFILES = + +if USE_LYNX +dist_doc_DATA = README +MAINTAINERCLEANFILES += README + +README: README.html + lynx --dump $^ | sed 's,file://localhost/.*/doc/README.html,README,' > $@ + +CLEANFILES += README +endif + +tidy: README.html + tidy -qe < README.html ; true + +.PHONY: tidy diff --git a/doc/README.html.in b/doc/README.html.in new file mode 100644 index 0000000000..4721c4dc24 --- /dev/null +++ b/doc/README.html.in @@ -0,0 +1,158 @@ + + + + + +nss-myhostname @PACKAGE_VERSION@ + + + + +

nss-myhostname @PACKAGE_VERSION@

+ +

Copyright 2005-2008 Lennart Poettering <@PACKAGE_BUGREPORT@>

+ + + +

License

+ +

This program 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.

+ +

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 +Lesser General Public License for more details.

+ +

News

+ +
Mon Oct 27 2008:
+ +

Version 0.2 +released. Changes include: Update for IPv6 and newest glibc NSS interfaces

+ +
Sat Nov 19 2005:
+ +

Version 0.1 +released. Initial release.

+ +

Overview

+ +

nss-myhostname is a plugin for the GNU Name Service Switch +(NSS) functionality of the GNU C Library (glibc) providing +host name resolution for the locally configured system hostname as +returned by gethostname(2). A lot of software relies on that the +local host name is resolvable via DNS to an IPv4 or IPv6 address. When +using dynamic hostnames this is usually achieved by +patching /etc/hosts which however is suboptimal since it +requires a writable /etc file system and is fragile because +the file might also be edited by the +administrator. nss-myhostname simply returns the IPv4 +address 127.0.0.2 (wich is on the local loopback) and the +IPv6 address ::1 (which is the local host) for whatever +system hostname is configured locally. Patching /etc/hostname is thus no longer necessary.

+ +

Current Status

+ +

It works!

+ +

Documentation

+ +

After compiling and installing nss-myhostname you'll find a +new NSS modules in /lib:

+
    +
  • libnss_myhostname.so.2
    • +
+ +

To activate the NSS modules you have to edit +/etc/nsswitch.conf and add myhostname to the +line starting with "hosts:". On Debian this looks like +this:

+ +
# /etc/nsswitch.conf
+
+passwd:         compat
+group:          compat
+shadow:         compat
+
+hosts:          files dns myhostname
+networks:       files
+
+protocols:      db files
+services:       db files
+ethers:         db files
+rpc:            db files
+
+netgroup:       nis
+ +

That's it. You should now always be able to resolve your local +system hostname. For a quick check +use glibc's getent tool: + +

$ getent ahosts `hostname`
+::1             STREAM omega
+::1             DGRAM
+::1             RAW
+127.0.0.2       STREAM
+127.0.0.2       DGRAM
+127.0.0.2       RAW
+
+ +

In this case the local host name is omega.

+ +

It is recommended to put myhostname last in +the nsswitch.conf line to make sure that this mapping is only +used as fallback, and any DNS or /etc/hosts based mapping takes +precedence.

+ +

Requirements

+ +

nss-myhostname uses NSS interfaces that are specific to modern glibc's.

+ +

nss-myhostname was developed and tested on Fedora 10 +from October 2008, it should work on most other Linux +distributions since it uses GNU autoconf and +GNU libtool for source code configuration and shared library +management.

+ +

Installation

+ +

As this package is made with the GNU autotools you should run +./configure inside the distribution directory for configuring +the source tree. After that you should run make for +compilation and make install (as root) for installation of +nss-myhostname.

+ +

Acknowledgements

+ +

None so far.

+ +

Download

+ +

The newest release is always available from @PACKAGE_URL@

+ +

The current release is @PACKAGE_VERSION@

+ +

Get nss-myhostname's development sources from the GIT repository (gitweb):

+ +
git clone git://git.0pointer.de/nss-myhostname
+ +
+
Lennart Poettering <@PACKAGE_BUGREPORT@>, October 2008
+ + + diff --git a/doc/style.css b/doc/style.css new file mode 100644 index 0000000000..5cc21fd510 --- /dev/null +++ b/doc/style.css @@ -0,0 +1,25 @@ +/*** + This file is part of nss-myhostname. + + Copyright 2008 Lennart Poettering + + nss-myhostname 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. + + nss-myhostname 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 nss-myhostname. If not, If not, see + . +***/ + +body { color: black; background-color: white; } +a:link, a:visited { color: #900000; } +div.news-date { font-size: 80%; font-style: italic; } +pre { background-color: #f0f0f0; padding: 0.4cm; } +.grey { color: #8f8f8f; font-size: 80%; } diff --git a/m4/attributes.m4 b/m4/attributes.m4 new file mode 100644 index 0000000000..9c4a0c89a5 --- /dev/null +++ b/m4/attributes.m4 @@ -0,0 +1,258 @@ +dnl Macros to check the presence of generic (non-typed) symbols. +dnl Copyright (c) 2006-2007 Diego Pettenò +dnl Copyright (c) 2006-2007 xine project +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2, or (at your option) +dnl any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +dnl 02110-1301, USA. +dnl +dnl As a special exception, the copyright owners of the +dnl macro gives unlimited permission to copy, distribute and modify the +dnl configure scripts that are the output of Autoconf when processing the +dnl Macro. You need not follow the terms of the GNU General Public +dnl License when using or distributing such scripts, even though portions +dnl of the text of the Macro appear in them. The GNU General Public +dnl License (GPL) does govern all other use of the material that +dnl constitutes the Autoconf Macro. +dnl +dnl This special exception to the GPL applies to versions of the +dnl Autoconf Macro released by this project. When you make and +dnl distribute a modified version of the Autoconf Macro, you may extend +dnl this special exception to the GPL to apply to your modified version as +dnl well. + +AC_DEFUN([CC_CHECK_CFLAGS_SILENT], [ + AC_CACHE_VAL(AS_TR_SH([cc_cv_cflags_$1]), + [ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $1" + AC_COMPILE_IFELSE([int a;], + [eval "AS_TR_SH([cc_cv_cflags_$1])='yes'"], + [eval "AS_TR_SH([cc_cv_cflags_$1])='no'"]) + CFLAGS="$ac_save_CFLAGS" + ]) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes], + [$2], [$3]) +]) + +AC_DEFUN([CC_CHECK_CFLAGS], [ + AC_CACHE_CHECK([if $CC supports $1 flag], + AS_TR_SH([cc_cv_cflags_$1]), + CC_CHECK_CFLAGS_SILENT([$1]) dnl Don't execute actions here! + ) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes], + [$2], [$3]) +]) + +AC_DEFUN([CC_CHECK_LDFLAGS], [ + AC_CACHE_CHECK([if $CC supports $1 flag], + AS_TR_SH([cc_cv_ldflags_$1]), + [ac_save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $1" + AC_LINK_IFELSE([int main() { return 1; }], + [eval "AS_TR_SH([cc_cv_ldflags_$1])='yes'"], + [eval "AS_TR_SH([cc_cv_ldflags_$1])="]) + LDFLAGS="$ac_save_LDFLAGS" + ]) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_ldflags_$1])[ = xyes], + [$2], [$3]) +]) + +dnl Check for a -Werror flag or equivalent. -Werror is the GCC +dnl and ICC flag that tells the compiler to treat all the warnings +dnl as fatal. We usually need this option to make sure that some +dnl constructs (like attributes) are not simply ignored. +dnl +dnl Other compilers don't support -Werror per se, but they support +dnl an equivalent flag: +dnl - Sun Studio compiler supports -errwarn=%all +AC_DEFUN([CC_CHECK_WERROR], [ + AC_CACHE_CHECK( + [for $CC way to treat warnings as errors], + [cc_cv_werror], + [CC_CHECK_CFLAGS_SILENT([-Werror], [cc_cv_werror=-Werror], + [CC_CHECK_CFLAGS_SILENT([-errwarn=%all], [cc_cv_werror=-errwarn=%all])]) + ]) +]) + +AC_DEFUN([CC_CHECK_ATTRIBUTE], [ + AC_REQUIRE([CC_CHECK_WERROR]) + AC_CACHE_CHECK([if $CC supports __attribute__(( ifelse([$2], , [$1], [$2]) ))], + AS_TR_SH([cc_cv_attribute_$1]), + [ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cc_cv_werror" + AC_COMPILE_IFELSE([$3], + [eval "AS_TR_SH([cc_cv_attribute_$1])='yes'"], + [eval "AS_TR_SH([cc_cv_attribute_$1])='no'"]) + CFLAGS="$ac_save_CFLAGS" + ]) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_attribute_$1])[ = xyes], + [AC_DEFINE( + AS_TR_CPP([SUPPORT_ATTRIBUTE_$1]), 1, + [Define this if the compiler supports __attribute__(( ifelse([$2], , [$1], [$2]) ))] + ) + $4], + [$5]) +]) + +AC_DEFUN([CC_ATTRIBUTE_CONSTRUCTOR], [ + CC_CHECK_ATTRIBUTE( + [constructor],, + [void __attribute__((constructor)) ctor() { int a; }], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_FORMAT], [ + CC_CHECK_ATTRIBUTE( + [format], [format(printf, n, n)], + [void __attribute__((format(printf, 1, 2))) printflike(const char *fmt, ...) { fmt = (void *)0; }], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_FORMAT_ARG], [ + CC_CHECK_ATTRIBUTE( + [format_arg], [format_arg(printf)], + [char *__attribute__((format_arg(1))) gettextlike(const char *fmt) { fmt = (void *)0; }], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_VISIBILITY], [ + CC_CHECK_ATTRIBUTE( + [visibility_$1], [visibility("$1")], + [void __attribute__((visibility("$1"))) $1_function() { }], + [$2], [$3]) +]) + +AC_DEFUN([CC_ATTRIBUTE_NONNULL], [ + CC_CHECK_ATTRIBUTE( + [nonnull], [nonnull()], + [void __attribute__((nonnull())) some_function(void *foo, void *bar) { foo = (void*)0; bar = (void*)0; }], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_UNUSED], [ + CC_CHECK_ATTRIBUTE( + [unused], , + [void some_function(void *foo, __attribute__((unused)) void *bar);], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_SENTINEL], [ + CC_CHECK_ATTRIBUTE( + [sentinel], , + [void some_function(void *foo, ...) __attribute__((sentinel));], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_DEPRECATED], [ + CC_CHECK_ATTRIBUTE( + [deprecated], , + [void some_function(void *foo, ...) __attribute__((deprecated));], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_ALIAS], [ + CC_CHECK_ATTRIBUTE( + [alias], [weak, alias], + [void other_function(void *foo) { } + void some_function(void *foo) __attribute__((weak, alias("other_function")));], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_MALLOC], [ + CC_CHECK_ATTRIBUTE( + [malloc], , + [void * __attribute__((malloc)) my_alloc(int n);], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_PACKED], [ + CC_CHECK_ATTRIBUTE( + [packed], , + [struct astructure { char a; int b; long c; void *d; } __attribute__((packed));], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_CONST], [ + CC_CHECK_ATTRIBUTE( + [const], , + [int __attribute__((const)) twopow(int n) { return 1 << n; } ], + [$1], [$2]) +]) + +AC_DEFUN([CC_FLAG_VISIBILITY], [ + AC_REQUIRE([CC_CHECK_WERROR]) + AC_CACHE_CHECK([if $CC supports -fvisibility=hidden], + [cc_cv_flag_visibility], + [cc_flag_visibility_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cc_cv_werror" + CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden], + cc_cv_flag_visibility='yes', + cc_cv_flag_visibility='no') + CFLAGS="$cc_flag_visibility_save_CFLAGS"]) + + AS_IF([test "x$cc_cv_flag_visibility" = "xyes"], + [AC_DEFINE([SUPPORT_FLAG_VISIBILITY], 1, + [Define this if the compiler supports the -fvisibility flag]) + $1], + [$2]) +]) + +AC_DEFUN([CC_FUNC_EXPECT], [ + AC_REQUIRE([CC_CHECK_WERROR]) + AC_CACHE_CHECK([if compiler has __builtin_expect function], + [cc_cv_func_expect], + [ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cc_cv_werror" + AC_COMPILE_IFELSE( + [int some_function() { + int a = 3; + return (int)__builtin_expect(a, 3); + }], + [cc_cv_func_expect=yes], + [cc_cv_func_expect=no]) + CFLAGS="$ac_save_CFLAGS" + ]) + + AS_IF([test "x$cc_cv_func_expect" = "xyes"], + [AC_DEFINE([SUPPORT__BUILTIN_EXPECT], 1, + [Define this if the compiler supports __builtin_expect() function]) + $1], + [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_ALIGNED], [ + AC_REQUIRE([CC_CHECK_WERROR]) + AC_CACHE_CHECK([highest __attribute__ ((aligned ())) supported], + [cc_cv_attribute_aligned], + [ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cc_cv_werror" + for cc_attribute_align_try in 64 32 16 8 4 2; do + AC_COMPILE_IFELSE([ + int main() { + static char c __attribute__ ((aligned($cc_attribute_align_try))) = 0; + return c; + }], [cc_cv_attribute_aligned=$cc_attribute_align_try; break]) + done + CFLAGS="$ac_save_CFLAGS" + ]) + + if test "x$cc_cv_attribute_aligned" != "x"; then + AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], [$cc_cv_attribute_aligned], + [Define the highest alignment supported]) + fi +]) diff --git a/m4/zp_lynx_doc.m4 b/m4/zp_lynx_doc.m4 new file mode 100644 index 0000000000..955a6ca0af --- /dev/null +++ b/m4/zp_lynx_doc.m4 @@ -0,0 +1,24 @@ +dnl Macro for enabling LYNX-based documentation generation + +AC_DEFUN([ZP_LYNX_DOC], [ + AC_ARG_ENABLE(lynx, + AS_HELP_STRING([--disable-lynx], + [Turn off lynx usage for documentation generation]),, + [enable_lynx=yes]) + + case "${enable_lynx}" in + yes) + AC_CHECK_PROG(have_lynx, lynx, yes, no) + + if test x$have_lynx = xno ; then + AC_MSG_WARN([*** lynx not found, plain text README will not be built ***]) + fi + ;; + no) + have_lynx=no ;; + *) + AC_MSG_ERROR(bad value ${enableval} for --disable-lynx) ;; + esac + + AM_CONDITIONAL([USE_LYNX], [test "x$have_lynx" = xyes]) +]) diff --git a/nss-myhostname.c b/nss-myhostname.c index d3404de5ae..758a185532 100644 --- a/nss-myhostname.c +++ b/nss-myhostname.c @@ -1,6 +1,5 @@ /*-*- Mode: C; c-basic-offset: 8 -*-*/ - /*** This file is part of nss-myhostname. @@ -21,6 +20,10 @@ . ***/ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include From 601b7783296363c5e33b67cbf861eba70006d2d3 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 27 Oct 2008 20:30:17 +0100 Subject: [PATCH 09/16] fix line of gcc cflags --- configure.ac | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index e1fbb79e33..f2b7e690cf 100644 --- a/configure.ac +++ b/configure.ac @@ -42,9 +42,7 @@ AC_PROG_MAKE_SET # GCC flags -DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissin -g-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Winline -Wno-un -used-parameter -ffast-math" +DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Winline -Wno-unused-parameter -ffast-math" for flag in $DESIRED_FLAGS ; do CC_CHECK_CFLAGS([$flag], [CFLAGS="$CFLAGS $flag"]) From ce4c03fad012bdf4531c2d3ca1dd00e42ef89578 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 27 Oct 2008 20:33:07 +0100 Subject: [PATCH 10/16] remove old README --- README | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 README diff --git a/README b/README deleted file mode 100644 index 205118d4ec..0000000000 --- a/README +++ /dev/null @@ -1,17 +0,0 @@ -nss-myhostname is a GNU libc NSS module that statically translates the -local host name to the IP address 127.0.0.2 (which is on the loopback -device) and vice versa. - -This is useful to make sure that the local host name is always -resolvable. Some programs (such as sudo) require this functionality. - -Especially on embedded systems it may not be desirable to modify -/etc/hosts to match the current host name. - -It is a good idea to put this module as last resort in -/etc/nsswitch.conf, to make sure that other name service take -precedence. - --- Lennart Poettering, lennart [at] poettering [dot] de - -$Id$ From 15ef6d41d685b60f8e41ff298534bcc5ddcfa73c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 5 Apr 2009 02:13:53 +0200 Subject: [PATCH 11/16] Initialize the right scope field Problem identified by Simo Sorce --- nss-myhostname.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nss-myhostname.c b/nss-myhostname.c index 758a185532..14ed30b892 100644 --- a/nss-myhostname.c +++ b/nss-myhostname.c @@ -103,7 +103,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r( r_tuple2->name = r_name; r_tuple2->family = AF_INET6; memcpy(r_tuple2->addr, LOCALADDRESS_IPV6, 16); - r_tuple1->scopeid = (uint32_t) ifi; + r_tuple2->scopeid = (uint32_t) ifi; idx += ALIGN(sizeof(struct gaih_addrtuple)); /* Verify the size matches */ From 8041b5bada31db152de80e45b3047ed32cef6880 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 9 May 2011 14:57:15 +0200 Subject: [PATCH 12/16] return any locally configured IP address if they exist Fall back to 127.0.0.2/::1 only if there is no proper IP address configured on any interface. --- .gitignore | 1 + Makefile.am | 14 ++- configure.ac | 9 +- netlink.c | 232 ++++++++++++++++++++++++++++++++++++++++ netlink.h | 45 ++++++++ nss-myhostname.c | 269 ++++++++++++++++++++++++++++++++++++----------- 6 files changed, 502 insertions(+), 68 deletions(-) create mode 100644 netlink.c create mode 100644 netlink.h diff --git a/.gitignore b/.gitignore index 8f31d72968..b35d629834 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +README .deps .libs *.cache diff --git a/Makefile.am b/Makefile.am index 9b1dcab7e4..7f2f3a39c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,6 +23,8 @@ lib_LTLIBRARIES = libnss_myhostname.la EXTRA_DIST=bootstrap.sh README LICENSE SUBDIRS=doc +AM_CPPFLAGS = -include $(top_builddir)/config.h + MAINTAINERCLEANFILES=README noinst_DATA = README @@ -39,8 +41,16 @@ homepage: all dist .PHONY: homepage -libnss_myhostname_la_SOURCES = nss-myhostname.c -libnss_myhostname_la_LDFLAGS = -avoid-version -module -export-dynamic -shrext .so.2 +libnss_myhostname_la_SOURCES = \ + nss-myhostname.c \ + netlink.c \ + netlink.h + +libnss_myhostname_la_LDFLAGS = \ + -avoid-version \ + -module \ + -export-dynamic \ + -shrext .so.2 install-exec-hook: rm -f $(DESTDIR)$(libdir)/libnss_myhostname.la diff --git a/configure.ac b/configure.ac index f2b7e690cf..dcf88155f7 100644 --- a/configure.ac +++ b/configure.ac @@ -24,8 +24,10 @@ AC_INIT([nss-myhostname],[0.2],[mzzlubfganzr (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([nss-myhostname.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR(m4) +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE -AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) +AM_INIT_AUTOMAKE([foreign 1.9 -Wall -Wno-portability silent-rules tar-pax subdir-objects dist-bzip2]) AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/nss-myhostname/]) @@ -34,8 +36,8 @@ ac_default_prefix="/" # Checks for programs. AC_PROG_CC AC_PROG_CC_C99 -AC_USE_SYSTEM_EXTENSIONS AC_PROG_CPP + AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET @@ -50,7 +52,8 @@ done # libtool stuff AC_DISABLE_STATIC -AC_PROG_LIBTOOL +LT_PREREQ(2.2) +LT_INIT # Checks for header files. AC_HEADER_STDC diff --git a/netlink.c b/netlink.c new file mode 100644 index 0000000000..e7a38630b9 --- /dev/null +++ b/netlink.c @@ -0,0 +1,232 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of nss-myhostname. + + Copyright 2008-2011 Lennart Poettering + + nss-myhostname 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. + + nss-myhostname 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 nss-myhostname; If not, see + . +***/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "netlink.h" + +static int address_compare(const void *_a, const void *_b) { + const struct address *a = _a, *b = _b; + + /* Order lowest scope first, IPv4 before IPv6, lowest interface index first */ + + if (a->scope < b->scope) + return -1; + if (a->scope > b->scope) + return 1; + + if (a->family == AF_INET && b->family == AF_INET6) + return -1; + if (a->family == AF_INET6 && b->family == AF_INET) + return 1; + + if (a->ifindex < b->ifindex) + return -1; + if (a->ifindex > b->ifindex) + return 1; + + return 0; +} + +int netlink_acquire_addresses(struct address **_list, unsigned *_n_list) { + + struct { + struct nlmsghdr hdr; + struct rtgenmsg gen; + } req; + struct rtgenmsg *gen; + int fd, r, on = 1; + uint32_t seq = 4711; + struct address *list = NULL; + unsigned n_list = 0; + + fd = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE); + if (fd < 0) + return -errno; + + if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)) < 0) { + r = -errno; + goto finish; + } + + memset(&req, 0, sizeof(req)); + req.hdr.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtgenmsg)); + req.hdr.nlmsg_type = RTM_GETADDR; + req.hdr.nlmsg_flags = NLM_F_REQUEST|NLM_F_DUMP|NLM_F_ACK; + req.hdr.nlmsg_seq = seq; + req.hdr.nlmsg_pid = 0; + + gen = NLMSG_DATA(&req.hdr); + gen->rtgen_family = AF_UNSPEC; + + if (send(fd, &req, req.hdr.nlmsg_len, 0) < 0) { + r = -errno; + goto finish; + } + + for (;;) { + ssize_t bytes; + struct msghdr msg; + struct cmsghdr *cmsg; + struct ucred *ucred; + struct iovec iov; + struct nlmsghdr *p; + uint8_t cred_buffer[CMSG_SPACE(sizeof(struct ucred))]; + struct { + struct nlmsghdr hdr; + struct ifaddrmsg ifaddrmsg; + uint8_t payload[16*1024]; + } resp; + + memset(&iov, 0, sizeof(iov)); + iov.iov_base = &resp; + iov.iov_len = sizeof(resp); + + memset(&msg, 0, sizeof(msg)); + msg.msg_name = NULL; + msg.msg_namelen = 0; + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + msg.msg_control = cred_buffer; + msg.msg_controllen = sizeof(cred_buffer); + msg.msg_flags = 0; + + bytes = recvmsg(fd, &msg, 0); + if (bytes < 0) { + r = -errno; + goto finish; + } + + cmsg = CMSG_FIRSTHDR(&msg); + if (!cmsg || cmsg->cmsg_type != SCM_CREDENTIALS) { + r = -EIO; + goto finish; + } + + ucred = (struct ucred*) CMSG_DATA(cmsg); + if (ucred->uid != 0 || ucred->pid != 0) + continue; + + for (p = &resp.hdr; bytes > 0; p = NLMSG_NEXT(p, bytes)) { + struct ifaddrmsg *ifaddrmsg; + struct rtattr *a; + size_t l; + void *local = NULL, *address = NULL; + + if (!NLMSG_OK(p, (size_t) bytes)) { + r = -EIO; + goto finish; + } + + if (p->nlmsg_seq != seq) + continue; + + if (p->nlmsg_type == NLMSG_DONE) { + r = 0; + goto finish; + } + + if (p->nlmsg_type == NLMSG_ERROR) { + struct nlmsgerr *nlmsgerr; + + nlmsgerr = NLMSG_DATA(p); + r = -nlmsgerr->error; + goto finish; + } + + if (p->nlmsg_type != RTM_NEWADDR) + continue; + + ifaddrmsg = NLMSG_DATA(p); + + if (ifaddrmsg->ifa_family != AF_INET && + ifaddrmsg->ifa_family != AF_INET6) + continue; + + if (ifaddrmsg->ifa_scope == RT_SCOPE_HOST || + ifaddrmsg->ifa_scope == RT_SCOPE_NOWHERE) + continue; + + if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED) + continue; + + l = NLMSG_PAYLOAD(p, sizeof(struct ifaddrmsg)); + a = IFA_RTA(ifaddrmsg); + + while (RTA_OK(a, l)) { + + if (a->rta_type == IFA_ADDRESS) + address = RTA_DATA(a); + else if (a->rta_type == IFA_LOCAL) + local = RTA_DATA(a); + + a = RTA_NEXT(a, l); + } + + if (local) + address = local; + + if (!address) + continue; + + list = realloc(list, (n_list+1) * sizeof(struct address)); + if (!list) { + r = -ENOMEM; + goto finish; + } + + list[n_list].family = ifaddrmsg->ifa_family; + list[n_list].scope = ifaddrmsg->ifa_scope; + memcpy(list[n_list].address, address, ifaddrmsg->ifa_family == AF_INET ? 4 : 16); + list[n_list].ifindex = ifaddrmsg->ifa_index; + + n_list++; + } + } + +finish: + close(fd); + + if (r < 0) + free(list); + else { + qsort(list, n_list, sizeof(struct address), address_compare); + + *_list = list; + *_n_list = n_list; + } + + return r; +} diff --git a/netlink.h b/netlink.h new file mode 100644 index 0000000000..e6ad59bf45 --- /dev/null +++ b/netlink.h @@ -0,0 +1,45 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +#ifndef foonetlinkhfoo +#define foonetlinkhfoo + +/*** + This file is part of nss-myhostname. + + Copyright 2008-2011 Lennart Poettering + + nss-myhostname 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. + + nss-myhostname 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 nss-myhostname; If not, see + . +***/ + +#include +#include +#include + +struct address { + unsigned char family; + uint8_t address[16]; + unsigned char scope; + int ifindex; +}; + +int netlink_acquire_addresses(struct address **_list, unsigned *_n_list); + +static inline size_t PROTO_ADDRESS_SIZE(int proto) { + assert(proto == AF_INET || proto == AF_INET6); + + return proto == AF_INET6 ? 16 : 4; +} + +#endif diff --git a/nss-myhostname.c b/nss-myhostname.c index 14ed30b892..b091fba35d 100644 --- a/nss-myhostname.c +++ b/nss-myhostname.c @@ -1,39 +1,38 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*** - This file is part of nss-myhostname. + This file is part of nss-myhostname. - Copyright 2008 Lennart Poettering + Copyright 2008-2011 Lennart Poettering - nss-myhostname 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. + nss-myhostname 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. - nss-myhostname 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. + nss-myhostname 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 nss-myhostname. If not, If not, see - . + You should have received a copy of the GNU Lesser General Public + License along with nss-myhostname; If not, see + . ***/ -#ifdef HAVE_CONFIG_H -#include -#endif - #include #include #include #include #include #include -#include #include #include #include +#include +#include + +#include "netlink.h" /* We use 127.0.0.2 as IPv4 address. This has the advantage over * 127.0.0.1 that it can be translated back to the local hostname. For @@ -46,6 +45,50 @@ #define ALIGN(a) (((a+sizeof(void*)-1)/sizeof(void*))*sizeof(void*)) +enum nss_status _nss_myhostname_gethostbyname4_r( + const char *name, + struct gaih_addrtuple **pat, + char *buffer, size_t buflen, + int *errnop, int *h_errnop, + int32_t *ttlp); + +enum nss_status _nss_myhostname_gethostbyname3_r( + const char *name, + int af, + struct hostent *host, + char *buffer, size_t buflen, + int *errnop, int *h_errnop, + int32_t *ttlp, + char **canonp); + +enum nss_status _nss_myhostname_gethostbyname2_r( + const char *name, + int af, + struct hostent *host, + char *buffer, size_t buflen, + int *errnop, int *h_errnop); + +enum nss_status _nss_myhostname_gethostbyname_r( + const char *name, + struct hostent *host, + char *buffer, size_t buflen, + int *errnop, int *h_errnop); + +enum nss_status _nss_myhostname_gethostbyaddr2_r( + const void* addr, socklen_t len, + int af, + struct hostent *host, + char *buffer, size_t buflen, + int *errnop, int *h_errnop, + int32_t *ttlp); + +enum nss_status _nss_myhostname_gethostbyaddr_r( + const void* addr, socklen_t len, + int af, + struct hostent *host, + char *buffer, size_t buflen, + int *errnop, int *h_errnop); + enum nss_status _nss_myhostname_gethostbyname4_r( const char *name, struct gaih_addrtuple **pat, @@ -53,11 +96,13 @@ enum nss_status _nss_myhostname_gethostbyname4_r( int *errnop, int *h_errnop, int32_t *ttlp) { - unsigned ifi; + unsigned lo_ifi; char hn[HOST_NAME_MAX+1]; size_t l, idx, ms; char *r_name; - struct gaih_addrtuple *r_tuple1, *r_tuple2; + struct gaih_addrtuple *r_tuple, *r_tuple_prev = NULL; + struct address *addresses = NULL, *a; + unsigned n_addresses = 0, n; memset(hn, 0, sizeof(hn)); if (gethostname(hn, sizeof(hn)-1) < 0) { @@ -72,14 +117,18 @@ enum nss_status _nss_myhostname_gethostbyname4_r( return NSS_STATUS_NOTFOUND; } + /* If this fails, n_addresses is 0. Which is fine */ + netlink_acquire_addresses(&addresses, &n_addresses); + /* If this call fails we fill in 0 as scope. Which is fine */ - ifi = if_nametoindex(LOOPBACK_INTERFACE); + lo_ifi = if_nametoindex(LOOPBACK_INTERFACE); l = strlen(hn); - ms = ALIGN(l+1)+ALIGN(sizeof(struct gaih_addrtuple))*2; + ms = ALIGN(l+1)+ALIGN(sizeof(struct gaih_addrtuple))*(n_addresses > 0 ? n_addresses : 2); if (buflen < ms) { *errnop = ENOMEM; *h_errnop = NO_RECOVERY; + free(addresses); return NSS_STATUS_TRYAGAIN; } @@ -88,32 +137,53 @@ enum nss_status _nss_myhostname_gethostbyname4_r( memcpy(r_name, hn, l+1); idx = ALIGN(l+1); - /* Second, fill in IPv4 tuple */ - r_tuple1 = (struct gaih_addrtuple*) (buffer + idx); - r_tuple1->next = NULL; - r_tuple1->name = r_name; - r_tuple1->family = AF_INET; - *(uint32_t*) r_tuple1->addr = LOCALADDRESS_IPV4; - r_tuple1->scopeid = (uint32_t) ifi; - idx += ALIGN(sizeof(struct gaih_addrtuple)); + if (n_addresses <= 0) { + /* Second, fill in IPv6 tuple */ + r_tuple = (struct gaih_addrtuple*) (buffer + idx); + r_tuple->next = r_tuple_prev; + r_tuple->name = r_name; + r_tuple->family = AF_INET6; + memcpy(r_tuple->addr, LOCALADDRESS_IPV6, 16); + r_tuple->scopeid = (uint32_t) lo_ifi; - /* Third, fill in IPv6 tuple */ - r_tuple2 = (struct gaih_addrtuple*) (buffer + idx); - r_tuple2->next = r_tuple1; - r_tuple2->name = r_name; - r_tuple2->family = AF_INET6; - memcpy(r_tuple2->addr, LOCALADDRESS_IPV6, 16); - r_tuple2->scopeid = (uint32_t) ifi; - idx += ALIGN(sizeof(struct gaih_addrtuple)); + idx += ALIGN(sizeof(struct gaih_addrtuple)); + r_tuple_prev = r_tuple; + + /* Third, fill in IPv4 tuple */ + r_tuple = (struct gaih_addrtuple*) (buffer + idx); + r_tuple->next = r_tuple_prev; + r_tuple->name = r_name; + r_tuple->family = AF_INET; + *(uint32_t*) r_tuple->addr = LOCALADDRESS_IPV4; + r_tuple->scopeid = (uint32_t) lo_ifi; + + idx += ALIGN(sizeof(struct gaih_addrtuple)); + r_tuple_prev = r_tuple; + } + + /* Fourth, fill actual addresses in, but in backwards order */ + for (a = addresses + n_addresses - 1, n = 0; n < n_addresses; n++, a--) { + r_tuple = (struct gaih_addrtuple*) (buffer + idx); + r_tuple->next = r_tuple_prev; + r_tuple->name = r_name; + r_tuple->family = a->family; + r_tuple->scopeid = a->ifindex; + memcpy(r_tuple->addr, a->address, 16); + + idx += ALIGN(sizeof(struct gaih_addrtuple)); + r_tuple_prev = r_tuple; + } /* Verify the size matches */ assert(idx == ms); - *pat = r_tuple2; + *pat = r_tuple_prev; if (ttlp) *ttlp = 0; + free(addresses); + return NSS_STATUS_SUCCESS; } @@ -129,14 +199,27 @@ static enum nss_status fill_in_hostent( size_t l, idx, ms; char *r_addr, *r_name, *r_aliases, *r_addr_list; size_t alen; + struct address *addresses = NULL, *a; + unsigned n_addresses = 0, n, c; - alen = af == AF_INET ? 4 : 16; + alen = PROTO_ADDRESS_SIZE(af); + + netlink_acquire_addresses(&addresses, &n_addresses); + + for (a = addresses, n = 0, c = 0; n < n_addresses; a++, n++) + if (af == a->family) + c++; l = strlen(hn); - ms = ALIGN(l+1)+sizeof(char*)+ALIGN(alen)+sizeof(char*)*2; + ms = ALIGN(l+1)+ + sizeof(char*)+ + (c > 0 ? c : 1)*ALIGN(alen)+ + (c > 0 ? c+1 : 2)*sizeof(char*); + if (buflen < ms) { *errnop = ENOMEM; *h_errnop = NO_RECOVERY; + free(addresses); return NSS_STATUS_TRYAGAIN; } @@ -145,24 +228,57 @@ static enum nss_status fill_in_hostent( memcpy(r_name, hn, l+1); idx = ALIGN(l+1); - /* Second, create aliases array */ + /* Second, create (empty) aliases array */ r_aliases = buffer + idx; *(char**) r_aliases = NULL; idx += sizeof(char*); - /* Third, add address */ + /* Third, add addresses */ r_addr = buffer + idx; - if (af == AF_INET) - *(uint32_t*) r_addr = LOCALADDRESS_IPV4; - else - memcpy(r_addr, LOCALADDRESS_IPV6, 16); - idx += ALIGN(alen); + if (c > 0) { + unsigned i = 0; + + for (a = addresses, n = 0; n < n_addresses; a++, n++) { + if (af != a->family) + continue; + + memcpy(r_addr + i*ALIGN(alen), a->address, alen); + i++; + } + + assert(i == c); + idx += c*ALIGN(alen); + } else { + if (af == AF_INET) + *(uint32_t*) r_addr = LOCALADDRESS_IPV4; + else + memcpy(r_addr, LOCALADDRESS_IPV6, 16); + + idx += ALIGN(alen); + } /* Fourth, add address pointer array */ r_addr_list = buffer + idx; - ((char**) r_addr_list)[0] = r_addr; - ((char**) r_addr_list)[1] = NULL; - idx += sizeof(char*)*2; + if (c > 0) { + unsigned i = 0; + + for (a = addresses, n = 0; n < n_addresses; a++, n++) { + if (af != a->family) + continue; + + ((char**) r_addr_list)[i] = (r_addr + i*ALIGN(alen)); + i++; + } + + assert(i == c); + ((char**) r_addr_list)[c] = NULL; + idx += (c+1)*sizeof(char*); + + } else { + ((char**) r_addr_list)[0] = r_addr; + ((char**) r_addr_list)[1] = NULL; + idx += 2*sizeof(char*); + } /* Verify the size matches */ assert(idx == ms); @@ -179,6 +295,8 @@ static enum nss_status fill_in_hostent( if (canonp) *canonp = r_name; + free(addresses); + return NSS_STATUS_SUCCESS; } @@ -235,7 +353,7 @@ enum nss_status _nss_myhostname_gethostbyname2_r( NULL); } -enum nss_status _nss_myhostname_gethostbyname_r ( +enum nss_status _nss_myhostname_gethostbyname_r( const char *name, struct hostent *host, char *buffer, size_t buflen, @@ -260,35 +378,60 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( int32_t *ttlp) { char hn[HOST_NAME_MAX+1]; + struct address *addresses = NULL, *a; + unsigned n_addresses = 0, n; + + if (len != PROTO_ADDRESS_SIZE(af)) { + *errnop = EINVAL; + *h_errnop = NO_RECOVERY; + return NSS_STATUS_UNAVAIL; + } if (af == AF_INET) { - if (len != 4 || - (*(uint32_t*) addr) != LOCALADDRESS_IPV4) - goto not_found; + + if ((*(uint32_t*) addr) == LOCALADDRESS_IPV4) + goto found; } else if (af == AF_INET6) { - if (len != 16 || - memcmp(addr, LOCALADDRESS_IPV6, 16) != 0) - goto not_found; + + if (memcmp(addr, LOCALADDRESS_IPV6, 16) == 0) + goto found; + } else { *errnop = EAFNOSUPPORT; *h_errnop = NO_DATA; return NSS_STATUS_UNAVAIL; } + netlink_acquire_addresses(&addresses, &n_addresses); + + for (a = addresses, n = 0; n < n_addresses; n++, a++) { + if (af != a->family) + continue; + + if (memcmp(addr, a->address, PROTO_ADDRESS_SIZE(af)) == 0) + goto found; + } + + *errnop = ENOENT; + *h_errnop = HOST_NOT_FOUND; + + free(addresses); + return NSS_STATUS_NOTFOUND; + +found: + free(addresses); + memset(hn, 0, sizeof(hn)); if (gethostname(hn, sizeof(hn)-1) < 0) { *errnop = errno; *h_errnop = NO_RECOVERY; + return NSS_STATUS_UNAVAIL; } return fill_in_hostent(hn, af, host, buffer, buflen, errnop, h_errnop, ttlp, NULL); -not_found: - *errnop = ENOENT; - *h_errnop = HOST_NOT_FOUND; - return NSS_STATUS_NOTFOUND; } enum nss_status _nss_myhostname_gethostbyaddr_r( From fe0fc11bacc3e00023e45b04b9ee788ed161c4b8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 9 May 2011 15:07:20 +0200 Subject: [PATCH 13/16] set visibility of functions explicitly to avoid name clashes --- configure.ac | 2 +- netlink.h | 5 ++++- nss-myhostname.c | 12 ++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index dcf88155f7..6f4dfaf13d 100644 --- a/configure.ac +++ b/configure.ac @@ -44,7 +44,7 @@ AC_PROG_MAKE_SET # GCC flags -DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Winline -Wno-unused-parameter -ffast-math" +DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Winline -Wno-unused-parameter -ffast-math -fvisibility=hidden -fdiagnostics-show-option" for flag in $DESIRED_FLAGS ; do CC_CHECK_CFLAGS([$flag], [CFLAGS="$CFLAGS $flag"]) diff --git a/netlink.h b/netlink.h index e6ad59bf45..4f0024851a 100644 --- a/netlink.h +++ b/netlink.h @@ -34,7 +34,10 @@ struct address { int ifindex; }; -int netlink_acquire_addresses(struct address **_list, unsigned *_n_list); +#define _public_ __attribute__ ((visibility("default"))) +#define _hidden_ __attribute__ ((visibility("hidden"))) + +int netlink_acquire_addresses(struct address **_list, unsigned *_n_list) _hidden_; static inline size_t PROTO_ADDRESS_SIZE(int proto) { assert(proto == AF_INET || proto == AF_INET6); diff --git a/nss-myhostname.c b/nss-myhostname.c index b091fba35d..293166c491 100644 --- a/nss-myhostname.c +++ b/nss-myhostname.c @@ -50,7 +50,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r( struct gaih_addrtuple **pat, char *buffer, size_t buflen, int *errnop, int *h_errnop, - int32_t *ttlp); + int32_t *ttlp) _public_; enum nss_status _nss_myhostname_gethostbyname3_r( const char *name, @@ -59,20 +59,20 @@ enum nss_status _nss_myhostname_gethostbyname3_r( char *buffer, size_t buflen, int *errnop, int *h_errnop, int32_t *ttlp, - char **canonp); + char **canonp) _public_; enum nss_status _nss_myhostname_gethostbyname2_r( const char *name, int af, struct hostent *host, char *buffer, size_t buflen, - int *errnop, int *h_errnop); + int *errnop, int *h_errnop) _public_; enum nss_status _nss_myhostname_gethostbyname_r( const char *name, struct hostent *host, char *buffer, size_t buflen, - int *errnop, int *h_errnop); + int *errnop, int *h_errnop) _public_; enum nss_status _nss_myhostname_gethostbyaddr2_r( const void* addr, socklen_t len, @@ -80,14 +80,14 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( struct hostent *host, char *buffer, size_t buflen, int *errnop, int *h_errnop, - int32_t *ttlp); + int32_t *ttlp) _public_; enum nss_status _nss_myhostname_gethostbyaddr_r( const void* addr, socklen_t len, int af, struct hostent *host, char *buffer, size_t buflen, - int *errnop, int *h_errnop); + int *errnop, int *h_errnop) _public_; enum nss_status _nss_myhostname_gethostbyname4_r( const char *name, From 87a477c74e2478e94e89e7026cf7207fcdc2dffc Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 9 May 2011 15:17:34 +0200 Subject: [PATCH 14/16] build-sys: prepare release --- configure.ac | 2 +- doc/README.html.in | 38 +++++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 6f4dfaf13d..38cd58fb41 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ # . AC_PREREQ(2.62) -AC_INIT([nss-myhostname],[0.2],[mzzlubfganzr (at) 0pointer (dot) de]) +AC_INIT([nss-myhostname],[0.3],[mzzlubfganzr (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([nss-myhostname.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR(m4) diff --git a/doc/README.html.in b/doc/README.html.in index 4721c4dc24..f78618298c 100644 --- a/doc/README.html.in +++ b/doc/README.html.in @@ -10,7 +10,7 @@

nss-myhostname @PACKAGE_VERSION@

-

Copyright 2005-2008 Lennart Poettering <@PACKAGE_BUGREPORT@>

+

Copyright 2005-2011 Lennart Poettering <@PACKAGE_BUGREPORT@>

  • License
    • @@ -38,6 +38,13 @@ Lesser General Public License for more details.

    News

    +
    Mon May 9 2011:
    + +

    Version +0.3 released. Changes include: Always return locally configured IP +addresses first, use 127.0.0.2/::1 only as fallback if no addresses +are configured.

    +
    Mon Oct 27 2008:

    nss-myhostname is a plugin for the GNU Name Service Switch (NSS) functionality of the GNU C Library (glibc) providing host name resolution for the locally configured system hostname as -returned by gethostname(2). A lot of software relies on that the -local host name is resolvable via DNS to an IPv4 or IPv6 address. When -using dynamic hostnames this is usually achieved by -patching /etc/hosts which however is suboptimal since it -requires a writable /etc file system and is fragile because -the file might also be edited by the -administrator. nss-myhostname simply returns the IPv4 +returned by gethostname(2). Various software relies on an +always resolvable local host name. When using dynamic hostnames this +is usually achieved by patching /etc/hosts at the same time +as changing the host name. This however is not ideal since it requires +a writable /etc file system and is fragile because the file +might be edited by the administrator at the same +time. nss-myhostname simply returns all locally configure +public IP addresses, or -- if none are configured -- the IPv4 address 127.0.0.2 (wich is on the local loopback) and the IPv6 address ::1 (which is the local host) for whatever -system hostname is configured locally. Patching /etc/hostname is thus no longer necessary.

    +system hostname is configured locally. Patching /etc/hosts +is thus no longer necessary.

    Current Status

    @@ -123,11 +132,10 @@ precedence.

    nss-myhostname uses NSS interfaces that are specific to modern glibc's.

    -

    nss-myhostname was developed and tested on Fedora 10 -from October 2008, it should work on most other Linux -distributions since it uses GNU autoconf and -GNU libtool for source code configuration and shared library -management.

    +

    nss-myhostname was developed and tested on Fedora 15 from +May 2011, it should work on most other Linux distributions since it +uses GNU autoconf and GNU libtool for source code configuration and +shared library management.

    Installation

    @@ -152,7 +160,7 @@ compilation and make install (as root) for installation of 
    git clone git://git.0pointer.de/nss-myhostname
    -
    Lennart Poettering <@PACKAGE_BUGREPORT@>, October 2008
    +
    Lennart Poettering <@PACKAGE_BUGREPORT@>, May 2011
    From 1df2a0fce427fab7754f6ac572cf68cef2e95696 Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Wed, 15 Jun 2011 16:49:24 +0200 Subject: [PATCH 15/16] Use legacy getifaddrs() on GNU/kFreeBSD --- Makefile.am | 9 ++++- configure.ac | 7 ++++ netlink.h => ifconf.h | 32 +++++++++++++-- legacy.c | 92 +++++++++++++++++++++++++++++++++++++++++++ netlink.c | 27 +------------ nss-myhostname.c | 8 ++-- 6 files changed, 141 insertions(+), 34 deletions(-) rename netlink.h => ifconf.h (61%) create mode 100644 legacy.c diff --git a/Makefile.am b/Makefile.am index 7f2f3a39c0..f82b8d46e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,8 +43,13 @@ homepage: all dist libnss_myhostname_la_SOURCES = \ nss-myhostname.c \ - netlink.c \ - netlink.h + ifconf.h + +if LEGACY +libnss_myhostname_la_SOURCES += legacy.c +else +libnss_myhostname_la_SOURCES += netlink.c +endif libnss_myhostname_la_LDFLAGS = \ -avoid-version \ diff --git a/configure.ac b/configure.ac index 38cd58fb41..30ebc44a80 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,13 @@ AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/nss-myhostname/]) ac_default_prefix="/" +AC_CANONICAL_HOST +case "$host_os" in + linux*) legacy=false ;; + *) legacy=true ;; +esac +AM_CONDITIONAL([LEGACY], [test x$legacy = xtrue]) + # Checks for programs. AC_PROG_CC AC_PROG_CC_C99 diff --git a/netlink.h b/ifconf.h similarity index 61% rename from netlink.h rename to ifconf.h index 4f0024851a..6b2c83f91e 100644 --- a/netlink.h +++ b/ifconf.h @@ -1,7 +1,9 @@ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ -#ifndef foonetlinkhfoo -#define foonetlinkhfoo +#ifndef fooifconfhfoo +#define fooifconfhfoo + +#include /*** This file is part of nss-myhostname. @@ -37,7 +39,7 @@ struct address { #define _public_ __attribute__ ((visibility("default"))) #define _hidden_ __attribute__ ((visibility("hidden"))) -int netlink_acquire_addresses(struct address **_list, unsigned *_n_list) _hidden_; +int ifconf_acquire_addresses(struct address **_list, unsigned *_n_list) _hidden_; static inline size_t PROTO_ADDRESS_SIZE(int proto) { assert(proto == AF_INET || proto == AF_INET6); @@ -45,4 +47,28 @@ static inline size_t PROTO_ADDRESS_SIZE(int proto) { return proto == AF_INET6 ? 16 : 4; } +static inline int address_compare(const void *_a, const void *_b) { + const struct address *a = _a, *b = _b; + + /* Order lowest scope first, IPv4 before IPv6, lowest interface index first */ + + if (a->scope < b->scope) + return -1; + if (a->scope > b->scope) + return 1; + + if (a->family == AF_INET && b->family == AF_INET6) + return -1; + if (a->family == AF_INET6 && b->family == AF_INET) + return 1; + + if (a->ifindex < b->ifindex) + return -1; + if (a->ifindex > b->ifindex) + return 1; + + return 0; +} + + #endif diff --git a/legacy.c b/legacy.c new file mode 100644 index 0000000000..9c0bcadb65 --- /dev/null +++ b/legacy.c @@ -0,0 +1,92 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +/*** + This file is part of nss-myhostname. + + Copyright 2008-2011 Lennart Poettering + Copyright 2011 Robert millan + + nss-myhostname 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. + + nss-myhostname 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 nss-myhostname; If not, see + . +***/ + +#include +#include +#include +#include +#include +#include + +#include "ifconf.h" + +int ifconf_acquire_addresses(struct address **_list, unsigned *_n_list) { + struct address *list = NULL; + unsigned n_list = 0; + struct ifaddrs *ifa = NULL; + int r = 1; + struct ifaddrs *i; + int ifindex = 0; + + if (getifaddrs(&ifa) == -1) { + r = -errno; + goto finish; + } + + for (i = ifa; i != NULL; i = i->ifa_next) { + int af; + const void *cp; + struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) i->ifa_addr; + struct sockaddr_in *in = (struct sockaddr_in *) i->ifa_addr; + + if (! i->ifa_addr) + continue; + + af = i->ifa_addr->sa_family; + + if (af != AF_INET && af != AF_INET6) + continue; + + list = realloc(list, (n_list+1) * sizeof(struct address)); + if (!list) { + r = -ENOMEM; + goto finish; + } + + if (af == AF_INET6) + cp = &in6->sin6_addr; + else + cp = &in->sin_addr; + + list[n_list].family = af; + list[n_list].scope = 0; + memcpy(list[n_list].address, cp, PROTO_ADDRESS_SIZE(af)); + list[n_list].ifindex = ifindex++; + n_list++; + } + +finish: + if (ifa) + freeifaddrs(ifa); + + if (r < 0) + free(list); + else { + qsort(list, n_list, sizeof(struct address), address_compare); + + *_list = list; + *_n_list = n_list; + } + + return r; +} diff --git a/netlink.c b/netlink.c index e7a38630b9..29f38e3a00 100644 --- a/netlink.c +++ b/netlink.c @@ -35,32 +35,9 @@ #include #include -#include "netlink.h" +#include "ifconf.h" -static int address_compare(const void *_a, const void *_b) { - const struct address *a = _a, *b = _b; - - /* Order lowest scope first, IPv4 before IPv6, lowest interface index first */ - - if (a->scope < b->scope) - return -1; - if (a->scope > b->scope) - return 1; - - if (a->family == AF_INET && b->family == AF_INET6) - return -1; - if (a->family == AF_INET6 && b->family == AF_INET) - return 1; - - if (a->ifindex < b->ifindex) - return -1; - if (a->ifindex > b->ifindex) - return 1; - - return 0; -} - -int netlink_acquire_addresses(struct address **_list, unsigned *_n_list) { +int ifconf_acquire_addresses(struct address **_list, unsigned *_n_list) { struct { struct nlmsghdr hdr; diff --git a/nss-myhostname.c b/nss-myhostname.c index 293166c491..83180ad805 100644 --- a/nss-myhostname.c +++ b/nss-myhostname.c @@ -32,7 +32,7 @@ #include #include -#include "netlink.h" +#include "ifconf.h" /* We use 127.0.0.2 as IPv4 address. This has the advantage over * 127.0.0.1 that it can be translated back to the local hostname. For @@ -118,7 +118,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r( } /* If this fails, n_addresses is 0. Which is fine */ - netlink_acquire_addresses(&addresses, &n_addresses); + ifconf_acquire_addresses(&addresses, &n_addresses); /* If this call fails we fill in 0 as scope. Which is fine */ lo_ifi = if_nametoindex(LOOPBACK_INTERFACE); @@ -204,7 +204,7 @@ static enum nss_status fill_in_hostent( alen = PROTO_ADDRESS_SIZE(af); - netlink_acquire_addresses(&addresses, &n_addresses); + ifconf_acquire_addresses(&addresses, &n_addresses); for (a = addresses, n = 0, c = 0; n < n_addresses; a++, n++) if (af == a->family) @@ -403,7 +403,7 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( return NSS_STATUS_UNAVAIL; } - netlink_acquire_addresses(&addresses, &n_addresses); + ifconf_acquire_addresses(&addresses, &n_addresses); for (a = addresses, n = 0; n < n_addresses; n++, a++) { if (af != a->family) From 8e6640f0fe9eebde5a6cc9f1c0a20a289b8ad9c8 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 3 Jan 2013 09:32:32 +0100 Subject: [PATCH 16/16] nss-myhostname: move to subdirectory In order to merge into the systemd repos. --- .gitignore => src/nss-myhostname/.gitignore | 0 LICENSE => src/nss-myhostname/LICENSE | 0 Makefile.am => src/nss-myhostname/Makefile.am | 0 bootstrap.sh => src/nss-myhostname/bootstrap.sh | 0 configure.ac => src/nss-myhostname/configure.ac | 0 {doc => src/nss-myhostname/doc}/.gitignore | 0 {doc => src/nss-myhostname/doc}/Makefile.am | 0 {doc => src/nss-myhostname/doc}/README.html.in | 0 {doc => src/nss-myhostname/doc}/style.css | 0 ifconf.h => src/nss-myhostname/ifconf.h | 0 legacy.c => src/nss-myhostname/legacy.c | 0 {m4 => src/nss-myhostname/m4}/attributes.m4 | 0 {m4 => src/nss-myhostname/m4}/zp_lynx_doc.m4 | 0 netlink.c => src/nss-myhostname/netlink.c | 0 nss-myhostname.c => src/nss-myhostname/nss-myhostname.c | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename .gitignore => src/nss-myhostname/.gitignore (100%) rename LICENSE => src/nss-myhostname/LICENSE (100%) rename Makefile.am => src/nss-myhostname/Makefile.am (100%) rename bootstrap.sh => src/nss-myhostname/bootstrap.sh (100%) rename configure.ac => src/nss-myhostname/configure.ac (100%) rename {doc => src/nss-myhostname/doc}/.gitignore (100%) rename {doc => src/nss-myhostname/doc}/Makefile.am (100%) rename {doc => src/nss-myhostname/doc}/README.html.in (100%) rename {doc => src/nss-myhostname/doc}/style.css (100%) rename ifconf.h => src/nss-myhostname/ifconf.h (100%) rename legacy.c => src/nss-myhostname/legacy.c (100%) rename {m4 => src/nss-myhostname/m4}/attributes.m4 (100%) rename {m4 => src/nss-myhostname/m4}/zp_lynx_doc.m4 (100%) rename netlink.c => src/nss-myhostname/netlink.c (100%) rename nss-myhostname.c => src/nss-myhostname/nss-myhostname.c (100%) diff --git a/.gitignore b/src/nss-myhostname/.gitignore similarity index 100% rename from .gitignore rename to src/nss-myhostname/.gitignore diff --git a/LICENSE b/src/nss-myhostname/LICENSE similarity index 100% rename from LICENSE rename to src/nss-myhostname/LICENSE diff --git a/Makefile.am b/src/nss-myhostname/Makefile.am similarity index 100% rename from Makefile.am rename to src/nss-myhostname/Makefile.am diff --git a/bootstrap.sh b/src/nss-myhostname/bootstrap.sh similarity index 100% rename from bootstrap.sh rename to src/nss-myhostname/bootstrap.sh diff --git a/configure.ac b/src/nss-myhostname/configure.ac similarity index 100% rename from configure.ac rename to src/nss-myhostname/configure.ac diff --git a/doc/.gitignore b/src/nss-myhostname/doc/.gitignore similarity index 100% rename from doc/.gitignore rename to src/nss-myhostname/doc/.gitignore diff --git a/doc/Makefile.am b/src/nss-myhostname/doc/Makefile.am similarity index 100% rename from doc/Makefile.am rename to src/nss-myhostname/doc/Makefile.am diff --git a/doc/README.html.in b/src/nss-myhostname/doc/README.html.in similarity index 100% rename from doc/README.html.in rename to src/nss-myhostname/doc/README.html.in diff --git a/doc/style.css b/src/nss-myhostname/doc/style.css similarity index 100% rename from doc/style.css rename to src/nss-myhostname/doc/style.css diff --git a/ifconf.h b/src/nss-myhostname/ifconf.h similarity index 100% rename from ifconf.h rename to src/nss-myhostname/ifconf.h diff --git a/legacy.c b/src/nss-myhostname/legacy.c similarity index 100% rename from legacy.c rename to src/nss-myhostname/legacy.c diff --git a/m4/attributes.m4 b/src/nss-myhostname/m4/attributes.m4 similarity index 100% rename from m4/attributes.m4 rename to src/nss-myhostname/m4/attributes.m4 diff --git a/m4/zp_lynx_doc.m4 b/src/nss-myhostname/m4/zp_lynx_doc.m4 similarity index 100% rename from m4/zp_lynx_doc.m4 rename to src/nss-myhostname/m4/zp_lynx_doc.m4 diff --git a/netlink.c b/src/nss-myhostname/netlink.c similarity index 100% rename from netlink.c rename to src/nss-myhostname/netlink.c diff --git a/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c similarity index 100% rename from nss-myhostname.c rename to src/nss-myhostname/nss-myhostname.c