small fix to load mtab table initially if supported to fix mtab DID support

diff --git a/ChangeLog b/ChangeLog
index 4f6474743bd8582e39dd9994c4b9cabedfe1a42c..34cb3035c3abc6a258a9fb5c4697842ffd2913f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-($Id: ChangeLog,v 1.44 2001-06-07 15:39:27 rufustfirefly Exp $)
+($Id: ChangeLog,v 1.45 2001-06-07 17:18:26 rufustfirefly Exp $)
 
 2001-06-07  jeff b  <jeff@univrel.pr.uconn.edu>
        * configure.in, bin/afppasswd/Makefile.am,
@@ -8,6 +8,17 @@
        man/man5/Makefile, man/man8/Makefile.am: patch #422872 from
        Sebastian Rittau to move from CONFIG_DIR to sysconfdir
 
+       * etc/psf/Makefile.am, sys/solaris/Makefile: additional removal
+       of CONFIG_DIR in favor of sysconfdir, plus patch #422860 from
+       Sebastian Rittau to correct other problems
+
+       * config/Makefile.am, config/netatalk.pamd: patch #422856 from
+       Sebastian Rittau, moving to pam_unix.so and being more proper
+
+       * etc/afpd/Makefile.am, etc/afpd/main.c: added support for
+       ${sysconfdir}/afpd.mtab to be read into memory, so that mtab
+       DID support actually works...
+
 2001-06-06  jeff b  <jeff@univrel.pr.uconn.edu>
        * etc/afpd/filedir.c, etc/afpd/unix.c: fixed dropkludge code
        so that it properly compiles again, along with minor warning

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 0bb90b415b57bb458c62ade33dad29d300da18bb..bd55000417610821f5ed5c29f33f2d32949552e6 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -30,4 +30,5 @@ CFLAGS = @CFLAGS@ \
         -D_PATH_AFPDCONF=\"$(sysconfdir)/afpd.conf\" \
         -D_PATH_AFPDUAMPATH=\"$(UAMS_PATH)/\" \
         -D_PATH_AFPDNLSPATH=\"$(sysconfdir)/nls/\" \
+        -DAFPD_MTAB_FILE=\"$(sysconfdir)/afpd.mtab\" \
         -DAPPLCNAME

diff --git a/etc/afpd/main.c b/etc/afpd/main.c
index b919386c4ace294d98eead98c01dc34c67ca4b7e..8442d2a7fbf33fd06e00324ff9a39d014cb97097 100644 (file)
--- a/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.7 2001-05-23 23:55:23 samnoble Exp $
+ * $Id: main.c,v 1.8 2001-06-07 17:18:26 rufustfirefly Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -50,6 +50,10 @@
 #include <sia.h>
 #endif /* TRU64 */
 
+#ifdef DID_MTAB
+#include "parse_mtab.h"
+#endif /* DID_MTAB */
+
 unsigned char  nologin = 0;
 
 struct afp_options default_options;
@@ -149,6 +153,11 @@ int main( ac, av )
       exit(0);
     }
 
+#ifdef DID_MTAB
+    /* if we are going to use afpd.mtab, load the file */
+    afpd_mount_table = afpd_mtab_parse ( AFPD_MTAB_FILE );
+#endif /* DID_MTAB */
+
     /* install child handler for asp and dsi. we do this before afp_goaway
      * as afp_goaway references stuff from here. 
      * XXX: this should really be setup after the initial connections. */