]> git.infradead.org Git - users/dhowells/kafs-client.git/commitdiff
Update the package, drawing on Jonathan S. Billings's package
authorDavid Howells <dhowells@redhat.com>
Mon, 10 Sep 2018 10:39:44 +0000 (11:39 +0100)
committerDavid Howells <dhowells@redhat.com>
Mon, 10 Sep 2018 10:39:44 +0000 (11:39 +0100)
Signed-off-by: David Howells <dhowells@redhat.com>
LICENCE.GPL [new file with mode: 0644]
Makefile
README
conf/afs.mount [moved from kafs.mount with 77% similarity]
conf/cellservdb.conf [new file with mode: 0644]
conf/etc.conf [new file with mode: 0644]
man/aklog-kafs.1 [moved from aklog-kafs.1 with 100% similarity]
man/aklog.1 [new file with mode: 0644]
redhat/kafs-client.spec
src/Makefile [new file with mode: 0644]
src/aklog-kafs.c [moved from aklog-kafs.c with 100% similarity]

diff --git a/LICENCE.GPL b/LICENCE.GPL
new file mode 100644 (file)
index 0000000..4505352
--- /dev/null
@@ -0,0 +1,339 @@
+                   GNU GENERAL PUBLIC LICENSE
+                      Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc. <http://fsf.org/>
+     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.
+
+                           Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+\f
+                   GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+\f
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+\f
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+\f
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                           NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                    END OF TERMS AND CONDITIONS
+\f
+       Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
index c94ae46d1f16466d2f529c814eee889456a4c967..56f70f02c2804d8e6f428edece6cf0ae9a5b147b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
 CFLAGS         = -g -O2 -Wall -Wsign-compare
 INSTALL                = install
 DESTDIR                =
-ETCDIR         = /etc
+ETCDIR         = /etc/kafs
 BINDIR         = /usr/bin
 MANDIR         = /usr/share/man
+DATADIR                = /usr/share/kafs-client
 SPECFILE       = redhat/kafs-client.spec
 
 LNS            := ln -sf
@@ -37,10 +38,8 @@ endif
 # Build stuff
 #
 ###############################################################################
-all: aklog-kafs
-
-aklog-kafs: aklog-kafs.c Makefile
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lkrb5 -lcrypto -lkeyutils
+all:
+       $(MAKE) -C src all
 
 ###############################################################################
 #
@@ -50,9 +49,13 @@ aklog-kafs: aklog-kafs.c Makefile
 MAN1   := $(MANDIR)/man1
 
 install: all
-       $(INSTALL) -D -m 0755 aklog-kafs $(DESTDIR)$(BINDIR)/aklog-kafs
-       $(INSTALL) -D -m 0644 aklog-kafs.1 $(DESTDIR)$(MAN1)/aklog-kafs.1
-       mkdir -m755 $(DESTDIR)/kafs
+       $(MAKE) -C src install
+       $(INSTALL) -D -m 0644 man/aklog-kafs.1 $(DESTDIR)$(MAN1)/aklog-kafs.1
+       $(INSTALL) -D -m 0644 man/aklog.1 $(DESTDIR)$(MAN1)/aklog.1
+       $(INSTALL) -D -m 0644 conf/cellservdb.conf $(DESTDIR)$(DATADIR)/cellservdb.conf
+       $(INSTALL) -D -m 0644 conf/etc.conf $(DESTDIR)$(ETCDIR)/cellservdb.conf
+       mkdir -m755 $(DESTDIR)$(ETCDIR)/cellservdb.d
+       mkdir -m755 $(DESTDIR)/afs
 
 ###############################################################################
 #
@@ -60,11 +63,11 @@ install: all
 #
 ###############################################################################
 clean:
-       $(RM) aklog-kafs
-       $(RM) *.o *~
+       $(MAKE) -C src clean
        $(RM) debugfiles.list debugsources.list
 
 distclean: clean
+       $(MAKE) -C src distclean
        $(RM) -r rpmbuild $(TARBALL)
 
 ###############################################################################
diff --git a/README b/README
index 1f07a369c26f3d0b55e255348a9f5b3a154d6948..d5c9cc2c08f7c6abb0bb8e27dd60e38a491d56ca 100644 (file)
--- a/README
+++ b/README
@@ -14,9 +14,9 @@ OVERVIEW
 The kafs-client package provides the basics for using the kAFS filesystem in
 the Linux kernel.  It provides:
 
- (*) The aklog program that can be used to authenticate with Kerberos so that
-     the kAFS filesystem can perform authenticated and encrypted communications
-     with an AFS fileserver.
+ (*) The aklog-kafs program that can be used to authenticate with Kerberos so
+     that the kAFS filesystem can perform authenticated and encrypted
+     communications with an AFS fileserver.
 
  (*) A dynamic mount on /afs so that the roots of arbitrary cells can be
      mounted automatically, using the DNS to look up their details.  This needs
@@ -27,4 +27,4 @@ the Linux kernel.  It provides:
      and can then be accessed by referring to cell names in the /afs/
      directory, for example:
 
-       ls /afs/grand.central/
+       ls /afs/grand.central.org/
similarity index 77%
rename from kafs.mount
rename to conf/afs.mount
index a9c8e8433712d4cd052683c24b384bdbcfb85a86..8e72726997520f0f1e314729d99c1b96af16932b 100644 (file)
@@ -1,10 +1,10 @@
 [Unit]
 Description=kAFS Dynamic Root mount
-ConditionPathExists=/kafs
+ConditionPathExists=/afs
 
 [Mount]
 What=none
-Where=/kafs
+Where=/afs
 Type=afs
 Options=_netdev,dyn
 
