From 9a838f8cba643dc08a958174298d593fd1929caa Mon Sep 17 00:00:00 2001
From: srittau <srittau>
Date: Fri, 4 Oct 2002 15:15:05 +0000
Subject: [PATCH] Removed MTAB support.

---
 etc/afpd/catsearch.c |  6 +-----
 etc/afpd/enumerate.c | 12 +-----------
 etc/afpd/file.c      | 11 +----------
 etc/afpd/main.c      | 16 +---------------
 4 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/etc/afpd/catsearch.c b/etc/afpd/catsearch.c
index c292c040..6b9ef02d 100644
--- a/etc/afpd/catsearch.c
+++ b/etc/afpd/catsearch.c
@@ -50,7 +50,7 @@
 #include <atalk/adouble.h>
 #ifdef CNID_DB
 #include <atalk/cnid.h>
-#endif /* DID_MTAB */
+#endif /* CNID_DB */
 #include "desktop.h"
 #include "directory.h"
 #include "file.h"
@@ -59,10 +59,6 @@
 #include "filedir.h"
 #include "fork.h"
 
-#ifdef DID_MTAB
-#include "parse-mtab.h"
-#endif /* DID_MTAB */
-
 #ifdef WITH_CATSEARCH
 
 struct finderinfo {
diff --git a/etc/afpd/enumerate.c b/etc/afpd/enumerate.c
index 507720ba..938cac73 100644
--- a/etc/afpd/enumerate.c
+++ b/etc/afpd/enumerate.c
@@ -1,5 +1,5 @@
 /*
- * $Id: enumerate.c,v 1.21 2002-08-25 13:26:20 rlewczuk Exp $
+ * $Id: enumerate.c,v 1.22 2002-10-04 15:15:05 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -34,11 +34,6 @@
 #include "file.h"
 #include "filedir.h"
 
-/* check for mtab DID code */
-#ifdef DID_MTAB
-#include "parse_mtab.h"
-#endif /* DID_MTAB */
-
 #define min(a,b)	((a)<(b)?(a):(b))
 
 struct dir *
@@ -101,13 +96,8 @@ struct stat *st;
         cdir->d_did = htonl( vol->v_lastdid++ );
 #else /* USE_LASTDID */
         lstp = lstat(upath, &lst) < 0 ? st : &lst;
-#ifdef DID_MTAB
-        /* mtab way of doing DIDs */
-        cdir->d_did = htonl( afpd_st_cnid ( lstp ) );
-#else /* DID_MTAB */
         /* the old way of doing DIDs (default) */
         cdir->d_did = htonl( CNID(lstp, 0) );
-#endif /* DID_MTAB */
 #endif /* USE_LASTDID */
     }
 
diff --git a/etc/afpd/file.c b/etc/afpd/file.c
index b22593b0..239dfb1f 100644
--- a/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@ -1,5 +1,5 @@
 /*
- * $Id: file.c,v 1.60 2002-09-29 23:31:24 sibaz Exp $
+ * $Id: file.c,v 1.61 2002-10-04 15:15:05 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -59,11 +59,6 @@ char *strchr (), *strrchr ();
 #include "filedir.h"
 #include "globals.h"
 
-/* check for mtab DID code */
-#ifdef DID_MTAB
-#include "parse_mtab.h"
-#endif /* DID_MTAB */
-
 /* the format for the finderinfo fields (from IM: Toolbox Essentials):
  * field         bytes        subfield    bytes
  * 
@@ -263,11 +258,7 @@ int getmetadata(struct vol *vol,
                 aint = htonl(( st->st_dev << 16 ) | (st->st_ino & 0x0000ffff));
 #else /* USE_LASTDID */
                 lstp = lstat(upath, &lst) < 0 ? st : &lst;
-#ifdef DID_MTAB
-                aint = htonl( afpd_st_cnid ( lstp ) );
-#else /* DID_MTAB */
                 aint = htonl(CNID(lstp, 1));
-#endif /* DID_MTAB */
 #endif /* USE_LASTDID */
             }
 
diff --git a/etc/afpd/main.c b/etc/afpd/main.c
index 93dafe8f..91ad85e9 100644
--- a/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.19 2002-08-31 08:09:06 jmarcus Exp $
+ * $Id: main.c,v 1.20 2002-10-04 15:15:05 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -57,17 +57,8 @@ static int argc = 0;
 static char **argv = NULL;
 #endif /* TRU64 */
 
-#ifdef DID_MTAB
-#include "parse_mtab.h"
-#endif /* DID_MTAB */
-
 unsigned char	nologin = 0;
 
-#ifdef DID_MTAB
-/* global mount table; afpd_st_cnid uses this to lookup the right entry.  */
-static struct afpd_mount_table *afpd_mount_table = NULL;
-#endif /* DID_MTAB */
-
 struct afp_options default_options;
 static AFPConfig *configs;
 static server_child *server_children;
@@ -177,11 +168,6 @@ char	**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. */
-- 
2.39.2