summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2011-05-18 19:49:09 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2011-05-18 21:43:17 (GMT)
commit3bf6241deeaebd9b5dc16a26b214559d3d45838b (patch) (side-by-side diff)
tree48c3c455aa1b42241bc6276db12d4c2d50f37e0a
parent22fc942b1a19b93ee15dc79fc9d0b6d1d74f62e6 (diff)
downloadnssync-3bf6241deeaebd9b5dc16a26b214559d3d45838b.tar.gz
nssync-3bf6241deeaebd9b5dc16a26b214559d3d45838b.tar.bz2
Create individual zone files.
* src/Makefile.am (EXTRA_DIST): Add cmdline.opt. * src/bindcf.c (bind_zonefile_dir) (zone_file_pattern): New variables. (source_named_conf): More checks. (bindcf_lookup): Rewrite. (flush_zone_list): New function. * cmdline.opt: New option: --force. * src/config.c (sync_kw)<path>: Remove keyword. All uses changed. <zone-conf>: New keyword. (nssync_kw) <slave-status-file> <zonefile-dir,zonefile-pattern> <reload-command>: New keyword. * src/nssync.c (copy_file): Increase changed_zones. Return immediately if in dry-run mode. (compare): Change signature. (synchronize): Rewrite. (check_slave_status): New function. (main): Check slave status. Update all changed zones. Reload bind, if needed. * src/nssync.h (slave_status_file) (reload_command, changed_zones): New externs (sql_get_slave_status): New proto. (nssync) <kwpath>: Remove. <zone_conf_file,zone_tree>: New members. (bindcf_lookup): Change signature. (flush_zone_list, compare): New protos. * src/output.c: Change logic to produce a single file per zone. * src/sqlop.c (sql_get_slave_status): New function. * configure.ac: Switch from foreign to gnu. * AUTHORS: New file. * COPYING: New file. * NEWS: New file. * README: New file.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--AUTHORS1
-rw-r--r--COPYING674
-rw-r--r--NEWS33
-rw-r--r--README33
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/bindcf.c333
-rw-r--r--src/cmdline.opt6
-rw-r--r--src/config.c24
-rw-r--r--src/nssync.c169
-rw-r--r--src/nssync.h20
-rw-r--r--src/output.c31
-rw-r--r--src/sqlop.c28
13 files changed, 1235 insertions, 121 deletions
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..ca6ccd1
--- a/dev/null
+++ b/AUTHORS
@@ -0,0 +1 @@
+Sergey Poznyakoff <gray@gnu.org.ua>
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..94a9ed0
--- a/dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..592b5e7
--- a/dev/null
+++ b/NEWS
@@ -0,0 +1,33 @@
+NSsync NEWS -- history of user-visible changes. 2011-05-18
+Copyright (C) 2011 Sergey Poznyakoff
+See the end of file for copying conditions.
+
+Please send cfpeek bug reports to <gray+nssync@gnu.org.ua>
+
+
+Version 1.0 (Git)
+
+
+=========================================================================
+Copyright information:
+
+Copyright (C) 2011 Sergey Poznyakoff
+
+ Permission is granted to anyone to make or distribute verbatim copies
+ of this document as received, in any medium, provided that the
+ copyright notice and this permission notice are preserved,
+ thus giving the recipient permission to redistribute in turn.
+
+ Permission is granted to distribute modified versions
+ of this document, or of portions of it,
+ under the above conditions, provided also that they
+ carry prominent notices stating who last changed them.
+
+Local variables:
+mode: outline
+paragraph-separate: "[ ]*$"
+eval: (add-hook 'write-file-hooks 'time-stamp)
+time-stamp-start: "changes. "
+time-stamp-format: "%:y-%02m-%02d"
+time-stamp-end: "\n"
+end:
diff --git a/README b/README
new file mode 100644
index 0000000..1273383
--- a/dev/null
+++ b/README
@@ -0,0 +1,33 @@
+NSsync README
+Copyright (C) 2011 Sergey Poznyakoff
+See the end of file for copying conditions.
+
+* Overview
+
+FIXME
+
+* Bug reporting.
+
+Send bug reports to <gray+nssync@gnu.org.ua>.
+
+
+* Copyright information:
+
+Copyright (C) 2011 Sergey Poznyakoff
+
+ Permission is granted to anyone to make or distribute verbatim copies
+ of this document as received, in any medium, provided that the
+ copyright notice and this permission notice are preserved,
+ thus giving the recipient permission to redistribute in turn.
+
+ Permission is granted to distribute modified versions
+ of this document, or of portions of it,
+ under the above conditions, provided also that they
+ carry prominent notices stating who last changed them.
+
+
+Local Variables:
+mode: outline
+paragraph-separate: "[ ]*$"
+version-control: never
+End:
diff --git a/configure.ac b/configure.ac
index 73b6c1a..5445df8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ AC_INIT([nssync], 1.0, [gray+nssync@gnu.org.ua])
AC_CONFIG_SRCDIR([src/nssync.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE([1.11 foreign tar-ustar dist-xz std-options silent-rules])
+AM_INIT_AUTOMAKE([1.11 gnu tar-ustar dist-xz std-options silent-rules])
AC_CONFIG_LIBOBJ_DIR([src])
# Enable silent rules by default:
diff --git a/src/Makefile.am b/src/Makefile.am
index cbc616f..055283e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@ LDADD=@GRECS_LDADD@
INCLUDES = @GRECS_INCLUDES@
BUILT_SOURCES = cmdline.h
-EXTRA_DIST = cmdline.h
+EXTRA_DIST = cmdline.h cmdline.opt
SUFFIXES=.opt .c .h
diff --git a/src/bindcf.c b/src/bindcf.c
index 88fabda..d87f64b 100644
--- a/src/bindcf.c
+++ b/src/bindcf.c
@@ -18,12 +18,18 @@
char *named_conf_file;
struct grecs_list *bind_include_path;
+char *bind_zonefile_dir;
+char *zone_file_pattern = "$zone";
+static char *bind_working_dir;
static struct grecs_node *bind_tree;
void
source_named_conf()
{
+ struct grecs_list_entry *ep;
+ struct grecs_node *node;
+
grecs_include_path_clear();
if (bind_include_path) {
struct grecs_list_entry *ep;
@@ -35,56 +41,305 @@ source_named_conf()
grecs_parser_fun = grecs_bind_parser;
if (!named_conf_file)
named_conf_file = "/etc/named.conf";
+
bind_tree = grecs_parse(named_conf_file);
if (!bind_tree)
exit(EX_UNAVAILABLE);
+
+ node = grecs_find_node(bind_tree, ".options.directory");
+ if (node) {
+ if (node->type != grecs_node_stmt ||
+ !node->v.value ||
+ node->v.value->type != GRECS_TYPE_STRING) {
+ grecs_error(&node->locus, 0,
+ "suspicious directory statement");
+ error_count++;
+ } else
+ bind_working_dir = node->v.value->v.string;
+ }
+
+ if (!bind_zonefile_dir) {
+ if (bind_working_dir) {
+ bind_zonefile_dir = bind_working_dir;
+ error("warning: no zonefile-dir set; "
+ "assuming %s", bind_zonefile_dir);
+ } else if (bind_include_path) {
+ bind_zonefile_dir = bind_include_path->head->data;
+ error("warning: no zonefile-dir set; "
+ "assuming %s", bind_zonefile_dir);
+ }
+
+ if (!bind_zonefile_dir) {
+ error("cannot determine directory name for generated"
+ " zone files; set zonefile-dir to fix");
+ exit(EX_CONFIG);
+ }
+ }
+
+ for (ep = synclist->head; ep; ep = ep->next) {
+ struct nssync *sp = ep->data;
+ struct grecs_node *np;
+
+ if (strcmp(named_conf_file, sp->zone_conf_file) == 0) {
+ error("zone-conf cannot be the same as named-conf, "
+ "in %s", sp->tag);
+ exit(EX_CONFIG);
+ }
+ if (access(sp->zone_conf_file, F_OK) && errno == ENOENT) {
+ sp->zone_tree = grecs_node_create(grecs_node_root,
+ NULL);
+ } else
+ sp->zone_tree = grecs_parse(sp->zone_conf_file);
+ if (!sp->zone_tree)
+ exit(EX_UNAVAILABLE);
+ for (np = sp->zone_tree->down; np; np = np->next) {
+ if (strcmp(np->ident, "zone")) {
+ grecs_error(&np->locus, 0,
+ "only zone statements are allowed");
+ exit(EX_CONFIG);
+ }
+ }
+ }
}
-const char *
-bindcf_lookup(struct nssync *sp)
+static char *
+absolute_name(const char *name, const char *dir)
{
- const char *name;
- struct grecs_node *node = grecs_find_node(bind_tree, sp->kwpath);
- if (!node) {
- error("%s: keyword %s not found in %s",
- sp->tag, sp->kwpath, named_conf_file);
- return NULL;
+ char *p;
+
+ if (name[0] == '/')
+ return grecs_strdup(name);
+
+ p = grecs_find_include_file(name, 1);
+ if (!p) {
+ size_t s = 0;
+ if (grecs_asprintf(&p, &s, "%s/%s", dir, name))
+ grecs_alloc_die();
}
- if (!node->v.value) {
- error("%s: no value for %s",
- sp->tag, sp->kwpath);
- return NULL;
+ return p;
+}
+
+static const char *
+strip_bind_working_dir(const char *name)
+{
+ if (bind_working_dir) {
+ size_t len = strlen(bind_working_dir);
+ if (strncmp(name, bind_working_dir, len) == 0) {
+ if (bind_working_dir[len-1] == '/')
+ return name + len;
+ else if (name[len] == '/')
+ return name + len + 1;
+ }
}
- if (node->v.value->type != GRECS_TYPE_STRING) {
- error("%s: %s is not a string",
- sp->tag, sp->kwpath);
- return NULL;
+ return name;
+}
+
+static void
+new_zone(struct nssync *sp, const char *zone, char *file)
+{
+ struct grecs_node *node, *np;
+
+ debug(1, ("%s: creating new zone file for %s, file %s", sp->tag,
+ zone, file));
+
+ node = grecs_node_create(grecs_node_block, NULL);
+ node->ident = "zone";
+ node->v.value = grecs_malloc(sizeof(node->v.value[0]));
+ node->v.value->type = GRECS_TYPE_STRING;
+ node->v.value->v.string = grecs_strdup(zone);
+
+ np = grecs_node_create(grecs_node_stmt, NULL);
+ np->ident = "file";
+ np->v.value = grecs_malloc(sizeof(np->v.value[0]));
+ np->v.value->type = GRECS_TYPE_STRING;
+ np->v.value->v.string = grecs_strdup(file);
+
+ node->down = np;
+
+ np = grecs_node_create(grecs_node_stmt, NULL);
+ np->ident = "$found$";
+ grecs_node_bind(node, np, 1);
+
+ grecs_node_bind(sp->zone_tree, node, 1);
+}
+
+#define is_safe_char(c) \
+ (isascii(c) && (isalnum(c) || strchr("_.-", (c)) != NULL))
+
+static char *
+safe_filename(const char *file)
+{
+ size_t size = 0;
+ const char *p;
+ char *name, *q;
+
+ for (p = file; *p; p++) {
+ if (is_safe_char(*p))
+ size++;
+ else
+ size += 3;
}
- debug(2, ("%s: found %s at %s:%d",
- sp->tag, sp->kwpath, node->locus.file, node->locus.line));
-
- name = node->v.value->v.string;
- if (name[0] != '/') {
- char *p = grecs_find_include_file(name, 1);
- if (!p) {
- if (errno == ENOENT) {
- if (bind_include_path) {
- size_t s = 0;
-
- grecs_asprintf(&p, &s,
- "%s/%s",
- bind_include_path->head->data,
- name);
- }
- }
+ if (size == strlen(file))
+ return grecs_strdup(file);
+
+ name = grecs_malloc(size + 1);
+ for (p = file, q = name; *p; p++) {
+ if (is_safe_char(*p))
+ *q++ = *p;
+ else {
+ unsigned char n;
+
+ *q++ = '%';
+ n = ((unsigned char)*p) / 16;
+ *q++ = n > 10 ? n + 'A' : n + '0';
+ n = ((unsigned char)*p) % 16;
+ *q++ = n > 10 ? n + 'A' : n + '0';
+ }
+ }
+ *q = 0;
+ return name;
+}
- if (!p) {
- error("%s: cannot find absolute name for %s: %s",
- sp->tag, name, strerror(errno));
- return NULL;
- }
+char *
+bindcf_lookup(struct nssync *sp, const char *zone)
+{
+ char *env[3];
+ struct wordsplit ws;
+ char *name;
+ struct grecs_node *node;
+
+ for (node = sp->zone_tree->down; node; node = node->next)
+ if (node->type == grecs_node_block &&
+ strcmp(node->ident, "zone") == 0 &&
+ node->v.value &&
+ node->v.value->type == GRECS_TYPE_STRING &&
+ strcasecmp(node->v.value->v.string, zone) == 0)
+ break;
+
+ if (node) {
+ struct grecs_node *np = grecs_find_node(node->down, "file");
+ if (!np) {
+ error("%s:%d: no file statement in zone!",
+ node->locus.file, node->locus.line);
+ error_count++;
+ return NULL;
}
- name = p;
+ if (np->type != grecs_node_stmt ||
+ !np->v.value ||
+ np->v.value->type != GRECS_TYPE_STRING) {
+ error("%s:%d: suspicious file statement",
+ np->locus.file, np->locus.line);
+ error_count++;
+ return NULL;
+ }
+ name = absolute_name(np->v.value->v.string, bind_working_dir);
+
+ np = grecs_node_create(grecs_node_stmt, NULL);
+ np->ident = "$found$";
+ grecs_node_bind(node, np, 1);
+ return name;
+ }
+
+ /* No zone statement: new zone */
+ env[0] = "zone";
+ env[1] = safe_filename(zone);
+ env[2] = NULL;
+ ws.ws_env = (const char**)env;
+ if (wordsplit(zone_file_pattern, &ws,
+ WRDSF_NOCMD | WRDSF_ENV | WRDSF_ENV_KV |
+ WRDSF_NOSPLIT | WRDSF_KEEPUNDEF)) {
+ error("cannot split zone-file-pattern: %s",
+ wordsplit_strerror(&ws));
+ exit(EX_SOFTWARE);
}
+ grecs_free(env[1]);
+ name = absolute_name(ws.ws_wordv[0], bind_zonefile_dir);
+ wordsplit_free(&ws);
+
+ new_zone(sp, zone, name);
return name;
}
+
+static void
+output_zone(FILE *fp, struct grecs_node *node)
+{
+ struct grecs_node *np;
+
+ fprintf(fp, "zone \"%s\" {\n", node->v.value->v.string);
+ fprintf(fp, " type master;\n");
+ np = grecs_find_node(node->down, "file");
+ if (!np)
+ abort();
+ fprintf(fp, " file \"%s\";\n",
+ strip_bind_working_dir(np->v.value->v.string));
+ fprintf(fp, "};\n");
+}
+
+void
+flush_zone_list(struct nssync *sp)
+{
+ char *fname= NULL;
+ size_t size = 0;
+ mode_t um;
+ struct grecs_node *node;
+ int fd;
+ FILE *fp;
+ unsigned long zone_count = 0;
+
+ debug(1, ("%s: creating temporary zone list", sp->tag));
+ if (grecs_asprintf(&fname, &size,
+ "%s/nssyncXXXXXX", tempdir))
+ grecs_alloc_die();
+
+ um = umask(077);
+ fd = mkstemp(fname);
+ umask(um);
+
+ if (fd == -1) {
+ error("cannot create temporary file %s: %s",
+ fname, strerror(errno));
+ exit(EX_UNAVAILABLE);
+ }
+ fp = fdopen(fd, "w+");
+
+ fprintf(fp, "# Bind configuration include file generated by %s\n",
+ PACKAGE_STRING);
+ fprintf(fp, "# Do not edit! See %s for details\n", config_file);
+ for (node = sp->zone_tree->down; node; node = node->next) {
+ if (grecs_find_node(node->down, "$found$")) {
+ output_zone(fp, node);
+ zone_count++;
+ } else {
+ char *file;
+ struct grecs_node *np = grecs_find_node(node->down,
+ "file");
+ if (!np) {
+ error("about to delete zone %s, which has "
+ "no file definition",
+ node->v.value->v.string);
+ } else if (file =
+ absolute_name(np->v.value->v.string,
+ bind_working_dir)) {
+ debug(1, ("deleting zone %s, file %s",
+ node->v.value->v.string,
+ file));
+ if (!dry_run_mode && unlink(file)) {
+ error("unlink(%s): %s",
+ file, strerror(errno));
+ }
+ }
+ }
+ }
+
+ debug(1, ("number of zones: %lu", zone_count));
+
+ fflush(fp);
+ if (compare(fname, sp->zone_conf_file)) {
+ debug(1, ("recreating %s", sp->zone_conf_file));
+ if (copy_file(fname, fp, sp->zone_conf_file))
+ error_count++;
+ }
+ fclose(fp);
+ unlink(fname);
+ free(fname);
+}
diff --git a/src/cmdline.opt b/src/cmdline.opt
index 5f246af..88439ef 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -49,6 +49,12 @@ BEGIN
dry_run_mode = 1;
END
+OPTION(force,f,,
+ [<proceed even if slave status has not changed>])
+BEGIN
+ force = 1;
+END
+
OPTION(config-file,c,FILE,
[<use FILE instead of the default configuration>])
BEGIN
diff --git a/src/config.c b/src/config.c
index 6cf5609..aad39cc 100644
--- a/src/config.c
+++ b/src/config.c
@@ -20,9 +20,9 @@
struct grecs_list *synclist;
static struct grecs_keyword sync_kw[] = {
- { "path",
- NULL, "Path of a keyword in named.conf which holds file name for this synchronization block",
- grecs_type_string, NULL, offsetof(struct nssync, kwpath) },
+ { "zone-conf",
+ NULL, "zone configuration file",
+ grecs_type_string, NULL, offsetof(struct nssync, zone_conf_file) },
{ "soa-query",
NULL, "Set query for retrieving SOA records",
grecs_type_string, NULL, offsetof(struct nssync, soa_query) },
@@ -62,8 +62,8 @@ cb_sync(enum grecs_callback_command cmd,
case grecs_callback_section_end:
sp = *pdata;
- if (!sp->kwpath) {
- grecs_error(locus, 0, "path not defined");
+ if (!sp->zone_conf_file) {
+ grecs_error(locus, 0, "zone-conf not defined");
err = 1;
}
if (!sp->soa_query) {
@@ -113,6 +113,10 @@ static struct grecs_keyword nssync_kw[] = {
"file", "File name of the Certificate Authority (CA) certificate",
grecs_type_string, &sql_cacert },
+ { "slave-status-file",
+ NULL, "Check slave status and save it in the given file",
+ grecs_type_string, &slave_status_file },
+
{ "tempdir",
NULL, "Name for the temporary directory (must exist)",
grecs_type_string, &tempdir },
@@ -120,13 +124,23 @@ static struct grecs_keyword nssync_kw[] = {
{ "named-conf",
NULL, "Name of the named configuration file",
grecs_type_string, &named_conf_file },
+
{ "bind-include-path",
NULL, "Set include path for BIND configuration",
grecs_type_string|GRECS_LIST, &bind_include_path },
+ { "zonefile-dir",
+ NULL, "Directory for new zone files",
+ grecs_type_string, &bind_zonefile_dir },
+ { "zonefile-pattern",
+ NULL, "Pattern for new zone file names",
+ grecs_type_string, &zone_file_pattern },
{ "compare-command",
NULL, "Command to compare two zone files",
grecs_type_string, &compare_command },
+ { "reload-command",
+ NULL, "Command to reload the nameserver",
+ grecs_type_string, &reload_command },
{ "sync", N_("tag: string"), N_("Define a synchrinization block"),
grecs_type_section, NULL, 0, cb_sync, NULL, sync_kw },
diff --git a/src/nssync.c b/src/nssync.c
index fac4b3e..3d90c40 100644
--- a/src/nssync.c
+++ b/src/nssync.c
@@ -17,16 +17,21 @@
#include "nssync.h"
#include <sys/stat.h>
#include <fcntl.h>
-#include "cmdline.h"
int lint_mode;
int dry_run_mode;
int preprocess_only;
int debug_level;
char *config_file = SYSCONFDIR "/nssync.conf";
+char *slave_status_file;
+int force;
char *tempdir;
+char *reload_command = "/usr/sbin/rndc reload";
char *compare_command = "cmp $oldfile $newfile > /dev/null";
unsigned error_count;
+unsigned changed_zones;
+
+#include "cmdline.h"
void
verror(const char *fmt, va_list ap)
@@ -67,6 +72,10 @@ copy_file(const char *file_name, FILE *infile, const char *dst_file)
size_t bufsize;
size_t fsize;
+ changed_zones++;
+ if (dry_run_mode)
+ return 0;
+
if (fstat(fileno(infile), &st)) {
error("cannot stat source file %s: %s",
file_name, strerror(errno));
@@ -124,38 +133,37 @@ copy_file(const char *file_name, FILE *infile, const char *dst_file)
return rc;
}
+
int
-move_file(const char *file, FILE *fp, const char *dst_file)
+compare(const char *oldfile, const char *newfile)
{
- int rc = 0;
- struct stat st;
- mode_t mode;
-
- if (stat(dst_file, &st)) {
- if (errno == ENOENT)
- mode = 0640;
- else {
- error("cannot stat %s: %s", dst_file, strerror(errno));
- return 1;
- }
- } else
- mode = st.st_mode & 0777;
+ const char *env[5];
+ struct wordsplit ws;
+ int rc;
+
+ if (access(newfile, F_OK) && errno == ENOENT) {
+ debug(2,("destination file %s does not exist", newfile));
+ return 1;
+ }
- if (rename(file, dst_file)) {
- if (errno == EXDEV) {
- if (copy_file(file, fp, dst_file)) {
- error("cannot copy %s to %s: %s",
- file, dst_file, strerror(errno));
- rc = 1;
- } else
- unlink(file);
- } else {
- error("cannot move %s to %s: %s",
- file, dst_file, strerror(errno));
- rc = 1;
- }
- } else
- chmod(dst_file, mode);
+ env[0] = "oldfile";
+ env[1] = oldfile;
+ env[2] = "newfile";
+ env[3] = newfile;
+ env[4] = 0;
+ ws.ws_env = env;
+ if (wordsplit(compare_command, &ws,
+ WRDSF_NOCMD | WRDSF_ENV | WRDSF_ENV_KV |
+ WRDSF_NOSPLIT | WRDSF_KEEPUNDEF)) {
+ error("cannot split compare-command: %s",
+ wordsplit_strerror(&ws));
+ exit(EX_SOFTWARE);
+ }
+
+ debug(2,("running %s", ws.ws_wordv[0]));
+ rc = system(ws.ws_wordv[0]);
+ wordsplit_free(&ws);
+ debug(2,("command returned %d", rc));
return rc;
}
@@ -171,12 +179,6 @@ synchronize(struct nssync *sp)
int rc;
debug(1, ("processing %s", sp->tag));
- file_name = bindcf_lookup(sp);
- if (!file_name)
- return;
- sp->file_name = file_name;
- debug(2, ("%s: file %s", sp->tag, sp->file_name));
-
if (grecs_asprintf(&sp->temp_file_name, &size,
"%s/%s.tmp", tempdir, sp->tag))
grecs_alloc_die();
@@ -190,41 +192,49 @@ synchronize(struct nssync *sp)
return;
}
format_zones(sp);
-
- fflush(sp->fp);
-
- env[0] = "oldfile";
- env[1] = sp->file_name;
- env[2] = "newfile";
- env[3] = sp->temp_file_name;
- env[4] = 0;
- ws.ws_env = env;
- if (wordsplit(compare_command, &ws,
- WRDSF_NOCMD | WRDSF_ENV | WRDSF_ENV_KV |
- WRDSF_NOSPLIT | WRDSF_KEEPUNDEF)) {
- error("cannot split compare-command: %s",
- wordsplit_strerror(&ws));
- exit(EX_SOFTWARE);
+ if (!dry_run_mode)
+ unlink(sp->temp_file_name);
+ free(sp->temp_file_name);
+}
+
+void
+check_slave_status()
+{
+ FILE *fp = fopen(slave_status_file, "r");
+ char *saved_file = NULL;
+ char *saved_off;
+ char *buf = NULL;
+ size_t size = 0;
+ char *sql_file, *sql_off;
+
+ if (fp) {
+ if (grecs_getline(&buf, &size, fp) > 0) {
+ buf[strlen(buf)-1] = 0;
+ saved_file = buf;
+ saved_off = strchr(saved_file, ' ');
+ if (saved_off)
+ *saved_off++ = 0;
+ }
+ fclose(fp);
}
- debug(1,("running %s", ws.ws_wordv[0]));
- rc = system(ws.ws_wordv[0]);
- wordsplit_free(&ws);
- debug(1,("command returned %d", rc));
-
- if (rc) {
- debug(1,("copying %s to %s", sp->temp_file_name,
- sp->file_name));
- if (!dry_run_mode &&
- move_file(sp->temp_file_name, sp->fp, sp->file_name))
- error_count++;
+ if (sql_get_slave_status(&sql_file, &sql_off))
+ unlink(slave_status_file);
+ else if (!force && saved_file && saved_off &&
+ strcmp(sql_file, saved_file) == 0 &&
+ strcmp(sql_off, saved_off) == 0) {
+ debug(1, ("slave status hasn't changed: nothing to do"));
+ exit(0);
}
- fclose(sp->fp);
- sp->fp = NULL;
- if (dry_run_mode)
- return;
- unlink(sp->temp_file_name);
+ fp = fopen(slave_status_file, "w");
+ if (fp) {
+ fprintf(fp, "%s %s\n", sql_file, sql_off);
+ fclose(fp);
+ }
+ free(sql_file);
+ free(sql_off);
}
+
int
main(int argc, char **argv)
@@ -239,8 +249,31 @@ main(int argc, char **argv)
config_parse();
sql_connect();
+ if (slave_status_file)
+ check_slave_status();
+
for (ep = synclist->head; ep; ep = ep->next)
synchronize(ep->data);
- exit(error_count ? EX_UNAVAILABLE : 0);
+ if (error_count)
+ exit(EX_UNAVAILABLE);
+
+ for (ep = synclist->head; ep; ep = ep->next)
+ flush_zone_list(ep->data);
+
+ if (error_count)
+ exit(EX_UNAVAILABLE);
+
+ if (changed_zones) {
+ debug(1,("about to run %s", reload_command));
+ if (!dry_run_mode) {
+ int rc = system(reload_command);
+ if (rc) {
+ debug(1,("reload command returned %d", rc));
+ exit(EX_UNAVAILABLE);
+ }
+ }
+ }
+
+ exit(0);
}
diff --git a/src/nssync.h b/src/nssync.h
index 3541250..bb15d82 100644
--- a/src/nssync.h
+++ b/src/nssync.h
@@ -32,8 +32,12 @@ extern int dry_run_mode;
extern int preprocess_only;
extern int debug_level;
extern char *config_file;
+extern char *slave_status_file;
extern char *tempdir;
extern char *compare_command;
+extern char *reload_command;
+
+extern unsigned changed_zones;
extern char *sql_config_file;
extern char *sql_config_group;
@@ -47,9 +51,14 @@ extern int sql_port;
extern char *named_conf_file;
extern struct grecs_list *bind_include_path;
+extern char *bind_zonefile_dir;
+extern char *zone_file_pattern;
extern struct grecs_list *synclist;
+extern unsigned error_count;
+extern unsigned changed_zones;
+
extern int debug_level;
#define debug(n,s) \
@@ -74,16 +83,19 @@ void sql_connect(void);
void sql_disconnect(void);
int sql_do_query(const char *query,
int (*fun)(MYSQL_ROW, unsigned, void*), void *data);
+int sql_get_slave_status(char **pfile, char **poff);
struct nssync {
char *tag;
- char *kwpath;
+ char *zone_conf_file;
+ struct grecs_node *zone_tree;
+
char *soa_query;
char *rr_query;
char *rev_rr_query;
char *ns_query;
- const char *file_name;
+ char *file_name;
char *temp_file_name;
FILE *fp;
};
@@ -91,7 +103,9 @@ struct nssync {
void format_zones(struct nssync *);
void source_named_conf(void);
-const char *bindcf_lookup(struct nssync *sp);
+char *bindcf_lookup(struct nssync *sp, const char *zone);
+void flush_zone_list(struct nssync *sp);
+int compare(const char *oldfile, const char *newfile);
diff --git a/src/output.c b/src/output.c
index a697fe7..a684201 100644
--- a/src/output.c
+++ b/src/output.c
@@ -61,7 +61,8 @@ format_rr_record(MYSQL_ROW row, unsigned nf, void *data)
if (strcasecmp(row[f_rr_type], "MX") == 0)
fprintf(sp->fp, "%s\t%s\tMX\t%s\t%s\n",
row[f_rr_host], S(row[f_rr_ttl]),
- row[f_rr_priority], row[f_rr_data]);
+ row[f_rr_priority] ? row[f_rr_priority] : "1",
+ row[f_rr_data]);
else
fprintf(sp->fp, "%s\t%s\t%s\t%s\n",
row[f_rr_host], S(row[f_rr_ttl]),
@@ -107,11 +108,24 @@ format_soa_record(MYSQL_ROW row, unsigned nf, void *data)
}
if (!row[f_soa_type])
return 0;
- fprintf(sp->fp, "$ORIGIN .\n");
+
+ grecs_free(sp->file_name);
+ sp->file_name = bindcf_lookup(sp, row[f_soa_zone]);
+ if (!sp->file_name)
+ return 0;
+ debug(2, ("%s: zone %s, file %s", sp->tag, row[f_soa_zone],
+ sp->file_name));
+
+ fflush(sp->fp);
+ fseek(sp->fp, 0, SEEK_SET);
+ ftruncate(fileno(sp->fp), 0);
+
+ fprintf(sp->fp, "; Zone file generated by %s\n", PACKAGE_STRING);
+ fprintf(sp->fp, "; Do not edit! See %s for details\n", config_file);
if (row[f_soa_ttl])
fprintf(sp->fp, "$TTL %s\n", row[f_soa_ttl]);
fprintf(sp->fp,
- "%s %s IN SOA %s %s (\n"
+ "%s. %s IN SOA %s %s (\n"
"\t%s ; Serial\n"
"\t%s ; Refresh\n"
"\t%s ; Retry\n"
@@ -157,7 +171,16 @@ format_soa_record(MYSQL_ROW row, unsigned nf, void *data)
exit(EX_UNAVAILABLE);
wordsplit_free(&ws);
-
+
+ fflush(sp->fp);
+
+ if (compare(sp->temp_file_name, sp->file_name)) {
+ debug(1,("copying %s to %s", sp->temp_file_name,
+ sp->file_name));
+ if (copy_file(sp->temp_file_name, sp->fp, sp->file_name))
+ error_count++;
+ }
+
return 0;
}
diff --git a/src/sqlop.c b/src/sqlop.c
index eb3f543..db53c45 100644
--- a/src/sqlop.c
+++ b/src/sqlop.c
@@ -91,4 +91,32 @@ sql_do_query(const char *query,
return 0;
}
+
+struct slave_status_info
+{
+ char *file;
+ char *off;
+};
+
+static int
+read_slave_status(MYSQL_ROW row, unsigned nf, void *closure)
+{
+ struct slave_status_info *ssi = closure;
+ ssi->file = grecs_strdup(row[5]);
+ ssi->off = grecs_strdup(row[6]);
+ return 1;
+}
+
+int
+sql_get_slave_status(char **pfile, char **poff)
+{
+ struct slave_status_info ssi = { NULL, NULL };
+ if (sql_do_query("SHOW SLAVE STATUS", read_slave_status, &ssi))
+ return 1;
+ *pfile = ssi.file;
+ *poff = ssi.off;
+ return 0;
+}
+
+

Return to:

Send suggestions and report system problems to the System administrator.