diff --git a/conf/cellservdb.conf b/conf/cellservdb.conf
new file mode 100644 (file)
index 0000000..91db7a6
--- /dev/null
@@ -0,0 +1,2178 @@
+# AuristorFS cellservdb client configuration
+# 8 October 2017
+#
+# This file should be placed in the yfs-client.conf.d directory
+# or beincluded within the yfs-client.conf file.
+
+[cells]
+       # grand.central.org imported from DNS SRV
+       grand.central.org = {
+               description = "Grand Central Org"
+               use_dns = yes
+               kerberos_realm = GRAND.CENTRAL.ORG
+               servers = {
+                       grand.mit.edu = {
+                               address = 18.9.48.14
+                       }
+                       grand-old-opry.central.org = {
+                               address = 128.2.13.219
+                       }
+               }
+       }
+       # wu-wien.ac.at imported from DNS AFSDB
+       wu-wien.ac.at = {
+               description = "University of Economics, Vienna, Austria"
+               use_dns = yes
+               servers = {
+                       heimdal.wu-wien.ac.at = {
+                               address = 137.208.7.37
+                       }
+                       caravaggio.wu-wien.ac.at = {
+                               address = 137.208.7.57
+                       }
+                       vermeer.wu-wien.ac.at = {
+                               address = 137.208.8.14
+                       }
+                       goya.wu-wien.ac.at = {
+                               address = 137.208.3.33
+                       }
+               }
+       }
+       # hephy.at imported from DNS SRV
+       hephy.at = {
+               description = "hephy-vienna"
+               use_dns = yes
+               servers = {
+                       afs01.hephy.oeaw.ac.at = {
+                               address = 193.170.243.10
+                       }
+                       afs02.hephy.oeaw.ac.at = {
+                               address = 193.170.243.12
+                       }
+                       afs03.hephy.oeaw.ac.at = {
+                               address = 193.170.243.14
+                       }
+               }
+       }
+       # cgv.tugraz.at imported from DNS SRV
+       cgv.tugraz.at = {
+               description = "CGV cell"
+               use_dns = yes
+               servers = {
+                       phobos.cgv.tugraz.at = {
+                               address = 129.27.218.30
+                       }
+                       deimos.cgv.tugraz.at = {
+                               address = 129.27.218.31
+                       }
+                       trinculo.cgv.tugraz.at = {
+                               address = 129.27.218.32
+                       }
+               }
+       }
+       # itp.tugraz.at imported from GCO Public CellServDB 01 Jan 2016
+       itp.tugraz.at = {
+               description = "Institute of Theoretical and Computational Physics, TU Graz, Aus"
+               use_dns = yes
+               servers = {
+                       faepafs1.tu-graz.ac.at = {
+                               address = 129.27.161.7
+                       }
+                       faepafs2.tu-graz.ac.at = {
+                               address = 129.27.161.15
+                       }
+                       faepafs3.tu-graz.ac.at = {
+                               address = 129.27.161.114
+                       }
+               }
+       }
+       # ualberta.ca imported from GCO Public CellServDB 01 Jan 2016
+       ualberta.ca = {
+               description = "University of Alberta"
+               use_dns = yes
+               servers = {
+                       file13.ucs.ualberta.ca = {
+                               address = 129.128.1.131
+                       }
+                       mystery.ucs.ualberta.ca = {
+                               address = 129.128.98.17
+                       }
+                       drake.ucs.ualberta.ca = {
+                               address = 129.128.125.40
+                       }
+               }
+       }
+       # cern.ch imported from DNS AFSDB
+       cern.ch = {
+               description = "European Laboratory for Particle Physics, Geneva"
+               use_dns = yes
+               servers = {
+                       afsdb1.cern.ch = {
+                               address = 137.138.128.148
+                       }
+                       afsdb3.cern.ch = {
+                               address = 137.138.246.50
+                       }
+                       afsdb2.cern.ch = {
+                               address = 137.138.246.51
+                       }
+               }
+       }
+       # psi.ch imported from DNS AFSDB
+       psi.ch = {
+               description = "Paul Scherrer Institut - Villigen, Switzerland"
+               use_dns = yes
+               servers = {
+                       afs00.psi.ch = {
+                               address = 129.129.190.140
+                       }
+                       afs01.psi.ch = {
+                               address = 129.129.190.141
+                       }
+                       afs02.psi.ch = {
+                               address = 129.129.190.142
+                       }
+               }
+       }
+       # freedaemon.com imported from GCO Public CellServDB 01 Jan 2016
+       freedaemon.com = {
+               description = "Free Daemon Consulting, Oklahoma City, OK, USA"
+               use_dns = yes
+               servers = {
+                       afs0.freedaemon.com = {
+                               address = 66.210.104.254
+                       }
+                       afs1.freedaemon.com = {
+                               address = 78.46.227.213
+                       }
+                       afs2.freedaemon.com = {
+                               address = 208.79.89.92
+                       }
+               }
+       }
+       # nilcons.com imported from DNS SRV
+       nilcons.com = {
+               description = "nilcons.com"
+               use_dns = yes
+               servers = {
+                       files.nilcons.com = {
+                               address = 5.9.14.177
+                       }
+               }
+       }
+       # ics.muni.cz updated 8 Oct 2017 via udebug
+       ics.muni.cz = {
+               description = "Masaryk university, Czech Republic"
+               use_dns = yes
+               servers = {
+                       afs-plzen.meta.zcu.cz = {
+                               address = 147.228.240.30
+                       }
+                       smaug2.ics.muni.cz = {
+                               address = 147.251.9.9
+                       }
+                       tarkil-xen.cesnet.cz = {
+                               address = 195.113.214.4
+                       }
+               }
+       }
+       # zcu.cz imported from AFSDB
+       zcu.cz = {
+               description = "University of West Bohemia, Czech Republic"
+               use_dns = yes
+               servers = {
+                       sauron.zcu.cz = {
+                               address = 147.228.10.18
+                       }
+                       oknos.zcu.cz = {
+                               address = 147.228.52.10
+                       }
+                       nic.zcu.cz = {
+                               address = 147.228.52.17
+                       }
+               }
+       }
+       # desy.de imported from AFSDB
+       desy.de = {
+               description = "Deutsches Elektronen-Synchrotron"
+               use_dns = yes
+               servers = {
+                       afsdb2.desy.de = {
+                               address = 131.169.2.19
+                       }
+                       afsdb3.desy.de = {
+                               address = 131.169.2.20
+                       }
+                       solar00.desy.de = {
+                               address = 131.169.244.60
+                       }
+                       afsdb5.desy.de = {
+                               address = 131.169.2.42
+                       }
+               }
+       }
+       # naf.desy.de imported from GCO Public CellServDB 01 Jan 2016
+       naf.desy.de = {
+               description = "National Analysis Facility at DESY"
+               use_dns = yes
+               servers = {
+                       tcsh1-vm1.naf.desy.de = {
+                               address = 141.34.220.32
+                       }
+                       tcsh2-vm1.naf.desy.de = {
+                               address = 141.34.230.33
+                       }
+                       tcsh3-vm1.naf.desy.de = {
+                               address = 141.34.230.34
+                       }
+               }
+       }
+       # gppc.de update 8 Oct 2017 via udebug
+       gppc.de = {
+               description = "GPP Chemnitz mbH"
+               use_dns = yes
+               servers = {
+                       gpp1.gppc.de = {
+                               address = 213.187.92.33
+                       }
+                       tyr.gppc.de = {
+                               address = 213.187.92.39
+                       }
+                       rhea.gppc.de = {
+                               address = 213.187.92.36
+                       }
+               }
+       }
+       # cms.hu-berlin.de imported from GCO Public CellServDB 01 Jan 2016
+       cms.hu-berlin.de = {
+               description = "Humboldt University Berlin"
+               use_dns = yes
+               servers = {
+                       commodus.cms.hu-berlin.de = {
+                               address = 141.20.1.65
+                       }
+                       faustinus.cms.hu-berlin.de = {
+                               address = 141.20.1.66
+                       }
+                       marcellus.cms.hu-berlin.de = {
+                               address = 141.20.1.67
+                       }
+               }
+       }
+       # ifh.de imported from AFSDB
+       ifh.de = {
+               description = "DESY Zeuthen"
+               use_dns = yes
+               servers = {
+                       romulus.ifh.de = {
+                               address = 141.34.22.10
+                       }
+                       remus.ifh.de = {
+                               address = 141.34.22.11
+                       }
+                       hekate.ifh.de = {
+                               address = 141.34.22.29
+                       }
+               }
+       }
+       # integra-ev.de update 8 Oct 2017 via udebug
+       integra-ev.de = {
+               description = "INTEGRA e.V."
+               use_dns = yes
+               servers = {
+                       afsdb2.integra-ev.de = {
+                               address = 134.155.48.14
+                       }
+                       afsdb1.integra-ev.de = {
+                               address = 134.155.48.8
+                       }
+               }
+       }
+       # ipp-garching.mpg.de imported from DNS SRV
+       ipp-garching.mpg.de = {
+               description = "Institut fuer Plasmaphysik"
+               use_dns = yes
+               servers = {
+                       afs-db1.rzg.mpg.de = {
+                               address = 130.183.9.5
+                       }
+                       afs-db3.bc.rzg.mpg.de = {
+                               address = 130.183.14.14
+                       }
+                       afs-db2.aug.ipp-garching.mpg.de = {
+                               address = 130.183.100.10
+                       }
+               }
+       }
+       # mpe.mpg.de imported from GCO Public CellServDB 01 Jan 2016
+       mpe.mpg.de = {
+               description = "MPE cell"
+               use_dns = yes
+               servers = {
+                       irafs1.mpe-garching.mpg.de = {
+                               address = 130.183.130.7
+                       }
+                       irafs2.mpe-garching.mpg.de = {
+                               address = 130.183.134.20
+                       }
+               }
+       }
+       # nicsys.de imported from GCO Public CellServDB 01 Jan 2016
+       nicsys.de = {
+               description = "NICsys GbR"
+               use_dns = yes
+               servers = {
+                       attila.nicsys.de = {
+                               address = 213.187.80.3
+                       }
+               }
+       }
+       # tu-berlin.de imported from DNS SRV
+       tu-berlin.de = {
+               description = "TU Berlin"
+               use_dns = yes
+               servers = {
+                       afsc-pr-1.tubit.tu-berlin.de = {
+                               address = 130.149.204.10
+                       }
+                       afsc-pr-2.tubit.tu-berlin.de = {
+                               address = 130.149.204.11
+                       }
+                       afsc-ba-1.tubit.tu-berlin.de = {
+                               address = 130.149.204.70
+                       }
+               }
+       }
+       # tu-chemnitz.de imported from DNS SRV
+       tu-chemnitz.de = {
+               description = "Technische Universitaet Chemnitz, Germany"
+               use_dns = yes
+               servers = {
+                       zuse.hrz.tu-chemnitz.de = {
+                               address = 134.109.2.1
+                       }
+                       andrew.hrz.tu-chemnitz.de = {
+                               address = 134.109.2.2
+                       }
+                       phoenix.hrz.tu-chemnitz.de = {
+                               address = 134.109.2.15
+                       }
+               }
+       }
+       # physik.uni-bonn.de imported from DNS SRV
+       physik.uni-bonn.de = {
+               description = "Institute of Physics, University of Bonn, Germany"
+               use_dns = yes
+               servers = {
+                       afsdb1.physik.uni-bonn.de = {
+                               address = 131.220.166.33
+                       }
+                       afsdb2.physik.uni-bonn.de = {
+                               address = 131.220.166.34
+                       }
+                       afsdb3.physik.uni-bonn.de = {
+                               address = 131.220.166.35
+                       }
+               }
+       }
+       # atlass01.physik.uni-bonn.de imported from GCO Public CellServDB 01 Jan 2016
+       atlass01.physik.uni-bonn.de = {
+               description = "Bonn ATLAS"
+               use_dns = yes
+               servers = {
+                       atlass01.physik.uni-bonn.de = {
+                               address = 131.220.165.43
+                       }
+               }
+       }
+       # uni-freiburg.de imported from AFSDB
+       uni-freiburg.de = {
+               description = "Albert-Ludwigs-Universitat Freiburg"
+               use_dns = yes
+               servers = {
+                       sv8.ruf.uni-freiburg.de = {
+                               address = 132.230.6.237
+                       }
+                       sv7.ruf.uni-freiburg.de = {
+                               address = 132.230.6.236
+                       }
+               }
+       }
+       # physik.uni-freiburg.de updated 8 Oct 2017 via udebug
+       physik.uni-freiburg.de = {
+               description = "Institute of Physics, University Freiburg, Germany"
+               use_dns = yes
+               servers = {
+                       sherlock.physik.uni-freiburg.de = {
+                               address = 132.230.77.12
+                       }
+               }
+       }
+       # math.uni-hamburg.de imported from AFSDB
+       math.uni-hamburg.de = {
+               description = "Department of Mathematics Uni Hamburg"
+               use_dns = yes
+               servers = {
+                       afs-core.math.uni-hamburg.de = {
+                               address = 134.100.223.3
+                       }
+                       afs-core2.math.uni-hamburg.de = {
+                               address = 134.100.223.6
+                       }
+                       afs-core3.math.uni-hamburg.de = {
+                               address = 134.100.223.9
+                       }
+               }
+       }
+       # physnet.uni-hamburg.de imported from AFSDB
+       physnet.uni-hamburg.de = {
+               description = "PHYSnet-Rechenzentrum university of hamburg"
+               use_dns = yes
+               servers = {
+                       afs-core.physnet.uni-hamburg.de = {
+                               address = 134.100.106.44
+                       }
+                       afs-core2.physnet.uni-hamburg.de = {
+                               address = 134.100.106.45
+                       }
+                       afs-core3.physnet.uni-hamburg.de = {
+                               address = 134.100.106.47
+                       }
+               }
+       }
+       # iqo.uni-hannover.de imported from AFSDB
+       iqo.uni-hannover.de = {
+               description = "Institut fuer Quantenoptik Hannover"
+               use_dns = yes
+               servers = {
+                       afs1.iqo.uni-hannover.de = {
+                               address = 130.75.103.221
+                       }
+                       afs2.iqo.uni-hannover.de = {
+                               address = 130.75.103.223
+                       }
+               }
+       }
+       # mathi.uni-heidelberg.de imported from AFDDB
+       mathi.uni-heidelberg.de = {
+               description = "Uni Heidelberg (Mathematisches Institut)"
+               use_dns = yes
+               servers = {
+                       hactar.mathi.uni-heidelberg.de = {
+                               address = 129.206.26.241
+                       }
+               }
+       }
+       # urz.uni-heidelberg.de imported from GCO Public CellServDB 01 Jan 2016
+       urz.uni-heidelberg.de = {
+               description = "Uni Heidelberg (Rechenzentrum)"
+               use_dns = yes
+               servers = {
+                       afsdb.urz.uni-heidelberg.de = {
+                               address = 129.206.119.10
+                       }
+                       afsdb1.urz.uni-heidelberg.de = {
+                               address = 129.206.119.16
+                       }
+                       afsdb2.urz.uni-heidelberg.de = {
+                               address = 129.206.119.17
+                       }
+               }
+       }
+       # uni-hohenheim.de imported from AFSDB
+       uni-hohenheim.de = {
+               description = "University of Hohenheim"
+               use_dns = yes
+               servers = {
+                       rs13.serv.uni-hohenheim.de = {
+                               address = 144.41.2.2
+                       }
+                       rs14.serv.uni-hohenheim.de = {
+                               address = 144.41.2.3
+                       }
+                       rs15.serv.uni-hohenheim.de = {
+                               address = 144.41.2.4
+                       }
+               }
+       }
+       # rz.uni-jena.de imported from SRV
+       rz.uni-jena.de = {
+               description = "Rechenzentrum University of Jena, Germany"
+               use_dns = yes
+               servers = {
+                       afs00.rz.uni-jena.de = {
+                               address = 141.35.2.180
+                       }
+                       afs01.rz.uni-jena.de = {
+                               address = 141.35.2.181
+                       }
+                       afs02.rz.uni-jena.de = {
+                               address = 141.35.2.182
+                       }
+               }
+       }
+       # rrz.uni-koeln.de imported from SRV
+       rrz.uni-koeln.de = {
+               description = "University of Cologne - Reg Comp Center"
+               use_dns = yes
+               servers = {
+                       afsdb1.rrz.uni-koeln.de = {
+                               address = 134.95.19.3
+                       }
+                       afsdb2.rrz.uni-koeln.de = {
+                               address = 134.95.19.4
+                       }
+                       lyra.rrz.uni-koeln.de = {
+                               address = 134.95.19.10
+                       }
+                       afs.thp.uni-koeln.de = {
+                               address = 134.95.67.97
+                       }
+                       ladon.rrz.uni-koeln.de = {
+                               address = 134.95.112.8
+                       }
+               }
+       }
+       # mathematik.uni-stuttgart.de updated 8 Oct 2017 via udebug
+       mathematik.uni-stuttgart.de = {
+               description = "University of Stuttgart, Math Dept."
+               use_dns = yes
+               servers = {
+                       fbm01.mathematik.uni-stuttgart.de = {
+                               address = 129.69.61.1
+                       }
+                       fbm02.mathematik.uni-stuttgart.de = {
+                               address = 129.69.61.2
+                       }
+                       fbm03.mathematik.uni-stuttgart.de = {
+                               address = 129.69.61.3
+                       }
+               }
+       }
+       # stud.mathematik.uni-stuttgart.de updated 8 Oct 2017 via udebug
+       stud.mathematik.uni-stuttgart.de = {
+               description = "CIP-Pool of Math. Dept, University of Stuttgart"
+               use_dns = yes
+               servers = {
+                       omni.mathematik.uni-stuttgart.de = {
+                               address = 129.69.61.28
+                       }
+                       stud00.mathematik.uni-stuttgart.de = {
+                               address = 129.69.116.200
+                       }
+                       stud01.mathematik.uni-stuttgart.de = {
+                               address = 129.69.116.201
+                       }
+                       stud02.mathematik.uni-stuttgart.de = {
+                               address = 129.69.116.202
+                       }
+                       stud03.mathematik.uni-stuttgart.de = {
+                               address = 129.69.116.203
+                       }
+                       stud60.mathematik.uni-stuttgart.de = {
+                               address = 129.69.116.210
+                       }
+               }
+       }
+       # s-et.aau.dk imported from GCO Public CellServDB 01 Jan 2016
+       s-et.aau.dk = {
+               description = "Aalborg Univ., The Student Society, Denmark"
+               use_dns = yes
+               servers = {
+                       afs.s-et.aau.dk = {
+                               address = 130.225.196.22
+                       }
+               }
+       }
+       # ies.auc.dk imported from SRV
+       ies.auc.dk = {
+               description = "Aalborg Univ., Inst. of Electronic Systems, Denmark"
+               use_dns = yes
+               servers = {
+                       afsdb1.kom.auc.dk = {
+                               address = 130.225.51.73
+                       }
+                       afsdb2.kom.auc.dk = {
+                               address = 130.225.51.74
+                       }
+                       afsdb3.kom.auc.dk = {
+                               address = 130.225.51.85
+                       }
+               }
+       }
+       # asu.edu imported from SRV
+       asu.edu = {
+               description = "Arizona State University"
+               use_dns = yes
+               servers = {
+                       authen2.asu.edu = {
+                               address = 129.219.10.69
+                       }
+                       authen1.asu.edu = {
+                               address = 129.219.10.70
+                       }
+                       authen3.asu.edu = {
+                               address = 129.219.10.72
+                       }
+                       authen4.asu.edu = {
+                               address = 129.219.110.104
+                       }
+               }
+       }
+       # andrew.cmu.edu imported from SRV
+       andrew.cmu.edu = {
+               description = "Carnegie Mellon University - Computing Services Cell"
+               use_dns = yes
+               servers = {
+                       afsdb-02.andrew.cmu.edu = {
+                               address = 128.2.10.7
+                       }
+                       afsdb-03.andrew.cmu.edu = {
+                               address = 128.2.10.11
+                       }
+               }
+       }
+       # club.cc.cmu.edu imported from AFSDB
+       club.cc.cmu.edu = {
+               description = "Carnegie Mellon University Computer Club"
+               use_dns = yes
+               servers = {
+                       barium.club.cc.cmu.edu = {
+                               address = 128.2.204.149
+                       }
+                       sodium.club.cc.cmu.edu = {
+                               address = 128.237.157.11
+                       }
+                       potassium.club.cc.cmu.edu = {
+                               address = 128.237.157.13
+                       }
+               }
+       }
+       # cs.cmu.edu imported from AFSDB
+       cs.cmu.edu = {
+               description = "Carnegie Mellon University - School of Comp. Sci."
+               use_dns = yes
+               servers = {
+                       date.srv.cs.cmu.edu = {
+                               address = 128.2.172.58
+                       }
+                       fig.srv.cs.cmu.edu = {
+                               address = 128.2.172.60
+                       }
+                       watermelon.srv.cs.cmu.edu = {
+                               address = 128.2.200.97
+                       }
+               }
+       }
+       # ece.cmu.edu imported from AFSDB
+       ece.cmu.edu = {
+               description = "Carnegie Mellon University - Elec. Comp. Eng. Dept."
+               use_dns = yes
+               servers = {
+                       porok.ece.cmu.edu = {
+                               address = 128.2.129.7
+                       }
+                       vicio.ece.cmu.edu = {
+                               address = 128.2.129.8
+                       }
+                       e-xing.ece.cmu.edu = {
+                               address = 128.2.129.9
+                       }
+               }
+       }
+       # qatar.cmu.edu imported from AFSDB
+       qatar.cmu.edu = {
+               description = "Carnegie Mellon University - Qatar"
+               use_dns = yes
+               servers = {
+                       afs1.qatar.cmu.edu = {
+                               address = 86.36.46.6
+                       }
+                       afs2.qatar.cmu.edu = {
+                               address = 86.36.46.7
+                       }
+                       afsdb-03.qatar.cmu.edu = {
+                               address = 86.36.46.9
+                       }
+               }
+       }
+       # cnf.cornell.edu imported from AFDSB
+       cnf.cornell.edu = {
+               description = "CNF"
+               use_dns = yes
+               kerberos_realm = CIT.CORNELL.EDU
+               servers = {
+                       hole.cnf.cornell.edu = {
+                               address = 128.253.198.9
+                       }
+                       smoke.cnf.cornell.edu = {
+                               address = 128.253.198.27
+                       }
+                       mist.cnf.cornell.edu = {
+                               address = 128.253.198.231
+                       }
+               }
+       }
+       # math.cornell.edu imported from GCO Public CellServDB 01 Jan 2016
+       math.cornell.edu = {
+               description = "Cornell Math Dept"
+               use_dns = yes
+               servers = {
+                       pooh.math.cornell.edu = {
+                               address = 128.84.234.12
+                       }
+                       bernoulli.math.cornell.edu = {
+                               address = 128.84.234.16
+                       }
+                       dyno.math.cornell.edu = {
+                               address = 128.84.234.162
+                       }
+               }
+       }
+       # msc.cornell.edu imported from AFSDB
+       msc.cornell.edu = {
+               description = "Cornell University Materials Science Center"
+               use_dns = yes
+               servers = {
+                       miranda.ccmr.cornell.edu = {
+                               address = 128.84.231.242
+                       }
+                       co.ccmr.cornell.edu = {
+                               address = 128.84.241.35
+                       }
+                       dax.ccmr.cornell.edu = {
+                               address = 128.84.249.78
+                       }
+               }
+       }
+       # dbic.dartmouth.edu imported from SRV
+       dbic.dartmouth.edu = {
+               description = "Dartmouth Brain Imaging Center"
+               use_dns = yes
+               servers = {
+                       dbicafs1.dartmouth.edu = {
+                               address = 129.170.30.143
+                       }
+                       dbicafs2.dartmouth.edu = {
+                               address = 129.170.30.144
+                       }
+                       dbicafs3.dartmouth.edu = {
+                               address = 129.170.30.145
+                       }
+               }
+       }
+       # northstar.dartmouth.edu imported SRV
+       northstar.dartmouth.edu = {
+               description = "Dartmouth College Research Computing"
+               use_dns = yes
+               servers = {
+                       halley.dartmouth.edu = {
+                               address = 129.170.16.22
+                       }
+                       andromeda.dartmouth.edu = {
+                               address = 129.170.16.26
+                       }
+                       cygnusx1.dartmouth.edu = {
+                               address = 129.170.16.43
+                       }
+                       kuiper.dartmouth.edu = {
+                               address = 129.170.199.250
+                       }
+               }
+       }
+       # cs.hm.edu imported from GCO Public CellServDB 01 Jan 2016
+       cs.hm.edu = {
+               description = "Department Computer Science Munich University Of Applied Science"
+               use_dns = yes
+               servers = {
+                       afs1.cs.hm.edu = {
+                               address = 129.187.208.31
+                       }
+               }
+       }
+       # iastate.edu imported from GCO Public CellServDB 01 Jan 2016
+       iastate.edu = {
+               description = "Iowa State University"
+               use_dns = yes
+               servers = {
+                       afsdb-1.iastate.edu = {
+                               address = 129.186.1.243
+                       }
+                       afsdb-2.iastate.edu = {
+                               address = 129.186.6.243
+                       }
+                       afsdb-3.iastate.edu = {
+                               address = 129.186.142.243
+                       }
+               }
+       }
+       # athena.mit.edu imported from AFSDB
+       athena.mit.edu = {
+               description = "MIT/Athena cell"
+               use_dns = yes
+               kerberos_realm = ATHENA.MIT.EDU
+               servers = {
+                       leda.mit.edu = {
+                               address = 18.7.45.11
+                       }
+                       castor.mit.edu = {
+                               address = 18.9.48.11
+                       }
+                       pollux.mit.edu = {
+                               address = 18.9.48.12
+                       }
+               }
+       }
+       # csail.mit.edu imported from AFSDB
+       csail.mit.edu = {
+               description = "MIT Computer Science & Artificial Intelligence Lab"
+               use_dns = yes
+               servers = {
+                       titanic.csail.mit.edu = {
+                               address = 128.30.2.13
+                       }
+                       vasa.csail.mit.edu = {
+                               address = 128.30.2.31
+                       }
+                       maine.csail.mit.edu = {
+                               address = 128.30.2.75
+                       }
+               }
+       }
+       # lns.mit.edu imported from AFSDB
+       lns.mit.edu = {
+               description = "MIT/LNS Cell"
+               use_dns = yes
+               servers = {
+                       afs2.lns.mit.edu. = {
+                               address = 198.125.160.134
+                       }
+                       afsdbserv1.lns.mit.edu. = {
+                               address = 198.125.160.217
+                       }
+                       afsdbserv2.lns.mit.edu. = {
+                               address = 198.125.160.218
+                       }
+               }
+       }
+       # net.mit.edu imported from AFSDB
+       net.mit.edu = {
+               description = "MIT/Network Group cell"
+               use_dns = yes
+               kerberos_realm = ATHENA.MIT.EDU
+               servers = {
+                       willy.mit.edu = {
+                               address = 18.7.62.60
+                       }
+                       moby.mit.edu = {
+                               address = 18.9.48.15
+                       }
+                       springer.mit.edu = {
+                               address = 18.9.48.16
+                       }
+               }
+       }
+       # ops.mit.edu imported from AFSDB
+       ops.mit.edu = {
+               description = "MIT/Operations Group cell"
+               use_dns = yes
+               kerberos_realm = ATHENA.MIT.EDU
+               servers = {
+                       despair.mit.edu = {
+                               address = 18.9.68.42
+                       }
+                       heartbreak.mit.edu = {
+                               address = 18.9.68.41
+                       }
+                       bitterness.mit.edu = {
+                               address = 18.9.68.31
+                       }
+               }
+       }
+       # sipb.mit.edu imported from AFSDB
+       sipb.mit.edu = {
+               description = "MIT/SIPB cell"
+               use_dns = yes
+               kerberos_realm = ATHENA.MIT.EDU
+               servers = {
+                       reynelda.mit.edu = {
+                               address = 18.181.0.19
+                       }
+                       rosebud2.mit.edu = {
+                               address = 18.181.0.22
+                       }
+                       ronald-ann.mit.edu = {
+                               address = 18.181.0.23
+                       }
+               }
+       }
+       # zone.mit.edu imported from AFSDB
+       zone.mit.edu = {
+               description = "MIT/ZONE cell"
+               use_dns = yes
+               kerberos_realm = ATHENA.MIT.EDU
+               servers = {
+                       casio.mit.edu = {
+                               address = 18.1.41.29
+                       }
+                       timex.mit.edu = {
+                               address = 18.1.41.30
+                       }
+                       seiko.mit.edu = {
+                               address = 18.1.41.31
+                       }
+               }
+       }
+       # msu.edu imported from GCO Public CellServDB 01 Jan 2016
+       msu.edu = {
+               description = "Michigan State University Main Cell"
+               use_dns = yes
+               servers = {
+                       afsdb0.cl.msu.edu = {
+                               address = 35.9.7.10
+                       }
+               }
+       }
+       # crc.nd.edu imported from GCO Public CellServDB 01 Jan 2016
+       crc.nd.edu = {
+               description = "University of Notre Dame - Center for Research Computing"
+               use_dns = yes
+               servers = {
+                       afsdb1.crc.nd.edu = {
+                               address = 129.74.85.34
+                       }
+                       afsdb2.crc.nd.edu = {
+                               address = 129.74.85.35
+                       }
+                       afsdb3.crc.nd.edu = {
+                               address = 129.74.85.36
+                       }
+               }
+       }
+       # pitt.edu update 8 Oct 2017 via udebug
+       pitt.edu = {
+               description = "University of Pittsburgh"
+               use_dns = yes
+               servers = {
+                       afs-db-01.cssd.pitt.edu = {
+                               address = 136.142.8.15
+                       }
+                       afs-db-02.cssd.pitt.edu = {
+                               address = 136.142.8.20
+                       }
+                       afs-db-03.cssd.pitt.edu = {
+                               address = 136.142.8.21
+                       }
+               }
+       }
+       # cs.pitt.edu imported from SRV
+       cs.pitt.edu = {
+               description = "University of Pittsburgh - Computer Science"
+               use_dns = yes
+               servers = {
+                       afs01.cs.pitt.edu = {
+                               address = 136.142.22.5
+                       }
+                       afs02.cs.pitt.edu = {
+                               address = 136.142.22.6
+                       }
+                       afs03.cs.pitt.edu = {
+                               address = 136.142.22.7
+                       }
+               }
+       }
+       # psc.edu imported from SRV
+       psc.edu = {
+               description = "PSC (Pittsburgh Supercomputing Center)"
+               use_dns = yes
+               servers = {
+                       shaggy.psc.edu = {
+                               address = 128.182.59.182
+                       }
+                       velma.psc.edu = {
+                               address = 128.182.66.184
+                       }
+                       daphne.psc.edu = {
+                               address = 128.182.66.185
+                       }
+               }
+       }
+       # rose-hulman.edu imported from GCO Public CellServDB 01 Jan 2016
+       rose-hulman.edu = {
+               description = "Rose-Hulman Institute of Technology"
+               use_dns = yes
+               servers = {
+                       afs1.rose-hulman.edu = {
+                               address = 137.112.7.11
+                       }
+                       afs2.rose-hulman.edu = {
+                               address = 137.112.7.12
+                       }
+                       afs3.rose-hulman.edu = {
+                               address = 137.112.7.13
+                       }
+               }
+       }
+       # rpi.edu imported from AFSDB
+       rpi.edu = {
+               description = "Rensselaer Polytechnic Institute"
+               use_dns = yes
+               servers = {
+                       saul.server.rpi.edu = {
+                               address = 128.113.22.11
+                       }
+                       joab.server.rpi.edu = {
+                               address = 128.113.22.12
+                       }
+                       korah.server.rpi.edu = {
+                               address = 128.113.22.13
+                       }
+                       achan.server.rpi.edu = {
+                               address = 128.113.22.14
+                       }
+               }
+       }
+       # cs.stanford.edu imported from AFSDB
+       cs.stanford.edu = {
+               description = "Stanford University Computer Science Department"
+               use_dns = yes
+               servers = {
+                       cs-afs-1.Stanford.EDU = {
+                               address = 171.64.64.10
+                       }
+                       cs-afs-2.stanford.edu = {
+                               address = 171.64.64.66
+                       }
+                       cs-afs-3.stanford.edu = {
+                               address = 171.64.64.69
+                       }
+               }
+       }
+       # ir.stanford.edu imported from SRV
+       ir.stanford.edu = {
+               description = "Stanford University"
+               use_dns = yes
+               servers = {
+                       afsdb1.stanford.edu = {
+                               address = 171.64.7.222
+                       }
+                       afsdb2.stanford.edu = {
+                               address = 171.64.7.234
+                       }
+                       afsdb3.stanford.edu = {
+                               address = 171.64.7.246
+                       }
+               }
+       }
+       # slac.stanford.edu imported from AFSDB
+       slac.stanford.edu = {
+               description = "Stanford Linear Accelerator Center"
+               use_dns = yes
+               servers = {
+                       afsdb1.slac.stanford.edu = {
+                               address = 134.79.18.25
+                       }
+                       afsdb2.slac.stanford.edu = {
+                               address = 134.79.18.26
+                       }
+                       afsdb3.slac.stanford.edu = {
+                               address = 134.79.18.27
+                       }
+               }
+       }
+       # cats.ucsc.edu imported from SRV
+       cats.ucsc.edu = {
+               description = "University of California, Santa Cruz"
+               use_dns = yes
+               servers = {
+                       afs-prod-front-1.ucsc.edu = {
+                               address = 128.114.123.8
+                       }
+                       afs-prod-front-2.ucsc.edu = {
+                               address = 128.114.123.9
+                       }
+                       afs-prod-front-3.ucsc.edu = {
+                               address = 128.114.123.10
+                       }
+               }
+       }
+       # ncsa.uiuc.edu imported from SRV
+       ncsa.uiuc.edu = {
+               description = "National Center for Supercomputing Applications at Illinois"
+               use_dns = yes
+               servers = {
+                       nile-vm.ncsa.uiuc.edu = {
+                               address = 141.142.192.66
+                       }
+                       congo-vm.ncsa.uiuc.edu = {
+                               address = 141.142.192.143
+                       }
+                       kaskaskia-vm.ncsa.uiuc.edu = {
+                               address = 141.142.192.144
+                       }
+               }
+       }
+       # umbc.edu imported from AFSDB
+       umbc.edu = {
+               description = "University of Maryland, Baltimore County"
+               use_dns = yes
+               servers = {
+                       db2.afs.umbc.edu = {
+                               address = 130.85.24.23
+                       }
+                       db3.afs.umbc.edu = {
+                               address = 130.85.24.87
+                       }
+                       db1.afs.umbc.edu = {
+                               address = 130.85.24.101
+                       }
+               }
+       }
+       # glue.umd.edu imported from AFSDB
+       glue.umd.edu = {
+               description = "University of Maryland - Project Glue"
+               use_dns = yes
+               servers = {
+                       olmec.umd.edu = {
+                               address = 128.8.70.11
+                       }
+                       egypt.umd.edu = {
+                               address = 128.8.236.4
+                       }
+                       babylon.umd.edu = {
+                               address = 128.8.236.230
+                       }
+               }
+       }
+       # wam.umd.edu imported from AFSDB
+       wam.umd.edu = {
+               description = "University of Maryland Network WAM Project"
+               use_dns = yes
+               servers = {
+                       csc-srv.wam.umd.edu = {
+                               address = 128.8.70.9
+                       }
+                       avw-srv.wam.umd.edu = {
+                               address = 128.8.236.5
+                       }
+                       ptx-srv.wam.umd.edu = {
+                               address = 128.8.236.231
+                       }
+               }
+       }
+       # umich.edu imported from AFSDB
+       umich.edu = {
+               description = "University of Michigan - Campus"
+               use_dns = yes
+               servers = {
+                       fear.ifs.umich.edu = {
+                               address = 141.211.1.32
+                       }
+                       surprise.ifs.umich.edu = {
+                               address = 141.211.1.33
+                       }
+                       ruthless.ifs.umich.edu = {
+                               address = 141.211.1.34
+                       }
+               }
+       }
+       # atlas.umich.edu imported from GCO Public CellServDB 01 Jan 2016
+       atlas.umich.edu = {
+               description = "ATLAS group cell in physics at University of Michigan"
+               use_dns = yes
+               servers = {
+                       linat02.grid.umich.edu = {
+                               address = 141.211.43.102
+                       }
+                       linat03.grid.umich.edu = {
+                               address = 141.211.43.103
+                       }
+                       linat04.grid.umich.edu = {
+                               address = 141.211.43.104
+                       }
+               }
+       }
+       # citi.umich.edu imported from AFSDB
+       citi.umich.edu = {
+               description = "University of Michigan - Center for Information Technology Integ"
+               use_dns = yes
+               servers = {
+                       babylon.citi.umich.edu = {
+                               address = 141.212.112.5
+                       }
+               }
+       }
+       # cs.uwm.edu imported from GCO Public CellServDB 01 Jan 2016
+       cs.uwm.edu = {
+               description = "University of Wisconsin--Milwaukee"
+               use_dns = yes
+               servers = {
+                       solomons.cs.uwm.edu = {
+                               address = 129.89.38.124
+                       }
+                       filip.cs.uwm.edu = {
+                               address = 129.89.143.71
+                       }
+               }
+       }
+       # cs.wisc.edu imported from SRV
+       cs.wisc.edu = {
+               description = "Univ. of Wisconsin-Madison, Computer Sciences Dept."
+               use_dns = yes
+               servers = {
+                       vldba.cs.wisc.edu = {
+                               address = 128.105.9.18
+                       }
+                       vldbb.cs.wisc.edu = {
+                               address = 128.105.9.19
+                       }
+                       vldbc.cs.wisc.edu = {
+                               address = 128.105.9.20
+                       }
+                       timon.cs.wisc.edu = {
+                               address = 128.105.132.14
+                       }
+                       pumbaa.cs.wisc.edu = {
+                               address = 128.105.132.15
+                       }
+                       zazu.cs.wisc.edu = {
+                               address = 128.105.132.16
+                       }
+               }
+       }
+       # hep.wisc.edu imported from AFSDB
+       hep.wisc.edu = {
+               description = "University of Wisconsin -- High Energy Physics"
+               use_dns = yes
+               servers = {
+                       anise.hep.wisc.edu = {
+                               address = 128.104.28.219
+                       }
+                       rosemary.hep.wisc.edu = {
+                               address = 144.92.180.7
+                       }
+                       fennel.hep.wisc.edu = {
+                               address = 144.92.180.30
+                       }
+               }
+       }
+       # physics.wisc.edu imported from AFSDB
+       physics.wisc.edu = {
+               description = "Univ. of Wisconsin-Madison, Physics Department"
+               use_dns = yes
+               servers = {
+                       kendra.physics.wisc.edu = {
+                               address = 128.104.160.13
+                       }
+                       fray.physics.wisc.edu = {
+                               address = 128.104.160.14
+                       }
+                       buffy.physics.wisc.edu = {
+                               address = 128.104.160.15
+                       }
+               }
+       }
+       # ciemat.es updated 8 Oct 2017 via udebug
+       ciemat.es = {
+               description = "Ciemat, Madrid, Spain"
+               use_dns = yes
+               servers = {
+                       afsdb1.ciemat.es = {
+                               address = 192.101.165.10
+                       }
+                       afsdb2.ciemat.es = {
+                               address = 192.101.165.11
+                       }
+               }
+       }
+       # ific.uv.es imported from GCO Public CellServDB 01 Jan 2016
+       ific.uv.es = {
+               description = "Instituto de Fisica Corpuscular, Valencia, Spain"
+               use_dns = yes
+               servers = {
+                       alpha.ific.uv.es = {
+                               address = 147.156.163.11
+                       }
+               }
+       }
+       # alteholz.eu imported from GCO Public CellServDB 01 Jan 2016
+       alteholz.eu = {
+               description = "alteholz.eu"
+               use_dns = yes
+               servers = {
+                       krb1eu.afs.alteholz.net = {
+                               address = 78.47.192.125
+                       }
+               }
+       }
+       # in2p3.fr imported from GCO Public CellServDB 01 Jan 2016
+       in2p3.fr = {
+               description = "IN2P3"
+               use_dns = yes
+               servers = {
+                       ccafsdb01.in2p3.fr = {
+                               address = 134.158.104.11
+                       }
+                       ccafsdb02.in2p3.fr = {
+                               address = 134.158.104.12
+                       }
+                       ccafsdb03.in2p3.fr = {
+                               address = 134.158.104.13
+                       }
+               }
+       }
+       # mcc.ac.gb imported from GCO Public CellServDB 01 Jan 2016
+       mcc.ac.gb = {
+               description = "University of Manchester"
+               use_dns = yes
+               servers = {
+                       nevis.mc.man.ac.uk = {
+                               address = 130.88.203.41
+                       }
+                       eryri.mc.man.ac.uk = {
+                               address = 130.88.203.144
+                       }
+                       scafell.mc.man.ac.uk = {
+                               address = 130.88.203.145
+                       }
+               }
+       }
+       # rhic.bnl.gov imported from GCO Public CellServDB 01 Jan 2016
+       rhic.bnl.gov = {
+               description = "Relativistic Heavy Ion Collider"
+               use_dns = yes
+               servers = {
+                       rafs03.rcf.bnl.gov = {
+                               address = 130.199.6.51
+                       }
+                       rafs02.rcf.bnl.gov = {
+                               address = 130.199.6.52
+                       }
+                       rafs01.rcf.bnl.gov = {
+                               address = 130.199.6.69
+                       }
+               }
+       }
+       # usatlas.bnl.gov imported from AFSDB
+       usatlas.bnl.gov = {
+               description = "US Atlas Tier 1 Facility at BNL"
+               use_dns = yes
+               servers = {
+                       aafs01.usatlas.bnl.gov = {
+                               address = 130.199.48.32
+                       }
+                       aafs02.usatlas.bnl.gov = {
+                               address = 130.199.48.33
+                       }
+                       aafs03.usatlas.bnl.gov = {
+                               address = 130.199.48.34
+                       }
+               }
+       }
+       # jpl.nasa.gov imported from AFSDB
+       jpl.nasa.gov = {
+               description = "Jet Propulsion Laboratory"
+               use_dns = yes
+               servers = {
+                       afsdb08.jpl.nasa.gov = {
+                               address = 137.78.160.21
+                       }
+                       afsdb09.jpl.nasa.gov = {
+                               address = 137.78.160.22
+                       }
+                       afsdb10.jpl.nasa.gov = {
+                               address = 137.78.160.23
+                       }
+               }
+       }
+       # bme.hu imported from AFSDB
+       bme.hu = {
+               description = "Budapest University of Technology and Economics"
+               use_dns = yes
+               servers = {
+                       zero.eik.bme.hu = {
+                               address = 152.66.115.2
+                       }
+               }
+       }
+       # kfki.hu imported from AFSDB
+       kfki.hu = {
+               description = "Wigner Research Centre for Physics - Budapest, Hungary"
+               use_dns = yes
+               servers = {
+                       afs0.kfki.hu = {
+                               address = 148.6.2.109
+                       }
+               }
+       }
+       # rnd.ru.is imported from AFSDB
+       rnd.ru.is = {
+               description = "Reykjavik University Research and Development Network"
+               use_dns = yes
+               servers = {
+                       lithium.rnd.ru.is. = {
+                               address = 130.208.242.66
+                       }
+                       beryllium.rnd.ru.is. = {
+                               address = 130.208.242.67
+                       }
+                       boron.rnd.ru.is. = {
+                               address = 130.208.242.68
+                       }
+               }
+       }
+       # enea.it updated 8 Oct 2017 via udebug
+       enea.it = {
+               description = "ENEA New Tech. Energy & Environment Agency, Italy"
+               use_dns = yes
+               servers = {
+                       aixfs.frascati.enea.it = {
+                               address = 192.107.54.5
+                       }
+                       rs2ced.frascati.enea.it = {
+                               address = 192.107.54.11
+                       }
+                       43p.frascati.enea.it = {
+                               address = 192.107.54.12
+                       }
+                       afsdb.portici.enea.it = {
+                               address = 192.107.70.49
+                       }
+                       afsdb1.portici.enea.it = {
+                               address = 192.107.70.51
+                       }
+                       serverinfo02.bologna.enea.it = {
+                               address = 192.107.61.235
+                       }
+                       glauco.casaccia.enea.it = {
+                               address = 192.107.71.6
+                       }
+                       riscdb.trisaia.enea.it = {
+                               address = 192.107.96.233
+                       }
+               }
+       }
+       # fusione.it imported from GCO Public CellServDB 01 Jan 2016
+       fusione.it = {
+               description = "Assoz. FUSIONE/Euratom, ENEA, Frascati-Italy"
+               use_dns = yes
+               servers = {
+                       fusafs1.frascati.enea.it = {
+                               address = 192.107.90.2
+                       }
+                       fusafs2.frascati.enea.it = {
+                               address = 192.107.90.3
+                       }
+                       fusafs3.frascati.enea.it = {
+                               address = 192.107.90.4
+                       }
+               }
+       }
+       # ictp.it updated 8 Oct 2017 via udebug; AFSDB records are wrong
+       ictp.it = {
+               description = "The Abdus Salam International Centre for Theoretical Physics (IC"
+               use_dns = no
+               servers = {
+                       afsdb1.ictp.it = {
+                               address = 140.105.34.7
+                       }
+                       afsdb2.ictp.it = {
+                               address = 140.105.34.8
+                       }
+                       afsdb3.ictp.it = {
+                               address = 140.105.34.205
+                       }
+               }
+       }
+       # infn.it imported from GCO Public CellServDB 01 Jan 2016
+       infn.it = {
+               description = "Istituto Nazionale di Fisica Nucleare (INFN), Italia"
+               use_dns = yes
+               servers = {
+                       afscnaf.infn.it = {
+                               address = 131.154.1.7
+                       }
+                       afsrm1.roma1.infn.it = {
+                               address = 141.108.26.75
+                       }
+                       afsna.na.infn.it = {
+                               address = 192.84.134.75
+                       }
+               }
+       }
+       # ba.infn.it imported from GCO Public CellServDB 01 Jan 2016
+       ba.infn.it = {
+               description = "INFN, Sezione di Bari"
+               use_dns = yes
+               servers = {
+                       baafsserver.ba.infn.it = {
+                               address = 193.206.185.235
+                       }
+                       debsrv.ba.infn.it = {
+                               address = 193.206.185.236
+                       }
+               }
+       }
+       # kloe.infn.it imported from GCO Public CellServDB 01 Jan 2016
+       kloe.infn.it = {
+               description = "INFN, KLOE experiment at Laboratori di Frascati"
+               use_dns = yes
+               servers = {
+                       kloeafs1.lnf.infn.it = {
+                               address = 192.135.25.111
+                       }
+                       kloeafs2.lnf.infn.it = {
+                               address = 192.135.25.112
+                       }
+               }
+       }
+       # le.infn.it imported from GCO Public CellServDB 01 Jan 2016
+       le.infn.it = {
+               description = "INFN, Sezione di Lecce"
+               use_dns = yes
+               servers = {
+                       afs01.le.infn.it = {
+                               address = 192.84.152.40
+                       }
+                       afs02.le.infn.it = {
+                               address = 192.84.152.148
+                       }
+               }
+       }
+       # lnf.infn.it imported from AFSDB
+       lnf.infn.it = {
+               description = "INFN, Laboratori Nazionali di Frascati"
+               use_dns = yes
+               servers = {
+                       afs1.lnf.infn.it = {
+                               address = 193.206.84.121
+                       }
+                       afs2.lnf.infn.it = {
+                               address = 193.206.84.122
+                       }
+                       afs3.lnf.infn.it = {
+                               address = 193.206.84.123
+                       }
+               }
+       }
+       # lngs.infn.it imported from GCO Public CellServDB 01 Jan 2016
+       lngs.infn.it = {
+               description = "INFN, Laboratori Nazionali del Gran Sasso"
+               use_dns = yes
+               servers = {
+                       afs1.lngs.infn.it = {
+                               address = 192.84.135.21
+                       }
+                       afs2.lngs.infn.it = {
+                               address = 192.84.135.133
+                       }
+               }
+       }
+       # pi.infn.it imported from AFSDB
+       pi.infn.it = {
+               description = "INFN, Sezione di Pisa"
+               use_dns = yes
+               servers = {
+                       aix1.pi.infn.it = {
+                               address = 192.84.133.50
+                       }
+                       afs1.pi.infn.it = {
+                               address = 212.189.152.6
+                       }
+                       afs2.pi.infn.it = {
+                               address = 212.189.152.7
+                       }
+               }
+       }
+       # roma3.infn.it imported from GCO Public CellServDB 01 Jan 2016
+       roma3.infn.it = {
+               description = "Istituto Nazionale di Fisica Nucleare (INFN), Italia"
+               use_dns = yes
+               servers = {
+                       afsrm3.roma3.infn.it = {
+                               address = 193.205.159.17
+                       }
+               }
+       }
+       # psm.it imported from GCO Public CellServDB 01 Jan 2016
+       psm.it = {
+               description = "Progetto San Marco, Universita' di Roma-1"
+               use_dns = yes
+               servers = {
+                       atlante.psm.uniroma1.it = {
+                               address = 151.100.1.65
+                       }
+               }
+       }
+       # math.unifi.it imported from GCO Public CellServDB 01 Jan 2016
+       math.unifi.it = {
+               description = "math.unifi.it"
+               use_dns = yes
+               servers = {
+                       xeno.math.unifi.it = {
+                               address = 150.217.34.182
+                       }
+               }
+       }
+       # dia.uniroma3.it imported from AFSDB
+       dia.uniroma3.it = {
+               description = "University Roma Tre - DIA"
+               use_dns = yes
+               servers = {
+                       srv.dia.uniroma3.it = {
+                               address = 193.204.161.67
+                       }
+                       aux.dia.uniroma3.it = {
+                               address = 193.204.161.79
+                       }
+                       afs.dia.uniroma3.it = {
+                               address = 193.204.161.118
+                       }
+               }
+       }
+       # vn.uniroma3.it imported from GCO Public CellServDB 01 Jan 2016
+       vn.uniroma3.it = {
+               description = "University Roma Tre, area Vasca Navale"
+               use_dns = yes
+               servers = {
+                       alfa2.dia.uniroma3.it = {
+                               address = 193.205.219.59
+                       }
+                       beta2.dia.uniroma3.it = {
+                               address = 193.205.219.60
+                       }
+                       gamma2.dia.uniroma3.it = {
+                               address = 193.205.219.61
+                       }
+               }
+       }
+       # ictp.trieste.it imported from AFSDB
+       ictp.trieste.it = {
+               description = "Abdus Salam International Centre for Theoretical Physics"
+               use_dns = yes
+               servers = {
+                       fs2.ictp.trieste.it = {
+                               address = 140.105.16.9
+                       }
+               }
+       }
+       # cmf.nrl.navy.mil imported from AFSDB
+       cmf.nrl.navy.mil = {
+               description = "Naval Research Laboratory - Center for Computational Science"
+               use_dns = yes
+               servers = {
+                       picard.cmf.nrl.navy.mil = {
+                               address = 134.207.12.68
+                       }
+                       riker.cmf.nrl.navy.mil = {
+                               address = 134.207.12.69
+                       }
+                       kirk.cmf.nrl.navy.mil = {
+                               address = 134.207.12.70
+                       }
+               }
+       }
+       # lcp.nrl.navy.mil imported from GCO Public CellServDB 01 Jan 2016
+       lcp.nrl.navy.mil = {
+               description = "Naval Research Lab - Lab for Computational Physics"
+               use_dns = yes
+               servers = {
+                       afs1.lcp.nrl.navy.mil = {
+                               address = 132.250.114.2
+                       }
+                       afs2.lcp.nrl.navy.mil = {
+                               address = 132.250.114.4
+                       }
+                       afs3.lcp.nrl.navy.mil = {
+                               address = 132.250.114.6
+                       }
+               }
+       }
+       # crossproduct.net imported from SRV
+       crossproduct.net = {
+               description = "crossproduct.net"
+               use_dns = yes
+               servers = {
+                       prism.crossproduct.net = {
+                               address = 136.248.125.67
+                       }
+               }
+       }
+       # epitech.net imported from GCO Public CellServDB 01 Jan 2016
+       epitech.net = {
+               description = "EPITECH, France"
+               use_dns = yes
+               servers = {
+                       afs-db-1.epitech.net = {
+                               address = 163.5.255.41
+                       }
+                       afs-db-2.epitech.net = {
+                               address = 163.5.255.42
+                       }
+               }
+       }
+       # es.net imported from GCO Public CellServDB 01 Jan 2016
+       es.net = {
+               description = "Energy Sciences Net"
+               use_dns = yes
+               servers = {
+                       fs1.es.net = {
+                               address = 198.128.3.21
+                       }
+                       fs2.es.net = {
+                               address = 198.128.3.22
+                       }
+                       fs3.es.net = {
+                               address = 198.128.3.23
+                       }
+               }
+       }
+       # sinenomine.net imported from AFSDB
+       sinenomine.net = {
+               description = "Sine Nomine Associates"
+               use_dns = yes
+               servers = {
+                       afsdb5.sinenomine.net = {
+                               address = 207.89.43.110
+                       }
+                       afsdb3.sinenomine.net = {
+                               address = 207.89.43.108
+                       }
+                       afsdb4.sinenomine.net = {
+                               address = 207.89.43.109
+                       }
+               }
+       }
+       # slackers.net imported from AFSDB
+       slackers.net = {
+               description = "The Slackers' Network"
+               use_dns = yes
+               servers = {
+                       alexandria.slackers.net = {
+                               address = 199.4.150.159
+                       }
+               }
+       }
+       # tproa.net imported from SRV
+       tproa.net = {
+               description = "The People's Republic of Ames"
+               use_dns = yes
+               servers = {
+                       service-3.tproa.net = {
+                               address = 204.11.35.83
+                       }
+                       service-4.tproa.net = {
+                               address = 204.11.35.84
+                       }
+                       service-5.tproa.net = {
+                               address = 204.11.35.85
+                       }
+               }
+       }
+       # nikhef.nl imported from GCO Public CellServDB 01 Jan 2016
+       nikhef.nl = {
+               description = "The Dutch National Institute for High Energy Physics"
+               use_dns = yes
+               servers = {
+                       afs1.nikhef.nl = {
+                               address = 192.16.185.26
+                       }
+                       afs2.nikhef.nl = {
+                               address = 192.16.185.27
+                       }
+               }
+       }
+       # adrake.org imported from SRV
+       adrake.org = {
+               description = "adrake.org"
+               use_dns = yes
+               servers = {
+                       afs-vldb.adrake.org = {
+                               address = 128.2.98.241
+                       }
+               }
+       }
+       # coed.org imported from SRV
+       coed.org = {
+               description = "Adam Pennington's Cell"
+               use_dns = yes
+               servers = {
+                       vice1.coed.org = {
+                               address = 108.48.124.91
+                       }
+               }
+       }
+       # dementia.org imported from GCO Public CellServDB 01 Jan 2016
+       dementia.org = {
+               description = "Dementia Unlimited (old)"
+               use_dns = no
+               kerberos_realm = DEMENTIX.ORG
+               servers = {
+                       dedlock.dementix.org = {
+                               address = 128.2.13.209
+                       }
+                       vorkana.dementix.org = {
+                               address = 128.2.234.204
+                       }
+               }
+       }
+       # dementix.org imported from GCO Public CellServDB 01 Jan 2016
+       dementix.org = {
+               description = "Dementia Unlimited"
+               use_dns = yes
+               servers = {
+                       dedlock.dementix.org = {
+                               address = 128.2.13.209
+                       }
+                       vorkana.dementix.org = {
+                               address = 128.2.234.204
+                       }
+               }
+       }
+       # hpc2n.umu.se imported from SRV
+       hpc2n.umu.se = {
+               description = "High Performance Computing Center North - Ume<E5> University"
+               use_dns = yes
+               servers = {
+                       zenith.hpc2n.umu.se = {
+                               address = 130.239.45.214
+                       }
+                       blackjack.hpc2n.umu.se = {
+                               address = 130.239.45.220
+                       }
+                       mamba.hpc2n.umu.se = {
+                                address = 130.239.45.228
+                       }
+               }
+       }
+       # ltu.se imported from SRV
+       ltu.se = {
+               description = "Lule<E5> tekniska universitet"
+               use_dns = yes
+               servers = {
+                       afsdb2.its.ltu.se = {
+                               address = 130.240.42.223
+                       }
+                       afsdb3.its.ltu.se = {
+                               address = 130.240.42.222
+                       }
+                       afsdb1.its.ltu.se = {
+                               address = 130.240.42.224
+                       }
+               }
+       }
+       # pfriedma.org imported from DNS
+       pfriedma.org = {
+               description = "pfriedma.org"
+               use_dns = yes
+               servers = {
+                       vice.pfriedma.org = {
+                               address = 50.198.62.99
+                       }
+               }
+       }
+       # kth.se imported from AFSDB
+       kth.se = {
+               description = "Royal Institute of Technology, Stockholm, Sweden"
+               use_dns = yes
+               servers = {
+                       sonen.e.kth.se = {
+                               address = 130.237.32.145
+                       }
+                       anden.e.kth.se = {
+                               address = 130.237.48.7
+                       }
+                       fadern.e.kth.se = {
+                               address = 130.237.48.244
+                       }
+               }
+       }
+       # ict.kth.se imported from SRV
+       ict.kth.se = {
+               description = "Royal Institute of Technology, Information and Communication tec"
+               use_dns = yes
+               servers = {
+                       afsdb1.ict.kth.se = {
+                               address = 130.237.216.11
+                       }
+                       afsdb2.ict.kth.se = {
+                               address = 130.237.216.12
+                       }
+                       afsdb3.ict.kth.se = {
+                               address = 130.237.216.13
+                       }
+               }
+       }
+       # it.kth.se imported from SRV
+       it.kth.se = {
+               description = "Royal Institute of Technology, Teleinformatics, Kista"
+               use_dns = yes
+               servers = {
+                       afsdb1.it.kth.se = {
+                               address = 130.237.216.14
+                       }
+                       afsdb2.it.kth.se = {
+                               address = 130.237.216.15
+                       }
+                       afsdb3.it.kth.se = {
+                               address = 130.237.216.16
+                       }
+               }
+       }
+       # mech.kth.se imported from AFSDB
+       mech.kth.se = {
+               description = "Royal Institute of Technology, MECH"
+               use_dns = yes
+               servers = {
+                       matterhorn.mech.kth.se = {
+                               address = 130.237.233.142
+                       }
+                       castor.mech.kth.se = {
+                               address = 130.237.233.143
+                       }
+                       pollux.mech.kth.se = {
+                               address = 130.237.233.144
+                       }
+               }
+       }
+       # nada.kth.se imported from AFSDB
+       nada.kth.se = {
+               description = "Royal Institute of Technology, NADA"
+               use_dns = yes
+               servers = {
+                       afsdb-1.csc.kth.se = {
+                               address = 130.237.222.20
+                       }
+                       afsdb-2.csc.kth.se = {
+                               address = 130.237.223.12
+                       }
+                       afsdb-3.csc.kth.se = {
+                               address = 130.237.224.78
+                       }
+                       afsdb-4.csc.kth.se = {
+                               address = 130.237.227.23
+                       }
+                       afsdb-5.csc.kth.se = {
+                               address = 130.237.228.28
+                       }
+               }
+       }
+       # pdc.kth.se imported from AFSDB
+       pdc.kth.se = {
+               description = "Royal Institute of Technology, PDC"
+               use_dns = yes
+               servers = {
+                       crab.pdc.kth.se = {
+                               address = 130.237.232.29
+                       }
+                       anna.pdc.kth.se = {
+                               address = 130.237.232.112
+                       }
+                       hokkigai.pdc.kth.se = {
+                               address = 130.237.232.114
+                       }
+               }
+       }
+       # stacken.kth.se imported from AFSDB
+       stacken.kth.se = {
+               description = "Stacken Computer Club"
+               use_dns = yes
+               servers = {
+                       milko.stacken.kth.se = {
+                               address = 130.237.234.3
+                       }
+                       hot.stacken.kth.se = {
+                               address = 130.237.234.43
+                       }
+                       fishburger.stacken.kth.se = {
+                               address = 130.237.234.101
+                       }
+               }
+       }
+       # su.se imported from AFSDB
+       su.se = {
+               description = "Stockholm University"
+               use_dns = yes
+               servers = {
+                       afsdb1.su.se = {
+                               address = 130.237.162.81
+                       }
+                       afsdb2.su.se = {
+                               address = 130.237.162.82
+                       }
+                       afsdb3.su.se = {
+                               address = 130.237.162.230
+                       }
+               }
+       }
+       # f9.ijs.si updated 8 Oct 2017 via udebug
+       f9.ijs.si = {
+               description = "F9, Jozef Stefan Institue"
+               use_dns = yes
+               servers = {
+                       brenta.ijs.si = {
+                               address = 194.249.156.1
+                       }
+                       f9pc00.ijs.si = {
+                               address = 194.249.156.100
+                       }
+               }
+       }
+       # p-ng.si imported from SRV
+       p-ng.si = {
+               description = "University of Nova Gorica"
+               use_dns = yes
+               servers = {
+                       solkan.p-ng.si = {
+                               address = 193.2.120.2
+                       }
+                       sabotin.p-ng.si = {
+                               address = 193.2.120.9
+                       }
+               }
+       }
+       # ihep.su imported from AFSDB
+       ihep.su = {
+               description = "Institute for High-Energy Physics"
+               use_dns = yes
+               servers = {
+                       fs0001.ihep.su = {
+                               address = 194.190.165.201
+                       }
+                       fs0002.ihep.su = {
+                               address = 194.190.165.202
+                       }
+               }
+       }
+       # inf.ed.ac.uk imported from AFSDB
+       inf.ed.ac.uk = {
+               description = "School of Informatics, University of Edinburgh"
+               use_dns = yes
+               servers = {
+                       afsdb0.inf.ed.ac.uk = {
+                               address = 129.215.64.16
+                       }
+                       afsdb1.inf.ed.ac.uk = {
+                               address = 129.215.64.17
+                       }
+                       afsdb2.inf.ed.ac.uk = {
+                               address = 129.215.64.18
+                       }
+               }
+       }
+       # phas.gla.ac.uk imported from GCO Public CellServDB 01 Jan 2016
+       phas.gla.ac.uk = {
+               description = "Univeristy of Glasgow Physics And Astronomy"
+               use_dns = yes
+               servers = {
+                       afsdb1.phas.gla.ac.uk = {
+                               address = 194.36.1.19
+                       }
+                       afsdb3.phas.gla.ac.uk = {
+                               address = 194.36.1.27
+                       }
+                       afsdb2.phas.gla.ac.uk = {
+                               address = 194.36.1.33
+                       }
+               }
+       }
+       # hep.man.ac.uk imported from GCO Public CellServDB 01 Jan 2016
+       hep.man.ac.uk = {
+               description = "Manchester HEP"
+               use_dns = yes
+               servers = {
+                       afs1.hep.man.ac.uk = {
+                               address = 194.36.2.3
+                       }
+                       afs2.hep.man.ac.uk = {
+                               address = 194.36.2.4
+                       }
+                       afs3.hep.man.ac.uk = {
+                               address = 194.36.2.5
+                       }
+               }
+       }
+       # tlabs.ac.za imported from SRV
+       tlabs.ac.za = {
+               description = "iThemba LABS Cell"
+               use_dns = yes
+               servers = {
+                       afs01.tlabs.ac.za = {
+                               address = 196.24.232.1
+                       }
+                       afs02.tlabs.ac.za = {
+                               address = 196.24.232.2
+                       }
+                       afs03.tlabs.ac.za = {
+                               address = 196.24.232.3
+                       }
+               }
+       }
+       # your-file-system.com imported from SRV
+       your-file-system.com = {
+               description = "AuriStor, Inc. formerly Your File System, Inc."
+               use_dns = yes
+               servers = {
+                       bethlehem.auristor.com = {
+                               address = [2001:470:30:84:20c:29ff:fe2a:fcc]
+                               address = 204.29.154.37
+                       }
+                       faultline.auristor.com = {
+                               address = [2001:470:30:84:20c:29ff:fe19:de6f]
+                               address = 204.29.154.47
+                       }
+                       atwater-block.auristor.com = {
+                               address = [2001:470:1f07:f77:20c:29ff:fe3b:c525]
+                               address = 208.125.0.252
+                       }
+               }
+       }
+       # 1ts.org imported from AFSDB
+       1ts.org = {
+               description = "1TS.ORG cell"
+               use_dns = yes
+               servers = {
+                       vice0.1ts.org = {
+                               address = 136.248.125.132
+                       }
+               }
+       }
+       # mrow.org imported from AFSDB
+       mrow.org = {
+               description = "MROW.ORG cell"
+               use_dns = yes
+               servers = {
+                       openafs1.tinc.ad.mrow.org = {
+                               address = 44.44.69.195
+                       }
+                       hyperion.tinc.ad.mrow.org = {
+                               address = 44.44.82.1
+                       }
+                       washington.tinc.ad.mrow.org = {
+                               address = 44.44.69.97
+                       }
+               }
+       }
+       # thok.org imported from AFSDB
+       thok.org = {
+               description = "THOK.ORG cell"
+               use_dns = yes
+               servers = {
+                       curl-up-paw-over-nose.thok.org = {
+                               address = 172.110.60.210
+                       }
+               }
+       }
+       # openstack.org DNS SRV records available
+       openstack.org = {
+               description = "OpenStack Project"
+               use_dns = yes
+               servers = {
+                       afsdb02.openstack.org = {
+                               address = 23.253.200.228
+                       }
+                       afsdb01.openstack.org = {
+                               address = 104.130.136.20
+                       }
+               }
+       }
diff --git a/conf/etc.conf b/conf/etc.conf
new file mode 100644 (file)
index 0000000..11e144a
--- /dev/null
@@ -0,0 +1,6 @@
+#
+# This file stitches together the local kAFS cell database, which can be
+# placed in the cellservdb.d/ directory, with the generic database.
+#
+includedir /etc/kafs/cellservdb.d
+include /usr/share/kafs/cellservdb.conf
similarity index 100%
rename from aklog-kafs.1
rename to man/aklog-kafs.1
diff --git a/man/aklog.1 b/man/aklog.1
new file mode 100644 (file)
index 0000000..ba14405
--- /dev/null
@@ -0,0 +1 @@
+.so aklog-kafs.1
index ac7815e59dc7bd0a8c07fac37c463c35e1715bc6..66faa2c647e2a5dd25461fac96b9e86563fc43fc 100644 (file)
@@ -3,7 +3,7 @@
 Name:          kafs-client
 Version:       0.1
 Release:       1%{?dist}%{?buildid}
