remove legacy stuff

diff --git a/config/.gitignore b/config/.gitignore
index 76bc5fa4ed85ce6df1c3e6e1e1f2645757c26e86..895a5e778b39b68094b7bf7771c67cf63c08dec9 100644 (file)
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -1,6 +1,4 @@
-AppleVolumes.default
 Makefile
 Makefile.in
-afpd.conf
 .gitignore
 *.o

diff --git a/contrib/shell_utils/.gitignore b/contrib/shell_utils/.gitignore
index c2af4d0e544e6c525088624bf689a6e12519089c..608cd04c73c5a4dac0ea80acc3c606d647595501 100644 (file)
--- a/contrib/shell_utils/.gitignore
+++ b/contrib/shell_utils/.gitignore
@@ -1,12 +1,5 @@
 Makefile
 Makefile.in
-apple_cleanup
-apple_cp
-apple_mv
-apple_rm
-cleanappledouble.pl
-netatalkshorternamelinks.pl
-lp2pap.sh
 asip-status.pl
 apple_dump
 .gitignore

diff --git a/contrib/shell_utils/Makefile.am b/contrib/shell_utils/Makefile.am
index 5e4aaa91abe17fedd8f559c67f94567a379e51de..bb4d9cbf0637381a924e0a0d2f41b8364381ce72 100644 (file)
--- a/contrib/shell_utils/Makefile.am
+++ b/contrib/shell_utils/Makefile.am
@@ -2,8 +2,8 @@
 
 pkgconfdir = @PKGCONFDIR@
 
-GENERATED_FILES = lp2pap.sh
-TEMPLATE_FILES = lp2pap.sh.tmpl
+GENERATED_FILES = 
+TEMPLATE_FILES = 
 PERLSCRIPTS = \
        asip-status.pl \
        apple_dump

diff --git a/contrib/shell_utils/lp2pap.sh.tmpl b/contrib/shell_utils/lp2pap.sh.tmpl
deleted file mode 100755 (executable)
index fea0cf4..0000000
--- a/contrib/shell_utils/lp2pap.sh.tmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# pap script for lp systems
-
-chdir "/etc/lp/printers/`basename $0`"
-
-if [ -r "$6" ]; then
-    :BINDIR:/pap -E "$6"
-    exit $?
-fi
-
-exit 2

diff --git a/etc/afpd/acls.h b/etc/afpd/acls.h
index 0913eb2e773a1e276233ee977bbf079d80c5b4cb..c48f03a9b4ab6da3b3e7e4c4950f8c7868617ac9 100644 (file)
--- a/etc/afpd/acls.h
+++ b/etc/afpd/acls.h
@@ -109,7 +109,7 @@ int afp_access (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rb
 int afp_getacl (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
 int afp_setacl (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
 
-/* Parse afp_ldap.conf */
+/* Parse afp.conf */
 extern int acl_ldap_readconfig(char *name);
 
 /* Misc funcs */

diff --git a/etc/afpd/dircache.c b/etc/afpd/dircache.c
index 05eaff01561a60d992dc98784ee545962f00e4d8..7cd08f6f4ec5182a356447306d5ddfa8baa4f173 100644 (file)
--- a/etc/afpd/dircache.c
+++ b/etc/afpd/dircache.c
@@ -557,7 +557,7 @@ void dircache_remove(const struct vol *vol _U_, struct dir *dir, int flags)
  * - a DID/name index on the main dircache
  * - a queue index on the dircache
  *
- * @param size   (r) requested maximum size from afpd.conf
+ * @param size   (r) requested maximum size from afp.conf
  *
  * @return 0 on success, -1 on error
  */

diff --git a/etc/afpd/main.c b/etc/afpd/main.c
index 733ab68b3815056cafc16eaa64dd4634bb56bc5b..b7c213e81e3f7b63e2797d01e3856ef151deaf7a 100644 (file)
--- a/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@ -324,7 +324,7 @@ int main(int ac, char **av)
         afp_exit(EXITERR_SYS);
     }
 
-    /* afpd.conf: not in config file: lockfile, connections, configfile
+    /* afp.conf:  not in config file: lockfile, configfile
      *            preference: command-line provides defaults.
      *                        config file over-writes defaults.
      *

diff --git a/etc/afpd/status.c b/etc/afpd/status.c
index 0f45ce4571ab7cf1cdc0c1cbb1af4582b1419313..1bc08862ce6e358708c5dc5ad74b63a4059b9244 100644 (file)
--- a/etc/afpd/status.c
+++ b/etc/afpd/status.c
@@ -497,7 +497,7 @@ void status_init(AFPObj *obj, DSI *dsi)
 /* If not found in conf file, genarate and append in conf file.       */
 /* If conf file don't exist, create and genarate.                     */
 /* If cannot open conf file, use one-time signature.                  */
-/* If -signature user:xxxxx, use it.                                  */
+/* If signature = user:xxxxx, use it.                                  */
 
 void set_signature(struct afp_options *options) {
     char *usersign;
@@ -637,7 +637,7 @@ server_signature_random:
         fprintf(fp, "# ServerSignature is unique identifier used to prevent logging on to\n");
         fprintf(fp, "# the same server twice.\n");
         fprintf(fp, "# \n");
-        fprintf(fp, "# If setting \"-signature user:xxxxx\" in afpd.conf, this file is not used.\n\n");
+        fprintf(fp, "# If setting \"signature = user:xxxxx\" in afp.conf, this file is not used.\n\n");
     }
     
     if (fp) {