Forward-Ports from the stabilizing branch.

diff --git a/COPYING b/COPYING
new file mode 100644 (file)
index 0000000..d60c31a
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+                   GNU GENERAL PUBLIC LICENSE
+                      Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                           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
+           How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

diff --git a/Makefile.am b/Makefile.am
index bc1522a7843260aa820c985fc60dc76c37361fa2..b87d22839d2e838efd0cdfa56bd91ff9f34a2937 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,5 +2,5 @@
 
 SUBDIRS = libatalk bin config etc man contrib distrib include sys doc macros
 
-EXTRA_DIST = BUGS CHANGES CONTRIBUTORS COPYRIGHT ChangeLog \
+EXTRA_DIST = BUGS CHANGES CONTRIBUTORS COPYRIGHT COPYING ChangeLog \
        TODO VERSION services.atalk

diff --git a/config/Makefile.am b/config/Makefile.am
index c77ed56b5cea86731114dc68163a0c388c00e1c7..8082726722a1bbf7bfdd222c1ef236594c8a82c2 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -46,7 +46,7 @@ install-config-files: $(CONFFILES) $(GENFILES)
 
 if USE_PAM
 
-pamdir = $(sysconfdir)/pam.d
+pamdir = @PAMDIR@/etc/pam.d
 
 install-data-local: install-config-files $(PAMFILES)
        $(mkinstalldirs) $(DESTDIR)$(pamdir)

diff --git a/configure.in b/configure.in
index fb8940d1a8809941e4e78ff09fd50cbfb48eb30c..f94535c4cbb2282c96afceca0cb9c991e288b1cb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.131 2001-11-24 18:32:31 srittau Exp $
+dnl $Id: configure.in,v 1.132 2001-11-25 21:48:01 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -83,7 +83,7 @@ dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h limits.h stdint.h strings.h sys/fcntl.h sys/file.h sys/ioctl.h sys/time.h sys/mnttab.h sys/statvfs.h sys/stat.h sys/vfs.h mntent.h syslog.h unistd.h termios.h sys/termios.h netdb.h sgtty.h ufs/quota.h mount.h sys/mount.h statfs.h sys/types.h dlfcn.h errno.h sys/errno.h security/pam_appl.h)
+AC_CHECK_HEADERS(fcntl.h limits.h stdint.h strings.h sys/fcntl.h sys/file.h sys/ioctl.h sys/time.h sys/mnttab.h sys/statvfs.h sys/stat.h sys/vfs.h mntent.h syslog.h unistd.h termios.h sys/termios.h netdb.h sgtty.h ufs/quota.h mount.h sys/mount.h statfs.h sys/types.h dlfcn.h errno.h sys/errno.h)
 AC_CHECK_HEADER(sys/cdefs.h,,
        AC_MSG_RESULT([enabling generic cdefs.h from tree])
        CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
@@ -249,20 +249,26 @@ if test "x$db3_required" = "xyes"; then
        AC_PATH_DB3(, [AC_MSG_ERROR([Berkeley DB3 library not found!])])
 fi
 
+dnl Determine DID scheme
+AC_MSG_CHECKING([for DID scheme to use])
 AC_ARG_WITH(did,
        [  --with-did=SCHEME       set DID scheme (last,mtab)],
-       if test "x$withval" != "xno" ; then
-               if test "$withval" = "last"; then
-                       AC_DEFINE(USE_LASTDID, 1)
-                       AC_MSG_RESULT([enabling build without DID dev/inode mapping kludge])
-               fi
-               if test "$withval" = "mtab"; then
-                       AC_DEFINE(DID_MTAB, 1)
-                       AC_MSG_RESULT([enabling mtab-based DID creation support])
-               fi
-       fi
+       [ did_scheme="$withval" ],
+       [ did_scheme="last" ]
 )
 
+if test "x$did_scheme" = "xlast"; then
+       AC_DEFINE(USE_LASTDID, 1)
+       AC_MSG_RESULT([last])
+elif test "x$did_scheme" = "xmtab"; then
+       AC_DEFINE(DID_MTAB, 1)
+       AC_MSG_RESULT([mtab-based DID creation support])
+elif test "x$did_scheme" != "xno"; then
+       AC_MSG_RESULT([default])
+else
+       AC_MSG_ERROR([unknown DID scheme])
+fi
+
 msg_dir=""
 AC_ARG_WITH(message-dir,
        [  --with-message-dir=PATH path to message files [[PKGCONF/msg]]],
@@ -298,27 +304,13 @@ if test "x$srvloc" != "xno"; then
 fi
 
 # Check for PAM libs
-AC_MSG_CHECKING([if we should even bother with PAM])
-AC_ARG_WITH(pam,
-    [  --with-pam              enable PAM support],
-    [PAM_MSG="$withval"],
-    [PAM_MSG="yes"]
-)
-AC_MSG_RESULT($PAM_MSG)
-
-use_pam_so=no
-compile_pam=no
-if test "x$PAM_MSG" = "xyes"; then
-       if test "x$ac_cv_header_security_pam_appl_h" = "xyes" ; then
-               AC_CHECK_LIB(pam, pam_set_item, [
-                       PAPD_LIBS="$PAPD_LIBS -lpam"
-                       AFPD_LIBS="$AFPD_LIBS -lpam"
-                       use_pam_so=yes
-                       compile_pam=yes
-                       AC_DEFINE(USE_PAM)
-               ])
-       fi
-fi
+AC_PATH_PAM([
+       PAPD_LIBS="$PAPD_LIBS $PAM_LIBS"
+       AFPD_LIBS="$AFPD_LIBS $PAM_LIBS"
+       use_pam_so=yes
+       compile_pam=yes
+       AC_DEFINE(USE_PAM)
+])
 
 AC_MSG_CHECKING([whether shadow support should be enabled])
 AC_ARG_WITH(shadow,
@@ -450,6 +442,7 @@ case "$host_os" in
        *irix*)                         this_os=irix ;;
        *linux*)                        this_os=linux ;;
        *osx*)                          this_os=macosx ;;