-Summary:       kAFS basic tools and /kafs dynamic root
+Summary:       The basic tools for kAFS and the /afs dynamic root
 License:       GPLv2+
 URL:           https://www.infradead.org/~dhowells/kafs/
 Source0:       https://www.infradead.org/~dhowells/kafs/kafs-client-%{version}.tar.bz2
@@ -11,9 +11,16 @@ Source0:     https://www.infradead.org/~dhowells/kafs/kafs-client-%{version}.tar.bz2
 BuildRequires: krb5-devel
 BuildRequires: keyutils-libs-devel
 BuildRequires: openssl-devel
-Requires: krb5-libs
-Requires: keyutils-libs
-Requires: openssl-libs
+
+#
+# Need this for the upcall program to do DNS lookups.  v1.5.11 can read the
+# kAFS config files:
+#      /etc/kafs/cellservdb.conf
+#
+%global confdir %{_sysconfdir}/kafs
+%global datadir %{_datarootdir}/kafs
+Requires: keyutils
+# >= 1.5.11
 
 BuildRequires: systemd-units
 Requires(post): systemd-units
@@ -21,12 +28,24 @@ Requires(preun): systemd-units
 Requires(postun): systemd-units
 Requires: selinux-policy-base >= 3.7.19-5
 
-%define _hardened_build 1
-
 %description
