remove obsolete ATACC ifdef

diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c
index f59cf693d8c1deaa7a06800ac1eb5719dddaf278..c5049a36f54857188f5f029b6c3caf450f15a1dd 100644 (file)
--- a/etc/afpd/directory.c
+++ b/etc/afpd/directory.c
@@ -1,5 +1,5 @@
 /*
- * $Id: directory.c,v 1.103 2009-09-11 09:14:16 franklahm Exp $
+ * $Id: directory.c,v 1.104 2009-09-14 00:02:21 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -132,18 +132,6 @@ u_int32_t  did;
 }
 
 /* ------------------- */
-#ifdef ATACC
-int path_isadir(struct path *o_path)
-{
-    return o_path->d_dir != NULL;
-#if 0
-    return o_path->m_name == '\0' || /* we are in a it */
-           !o_path->st_valid ||      /* in cache but we can't chdir in it */ 
-           (!o_path->st_errno && S_ISDIR(o_path->st.st_mode)); /* not in cache an can't chdir */
-#endif
-}
-#endif
-
 int get_afp_errno(const int param)
 {
     if (afp_errno != AFPERR_DID1)

diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h
index 1c7ef5e4ebad29edc4f9cdb7f223c07ce4feff5d..577401d4be7ca0f5bd56abd5f1c07d57884696f5 100644 (file)
--- a/etc/afpd/directory.h
+++ b/etc/afpd/directory.h
@@ -1,5 +1,5 @@
 /*
- * $Id: directory.h,v 1.26 2009-09-11 09:14:16 franklahm Exp $
+ * $Id: directory.h,v 1.27 2009-09-14 00:02:21 didg Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -71,7 +71,6 @@ struct path {
     struct stat st;
 };
 
-#ifndef ATACC
 static inline int path_isadir(struct path *o_path)
 {
     return o_path->d_dir != NULL;
@@ -81,9 +80,6 @@ static inline int path_isadir(struct path *o_path)
            (!o_path->st_errno && S_ISDIR(o_path->st.st_mode)); /* not in cache an can't chdir */
 #endif
 }
-#else
-extern int path_isadir(struct path *o_path);
-#endif
 
 #define DIRTREE_COLOR_RED    0
 #define DIRTREE_COLOR_BLACK  1

diff --git a/etc/afpd/uam.c b/etc/afpd/uam.c
index b5160cae4427e1f7fda0ec019c533db08d37ec79..4b275f188268240a0cd54c471a1de5ff4f1b2fd5 100644 (file)
--- a/etc/afpd/uam.c
+++ b/etc/afpd/uam.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uam.c,v 1.27 2008-05-16 04:19:42 didg Exp $
+ * $Id: uam.c,v 1.28 2009-09-14 00:02:21 didg Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved.  See COPYRIGHT.
@@ -147,7 +147,6 @@ void uam_unload(struct uam_mod *mod)
 }
 
 /* -- client-side uam functions -- */
-#ifndef ATACC
 /* set up stuff for this uam. */
 int uam_register(const int type, const char *path, const char *name, ...)
 {
@@ -211,69 +210,6 @@ int uam_register(const int type, const char *path, const char *name, ...)
 
     return ret;
 }