+       *darwin*)                       this_os=macosx ;;
        *netbsd*)                       this_os=netbsd ;;
        *openbsd*)                      this_os=openbsd ;;
        *osf*)                          this_os=tru64 ;;
@@ -658,6 +651,7 @@ AM_CONDITIONAL(USE_PGP, test x$compile_pgp = xyes)
 AM_CONDITIONAL(USE_COBALT, test x$sysv_style = xcobalt)
 AM_CONDITIONAL(USE_REDHAT, test x$sysv_style = xredhat)
 AM_CONDITIONAL(USE_SUSE, test x$sysv_style = xsuse)
+AM_CONDITIONAL(USE_SHADOWPW, test x$shadowpw = xyes)
 AM_CONDITIONAL(USE_TRU64, test x$sysv_style = xtru64)
 
 dnl --------------------- generate files

diff --git a/distrib/initscripts/Makefile.am b/distrib/initscripts/Makefile.am
index beb5d1ab0c3061feb85742e154e671bca9d87cb0..2a46bf6ef795bbf8e9023a7010454e2f4ef5a5f1 100644 (file)
--- a/distrib/initscripts/Makefile.am
+++ b/distrib/initscripts/Makefile.am
@@ -47,7 +47,7 @@ endif
 
 if USE_SUSE
 
-sysvdir        = /etc/rc.d/
+sysvdir        = /etc/rc.d
 sysv_SCRIPTS = atalk
 
 atalk: rc.atalk.suse

diff --git a/doc/README.platforms b/doc/README.platforms
index bd3d6a5ea147ca706970c5fdcf1a0f96d5bae81c..d28d96ceb06ae7e335c8fa11f2d92d88b6852f3b 100644 (file)
--- a/doc/README.platforms
+++ b/doc/README.platforms
@@ -126,8 +126,8 @@ C. SOLARIS
     gcc.  It should also work with cc. At the present time only cc
     v5.0 and above can build the 64-bit kernel module.
 
-1a. SELECT KERNEL TYPE.  Edit sys/solaris/Makefile and set KCFLAGS to
-     include sparcv9 support if you run a 64-bit kernel, or leave it
+1a. SELECT KERNEL TYPE.  Edit sys/solaris/Makefile.kernel and set KCFLAGS
+     to include sparcv9 support if you run a 64-bit kernel, or leave it
      commented out for a 32-bit kernel. Only UltraSPARC systems
      running Solaris 7 and above support a 64-bit kernel. If you're
      not sure what kernel you use, run "isainfo -v". You're running a
@@ -149,7 +149,7 @@ C. SOLARIS
 3.  INSTALL DRIVER.  Since the STREAMS ddp driver must be installed as
     root, we've separated that portion of the build.  Type
 
-       make kinstall
+       make -f Makefile.kernel kinstall
 
     to install the driver.  This copies the driver and its config file
     into /usr/kernel/drv and /usr/kernel/strmod, runs "add_drv ddp" to
@@ -158,7 +158,8 @@ C. SOLARIS
     If you see something like
       devfsadm: driver failed to attach: ddp
       Warning: Driver (ddp) successfully added to system but failed to attach