-Provide basic AFS-compatible tools for kAFS and mount the dynamic root
-on /kafs.
+Provide basic AFS-compatible tools for kAFS and systemd scripts to mount the
+dynamic root on /afs and preload the cell database.
+
+#
+# We generate a compatibility package that makes kafs look like OpenAFS, but it
+# needs to be uninstalled be able to install OpenAFS or Auristor.
+#
+%package compat
+Summary: AFS compatibility package, providing access through /afs
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description compat
+Compatibility package providing standard AFS names for tools and locations such
+as /afs and aklog.  This package must be uninstalled for kAFS to coexist with
+another AFS implementation (such as OpenAFS).
 
+%define _hardened_build 1
 %global docdir %{_docdir}/kafs-client
 
 %prep
@@ -34,39 +53,56 @@ on /kafs.
 
 %build
 make all \
-       ETCDIR=%{_sysconfdir} \
+       ETCDIR=%{etcdir} \
        BINDIR=%{_bindir} \
        MANDIR=%{_mandir} \
+       DATADIR=%{datadir} \
        CFLAGS="-Wall -Werror $RPM_OPT_FLAGS $RPM_LD_FLAGS $ARCH_OPT_FLAGS"
 
 %install
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_mandir}/man1
+mkdir -p %{buildroot}%{confdir}
+mkdir -p %{buildroot}%{datadir}
 
 make DESTDIR=%{buildroot} install \