-#endif
-
-#ifdef ATACC
-int uam_register_fn(const int type, const char *path, const char *name, void *fn1, void *fn2, 
-                     void *fn3, void *fn4)
-{
-    va_list ap;
-    struct uam_obj *uam;
-
-    if (!name)
-        return -1;
-
-    /* see if it already exists. */
-    if ((uam = auth_uamfind(type, name, strlen(name)))) {
-        if (strcmp(uam->uam_path, path)) {
-            /* it exists, but it's not the same module. */
-            LOG(log_error, logtype_afpd, "uam_register: \"%s\" already loaded by %s",
-                name, path);
-            return -1;
-        }
-        uam->uam_count++;
-        return 0;
-    }
-
-    /* allocate space for uam */
-    if ((uam = calloc(1, sizeof(struct uam_obj))) == NULL)
-        return -1;
-
-    uam->uam_name = name;
-    uam->uam_path = strdup(path);
-    uam->uam_count++;
-
-    switch (type) {
-    case UAM_SERVER_LOGIN_EXT: /* expect four arguments */
-        uam->u.uam_login.login_ext = fn4;
-        uam->u.uam_login.login = fn1;
-        uam->u.uam_login.logincont = fn2;
-        uam->u.uam_login.logout = fn3;
-        break;
-    case UAM_SERVER_LOGIN: /* expect three arguments */
-        uam->u.uam_login.login_ext = NULL;
-        uam->u.uam_login.login = fn1;
-        uam->u.uam_login.logincont = fn2;
-        uam->u.uam_login.logout = fn3;
-        break;
-    case UAM_SERVER_CHANGEPW: /* one argument */
-        uam->u.uam_changepw = fn1;
-        break;
-    case UAM_SERVER_PRINTAUTH: /* x arguments */
-    default:
-        break;
-    }
-
-    /* attach to other uams */
-    if (auth_register(type, uam) < 0) {
-        free(uam->uam_path);
-        free(uam);
-        return -1;
-    }
-
-    return 0;
-}
-#endif
 
 void uam_unregister(const int type, const char *name)
 {

diff --git a/etc/cnid_dbd/cnid_metad.c b/etc/cnid_dbd/cnid_metad.c
index d0207cb8d64d77b38341a70112c24db34a3e8aca..fec81faa8b436f2ca75c868d9bf5b1ebec43e2ff 100644 (file)
--- a/etc/cnid_dbd/cnid_metad.c
+++ b/etc/cnid_dbd/cnid_metad.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_metad.c,v 1.13 2009-07-21 13:41:16 didg Exp $
+ * $Id: cnid_metad.c,v 1.14 2009-09-14 00:02:21 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -76,10 +76,6 @@
 #define WTERMSIG(status)      ((status) & 0x7f)
 #endif
 
-#ifdef ATACC
-#define fork aTaC_fork
-#endif
-
 /* functions for username and group */
 #include <pwd.h>
 #include <grp.h>

diff --git a/etc/uams/uams_gss.c b/etc/uams/uams_gss.c
index ae2cc3e330fe23b726f381080047abd6104420f8..cec9ab681c6665b3fa6b39bd45a5e5b515b9e751 100644 (file)
--- a/etc/uams/uams_gss.c
+++ b/etc/uams/uams_gss.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_gss.c,v 1.3 2005-04-28 20:49:50 bfernhomberg Exp $
+ * $Id: uams_gss.c,v 1.4 2009-09-14 00:02:21 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -12,7 +12,6 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#ifndef ATACC
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
@@ -622,4 +621,3 @@ UAM_MODULE_EXPORT struct uam_export uams_gss = {
   UAM_MODULE_VERSION,
   uam_setup, uam_cleanup
 };
-#endif

diff --git a/etc/uams/uams_guest.c b/etc/uams/uams_guest.c
index 42a2bc371ccc49807ce2ac87b44ad3ba89a36037..0b7f000bdca079b79d4e1530ac9f5002d6574d2c 100644 (file)
--- a/etc/uams/uams_guest.c
+++ b/etc/uams/uams_guest.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_guest.c,v 1.13 2005-04-28 20:49:50 bfernhomberg Exp $
+ * $Id: uams_guest.c,v 1.14 2009-09-14 00:02:21 didg Exp $
  *
  * (c) 2001 (see COPYING)
  */
@@ -8,7 +8,6 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#ifndef ATACC
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -161,4 +160,3 @@ UAM_MODULE_EXPORT struct uam_export uams_guest = {
   UAM_MODULE_VERSION,
   uam_setup, uam_cleanup
 };
-#endif

diff --git a/etc/uams/uams_pam.c b/etc/uams/uams_pam.c
index 0870968cb4f34e1dfe3c011b5c40722f5e5e8114..2600e7989331be8d9d31ebca54a40945691cb66b 100644 (file)
--- a/etc/uams/uams_pam.c
+++ b/etc/uams/uams_pam.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_pam.c,v 1.17 2005-04-28 20:49:50 bfernhomberg Exp $
+ * $Id: uams_pam.c,v 1.18 2009-09-14 00:02:21 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -10,7 +10,6 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#ifndef ATACC
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
@@ -495,4 +494,3 @@ UAM_MODULE_EXPORT struct uam_export uams_pam = {
   UAM_MODULE_VERSION,
   uam_setup, uam_cleanup
 };
-#endif

diff --git a/etc/uams/uams_passwd.c b/etc/uams/uams_passwd.c
index 2001cc710ca79c69f5083f665a95919698521a7a..5fcdce5661eaf95fa04160b75d6816bf90c50008 100644 (file)
--- a/etc/uams/uams_passwd.c
+++ b/etc/uams/uams_passwd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_passwd.c,v 1.24 2006-12-03 06:04:43 didg Exp $
+ * $Id: uams_passwd.c,v 1.25 2009-09-14 00:02:21 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -378,19 +378,6 @@ struct papfile     *out;
     return(0);
 }
 