-    then recheck sys/solaris/Makefile and/or try a different compiler.
+    then recheck sys/solaris/Makefile.kernel and/or try a different
+    compiler.
 
 4.  ATALKD.CONF.  Under Solaris, you must create atalkd.conf, since
     Solaris provides no method for determining the names of the

diff --git a/etc/afpd/nls/Makefile.am b/etc/afpd/nls/Makefile.am
index a3be37f3bb576d58cb5a6e889feb9db6fd6756b7..46d5c6f22bf7dc66a1d26835af6d0cddad50ec38 100644 (file)
--- a/etc/afpd/nls/Makefile.am
+++ b/etc/afpd/nls/Makefile.am
@@ -8,20 +8,26 @@ bin_PROGRAMS = makecode parsecode
 makecode_SOURCES = makecode.c
 parsecode_SOURCES = parsecode.c
 
+MACCODES = maccode.437 maccode.850 maccode.iso8859-1 maccode.iso8859-1.adapted
+
 CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys -I$(top_srcdir)/etc/afpd \
        @CFLAGS@
 
+$(MACCODES): makecode
+       ./makecode
+
 #
 # install/install-strip:
 #
 
-install-data-local: makecode
-       ./makecode; \
+install-data-local: $(MACCODES)
        mkdir -p $(DESTDIR)$(nlsdir); \
-       $(INSTALL_DATA) maccode.* $(DESTDIR)$(nlsdir)
+       for f in $(MACCODES); do \
+               $(INSTALL_DATA) $$f $(DESTDIR)$(nlsdir)/; \
+       done
 
 #
 # cleanup
 #
 
-CLEANFILES = maccode.*
+CLEANFILES = $(MACCODES)

diff --git a/libatalk/netddp/netddp_open.c b/libatalk/netddp/netddp_open.c
index 2cf9007fabb42b06acafda956c9a81bd9e3d8898..aedf75570f5eb7629c8d3183c4657f4564fb844e 100644 (file)
--- a/libatalk/netddp/netddp_open.c
+++ b/libatalk/netddp/netddp_open.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: netddp_open.c,v 1.3 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: netddp_open.c,v 1.4 2001-11-25 21:55:10 srittau Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -21,8 +21,8 @@ static int _netddp_open_dummy;
 #include <sys/socket.h>
 
 #ifdef MACOSX_SERVER
-#include <at/appletalk.h>
-#include <at/ddp.h>
+#include <netat/appletalk.h>
+#include <netat/ddp.h>
 #endif /* MACOSX_SERVER */
 
 #include <netatalk/at.h>

diff --git a/libatalk/netddp/netddp_recvfrom.c b/libatalk/netddp/netddp_recvfrom.c
index 4cc7b914e4a4873ae6b42d8fafd10f68c029171e..6ee199aa3b37137e2d469af0e6dcb7ce2d89e7af 100644 (file)
--- a/libatalk/netddp/netddp_recvfrom.c
+++ b/libatalk/netddp/netddp_recvfrom.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: netddp_recvfrom.c,v 1.3 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: netddp_recvfrom.c,v 1.4 2001-11-25 21:55:10 srittau Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -24,8 +24,8 @@ static int _netddp_recvfrom_dummy;
 #include <errno.h>
 
 #ifdef MACOSX_SERVER
-#include <at/appletalk.h>
-#include <at/ddp.h>
+#include <netat/appletalk.h>
+#include <netat/ddp.h>
 #endif /* MACOSX_SERVER */
 
 #include <netatalk/at.h>

diff --git a/libatalk/netddp/netddp_sendto.c b/libatalk/netddp/netddp_sendto.c
index a81cfc883991e2b5541ce17887e8de6b401ea188..e367fe0ce500c656e8e1fd007b8a20b775ac8273 100644 (file)
--- a/libatalk/netddp/netddp_sendto.c
+++ b/libatalk/netddp/netddp_sendto.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: netddp_sendto.c,v 1.3 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: netddp_sendto.c,v 1.4 2001-11-25 21:55:10 srittau Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -25,8 +25,8 @@ static int _netddp_sendto_dummy;
 #include <errno.h>
 
 #ifdef MACOSX_SERVER
-#include <at/appletalk.h>
-#include <at/ddp.h>
+#include <netat/appletalk.h>
+#include <netat/ddp.h>
 #endif /* MACOSX_SERVER */
 
 #include <netatalk/at.h>