-       ETCDIR=%{_sysconfdir} \
-       SBINDIR=%{_bindir} \
+       ETCDIR=%{confdir} \
+       DATADIR=%{datadir} \
+       SBINDIR=%{_sbindir} \
        MANDIR=%{_mandir} \
        CFLAGS="-Wall $RPM_OPT_FLAGS -Werror"
 
-install -m 644 kafs.mount %{buildroot}%{_unitdir}/kafs.mount
+%{__install} -m 644 conf/afs.mount %{buildroot}%{_unitdir}/afs.mount
+%{__install} -m 644 conf/etc.conf %{buildroot}%{confdir}/cellservdb.conf
+
+# Compat
+ln -s aklog-kafs %{buildroot}/%{_bindir}/aklog
 
 %post
-%systemd_post kafs.mount
+%systemd_post afs.mount
 
 %preun
-%systemd_preun kafs.mount
+%systemd_preun afs.mount
 
 %postun
-%systemd_postun_with_restart kafs.mount
+%systemd_postun_with_restart afs.mount
 
 %files
 %doc README
-/kafs
-%{_bindir}/*
+%license LICENCE.GPL
+/afs
+%{_bindir}/aklog-kafs
 %{_unitdir}/*
-%{_mandir}/*/*
+%{_mandir}/man1/aklog-kafs.1*
+%{confdir}
+%{datadir}
+%config(noreplace) %{confdir}/cellservdb.conf
+%config(noreplace) %{confdir}/cellservdb.d
+
+%files compat
+%{_bindir}/aklog
+%{_mandir}/man1/aklog.1*
 
 %changelog
 * Fri Feb 9 2018 David Howells <dhowells@redhat.com> 0.1-1