-#ifdef ATACC
-int uam_setup(const char *path)
-{
-    if (uam_register_fn(UAM_SERVER_LOGIN_EXT, path, "Cleartxt Passwrd",
-                     passwd_login, NULL, NULL, passwd_login_ext) < 0)
-        return -1;
-    if (uam_register_fn(UAM_SERVER_PRINTAUTH, path, "ClearTxtUAM",
-                     passwd_printer) < 0)
-        return -1;
-
-    return 0;
-}
-#else 
 static int uam_setup(const char *path)
 {
     if (uam_register(UAM_SERVER_LOGIN_EXT, path, "Cleartxt Passwrd",
@@ -403,8 +390,6 @@ static int uam_setup(const char *path)
     return 0;
 }
 
-#endif
-
 static void uam_cleanup(void)
 {
     uam_unregister(UAM_SERVER_LOGIN, "Cleartxt Passwrd");

diff --git a/include/atalk/adouble.h b/include/atalk/adouble.h
index fb10fbad30da81a30eacd153d468ad9e4eef897b..d3bb66a165188d82d901b9a89ccf47897dd782e4 100644 (file)
--- a/include/atalk/adouble.h
+++ b/include/atalk/adouble.h
@@ -1,5 +1,5 @@
 /*
- * $Id: adouble.h,v 1.40 2009-09-01 14:28:07 franklahm Exp $
+ * $Id: adouble.h,v 1.41 2009-09-14 00:02:21 didg Exp $
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
@@ -493,7 +493,6 @@ extern int ad_metadata    __P((const char *, int, struct adouble *));
 /* build a resource fork mode from the data fork mode:
  * remove X mode and extend header to RW if R or W (W if R for locking),
  */ 
-#ifndef ATACC
 static inline mode_t ad_hf_mode (mode_t mode)
 {
     mode &= ~(S_IXUSR | S_IXGRP | S_IXOTH);
@@ -515,9 +514,6 @@ static inline mode_t ad_hf_mode (mode_t mode)
 
     return mode;
 }
-#else
-extern mode_t ad_hf_mode __P((mode_t ));
-#endif
 
 /* ad_read.c/ad_write.c */
 extern ssize_t ad_read __P((struct adouble *, const u_int32_t, 

diff --git a/libatalk/adouble/ad_open.c b/libatalk/adouble/ad_open.c
index da3bacf81258bc353c5f165c402b20f52fc10e05..4f62e95241836ca81e41bb813132f2ed545ba003 100644 (file)
--- a/libatalk/adouble/ad_open.c
+++ b/libatalk/adouble/ad_open.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ad_open.c,v 1.46 2009-09-11 13:26:05 franklahm Exp $
+ * $Id: ad_open.c,v 1.47 2009-09-14 00:02:21 didg Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -482,35 +482,6 @@ bail_err:
 }
 #endif /* AD_VERSION == AD_VERSION2 */
 
-/* --------------------------- */
-#ifdef ATACC
-mode_t ad_hf_mode (mode_t mode)
-{
-    /* we always need RW mode for file owner */
-#if 0
-    mode |= S_IRUSR;
-#endif
-    mode &= ~(S_IXUSR | S_IXGRP | S_IXOTH);
-    /* fnctl lock need write access */
-    if ((mode & S_IRUSR))
-        mode |= S_IWUSR;
-    if ((mode & S_IRGRP))
-        mode |= S_IWGRP;
-    if ((mode & S_IROTH))
-        mode |= S_IWOTH;
-    /* if write mode set add read mode */
-    if ((mode & S_IWUSR))
-        mode |= S_IRUSR;
-    if ((mode & S_IWGRP))
-        mode |= S_IRGRP;
-    if ((mode & S_IWOTH))
-        mode |= S_IROTH;
-
-    return mode;
-}
-
-#endif
-
 /* -------------------------------------
    read in the entries
 */

diff --git a/libatalk/dsi/dsi_tcp.c b/libatalk/dsi/dsi_tcp.c
index 9e7f93c5e42de311f666f0e7fa44141293edd0f1..7653c6f938e0a8f1acf24566c8bc19e751260a2e 100644 (file)
--- a/libatalk/dsi/dsi_tcp.c
+++ b/libatalk/dsi/dsi_tcp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dsi_tcp.c,v 1.13 2009-03-20 09:10:25 franklahm Exp $
+ * $Id: dsi_tcp.c,v 1.14 2009-09-14 00:02:21 didg Exp $
  *
  * Copyright (c) 1997, 1998 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
@@ -93,10 +93,6 @@ static void timeout_handler()
   exit(EXITERR_CLNT);
 }
 
-#ifdef ATACC
-#define fork aTaC_fork
-#endif
-
 static struct itimerval itimer;
 /* accept the socket and do a little sanity checking */
 static int dsi_tcp_open(DSI *dsi)

diff --git a/libatalk/util/server_lock.c b/libatalk/util/server_lock.c
index 90864efa138da5677e6099c4f71937c52a547d93..a08e30a2f199c5954839bfd82b36282792bdee22 100644 (file)
--- a/libatalk/util/server_lock.c
+++ b/libatalk/util/server_lock.c
@@ -26,9 +26,6 @@
 #include <atalk/compat.h>
 #include <atalk/util.h>
 
-#ifdef ATACC
-#define fork aTaC_fork
-#endif
 static struct itimerval itimer;
 
 /* this creates an open lock file which hangs around until the program