diff --git a/macros/pam-check.m4 b/macros/pam-check.m4
new file mode 100644 (file)
index 0000000..4c7c1b9
--- /dev/null
+++ b/macros/pam-check.m4
@@ -0,0 +1,61 @@
+dnl $Id: pam-check.m4,v 1.2 2001-11-25 21:48:01 srittau Exp $
+dnl PAM finding macro
+
+AC_DEFUN([AC_PATH_PAM], [
+       AC_MSG_CHECKING([for PAM])
+       AC_ARG_WITH(pam, [  --with-pam=PATH         specify path to PAM installation],
+               [
+                       require_pam="yes"
+                       if test "x$withval" = "xno"; then
+                               PAMDIR="NONE"
+                               require_pam="never"
+                       elif test "x$withval" = "xyes"; then
+                               PAMDIR="NONE"
+                       else
+                               PAMDIR="$withval"
+                       fi
+               ],
+               [PAMDIR="NONE";require_pam="no"]
+       )
+
+       if test "x$PAMDIR" = "xNONE" -a "x$require_pam" != "xnever"; then
+               dnl Test for PAM
+               pam_paths="/ /usr /usr/local"
+               for path in $pam_paths; do
+                       if test -d "$path/etc/pam.d"; then
+                               PAMDIR="$path"
+                               break
+                       fi
+               done
+       fi
+
+       PAM_CFLAGS=""
+       PAM_LIBS=""
+
+       pam_found="no"
+       if test "x$PAMDIR" != "xNONE"; then
+               AC_MSG_RESULT([yes (path: $PAMDIR)])
+               AC_CHECK_HEADER([security/pam_appl.h],[
+                       AC_CHECK_LIB(pam, pam_set_item, [
+                               PAM_CFLAGS="-I$PAMDIR/include"
+                               PAM_LIBS="-L$PAMDIR/lib -lpam"
+                               pam_found="yes"
+                       ])
+               ])
+       else
+               AC_MSG_RESULT([no])
+       fi
+
+       if test "x$pam_found" = "xno"; then
+               if test "x$require_pam" = "xyes"; then
+                       AC_MSG_ERROR([PAM support missing])
+               fi
+               ifelse([$2], , :, [$2])
+       else
+               ifelse([$1], , :, [$1])
+       fi
+
+       AC_SUBST(PAMDIR)
+       AC_SUBST(PAM_CFLAGS)
+       AC_SUBST(PAM_LIBS)
+])

diff --git a/sys/netatalk/at.h b/sys/netatalk/at.h
index 541dcb18d492c2d0f0c6d5192f9be4abf80e09ad..3a38a7e70fd76af3eab5f8d3e5f589f4476bfacc 100644 (file)
--- a/sys/netatalk/at.h
+++ b/sys/netatalk/at.h
@@ -1,5 +1,5 @@
 /*
- * $Id: at.h,v 1.2 2001-06-29 14:14:47 rufustfirefly Exp $
+ * $Id: at.h,v 1.3 2001-11-25 21:55:10 srittau Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  *
@@ -9,7 +9,7 @@
 #ifndef __AT_HEADER__
 #define __AT_HEADER__
 
-#ifdef linux /* pull in the linux header */
+#if defined(linux) /* pull in the linux header */
 #include <sys/socket.h>
 #include <asm/types.h>
 #include <linux/atalk.h>
@@ -18,6 +18,10 @@
 #include <sys/types.h>
 #include <netinet/in.h> /* so that we can deal with sun's s_net #define */
 
+#ifdef MACOSX_SERVER
+#include <netat/appletalk.h>
+#endif /* MACOSX_SERVER */
+
 /*
  * Supported protocols
  */
@@ -51,6 +55,7 @@
 /*
  * AppleTalk address.
  */
+#ifndef MACOSX_SERVER
 struct at_addr {
 #ifdef s_net
 #undef s_net
@@ -58,6 +63,7 @@ struct at_addr {
     u_short    s_net;
     u_char     s_node;
 };
+#endif /* MACOSX_SERVER */
 
 #define ATADDR_ANYNET  (u_short)0x0000
 #define ATADDR_ANYNODE (u_char)0x00
@@ -71,6 +77,7 @@ struct at_addr {
  * interface.  IFACE may be filled in by the client, and is filled in
  * by the kernel.
  */
+#ifndef MACOSX_SERVER
 struct sockaddr_at {
 #ifdef BSD4_4
     u_char             sat_len;
@@ -99,6 +106,7 @@ struct sockaddr_at {
     char               sat_zero[ 8 ];
 #endif /* notdef */
 };
+#endif /* MACOSX_SERVER */
 
 struct netrange {
     u_char             nr_phase;