diff --git a/src/Makefile b/src/Makefile
new file mode 100644 (file)
index 0000000..1edabfa
--- /dev/null
@@ -0,0 +1,69 @@
+CFLAGS         = -g -O2 -Wall -Wsign-compare
+INSTALL                = install
+DESTDIR                =
+ETCDIR         = /etc/kafs
+BINDIR         = /usr/bin
+DATADIR                = /usr/share/kafs-client
+SPECFILE       = ../redhat/kafs-client.spec
+
+LNS            := ln -sf
+
+###############################################################################
+#
+# Determine the current package version from the specfile
+#
+###############################################################################
+VERSION                := $(word 2,$(shell grep "^Version:" $(SPECFILE)))
+CPPFLAGS       += -DVERSION="\"$(VERSION)\""
+
+###############################################################################
+#
+# Guess at the appropriate word size
+#
+###############################################################################
+BUILDFOR       := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit
+
+ifeq ($(BUILDFOR),32-bit)
+CFLAGS         += -m32
+else
+ifeq ($(BUILDFOR),64-bit)
+CFLAGS         += -m64
+endif
+endif
+
+###############################################################################
+#
+# Build stuff
+#
+###############################################################################
+all: aklog-kafs
+
+aklog-kafs: aklog-kafs.c Makefile
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< -lkrb5 -lcrypto -lkeyutils
+
+###############################################################################
+#
+# Install everything
+#
+###############################################################################
+install: all
+       $(INSTALL) -D -m 0755 aklog-kafs $(DESTDIR)$(BINDIR)/aklog-kafs
+
+###############################################################################
+#
+# Clean up
+#
+###############################################################################
+clean:
+       $(RM) aklog-kafs
+       $(RM) *.o *~
+
+distclean: clean
+
+###############################################################################
+#
+# Build debugging
+#
+###############################################################################
+show_vars:
+       @echo VERSION=$(VERSION)
similarity index 100%
rename from aklog-kafs.c
rename to src/aklog-kafs.c