Update acl/ldap defines

diff --git a/etc/afpd/afp_config.c b/etc/afpd/afp_config.c
index 198f03d80d40845844e185c66b76cb0591bcb07c..f62858fb2ee53c60d1b0ca07b730adc3c47a8ec7 100644 (file)
--- a/etc/afpd/afp_config.c
+++ b/etc/afpd/afp_config.c
@@ -48,7 +48,7 @@ char *strchr (), *strrchr ();
 #ifdef USE_SRVLOC
 #include <slp.h>
 #endif /* USE_SRVLOC */
-#ifdef HAVE_ACLS
+#ifdef HAVE_LDAP
 #include <atalk/ldapconfig.h>
 #endif
 
@@ -547,10 +547,10 @@ AFPConfig *configinit(struct afp_options *cmdline)
     struct afp_options options;
     AFPConfig *config=NULL, *first = NULL; 
 
-#ifdef HAVE_ACLS
+#ifdef HAVE_LDAP
     /* Parse afp_ldap.conf first so we can set the uuid option */
     acl_ldap_readconfig(_PATH_ACL_LDAPCONF);
-#endif /* HAVE_ACLS */
+#endif /* HAVE_LDAP */
 
     /* if config file doesn't exist, load defaults */
     if ((fp = fopen(cmdline->configfile, "r")) == NULL)

diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c
index 04f386bfa6a4ea4a23a1391f9fce0d905061891b..e91ee70aacd29f5a3e9df767fe970048ffd71663 100644 (file)
--- a/etc/afpd/directory.c
+++ b/etc/afpd/directory.c
@@ -2325,7 +2325,7 @@ int afp_mapid(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *r
             name = NULL;
         }
         break;
-#ifdef HAVE_ACLS
+
     case 5 : /* UUID -> username */
     case 6 : /* UUID -> groupname */
         if ((afp_version < 32) || !(obj->options.flags & OPTION_UUID ))
@@ -2367,7 +2367,7 @@ int afp_mapid(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *r
             return AFPERR_MISC;
         }
         break;
-#endif /* HAVE_ACLS */
+
     default :
         return( AFPERR_PARAM );
     }
@@ -2421,7 +2421,6 @@ int afp_mapname(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, siz
     case 4 :
         len = (unsigned char) *ibuf++;
         break;
-#ifdef HAVE_ACLS
     case 5 : /* username -> UUID  */
     case 6 : /* groupname -> UUID */
         if ((afp_version < 32) || !(obj->options.flags & OPTION_UUID ))
@@ -2430,7 +2429,6 @@ int afp_mapname(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, siz
         len = ntohs(ulen);
         ibuf += 2;
         break;
-#endif /* HAVE_ACLS */
     default :
         return( AFPERR_PARAM );
     }
@@ -2464,7 +2462,6 @@ int afp_mapname(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, siz
             memcpy( rbuf, &id, sizeof( id ));
             *rbuflen = sizeof( id );
             break;
-#ifdef HAVE_ACLS
         case 5 :        /* username -> UUID */
             LOG(log_debug, logtype_afpd, "afp_mapname: name: %s",ibuf);
             if (0 != getuuidfromname(ibuf, UUID_USER, rbuf))
@@ -2477,7 +2474,6 @@ int afp_mapname(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, siz
                 return AFPERR_NOITEM;
             *rbuflen = UUID_BINSIZE;
             break;
-#endif /* HAVE_ACLS */
         }
     }
     return( AFP_OK );

diff --git a/etc/afpd/switch.c b/etc/afpd/switch.c
index 54acae071e31285c52cc53d9ae243e02704f0d32..7dbd9ab77315f57eba5a8c4aa0d1c8bc0d360472 100644 (file)
--- a/etc/afpd/switch.c
+++ b/etc/afpd/switch.c
@@ -1,6 +1,4 @@
 /*
- * $Id: switch.c,v 1.19 2009-10-15 10:43:13 didg Exp $
- *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *

diff --git a/etc/afpd/unix.c b/etc/afpd/unix.c
index 44068ebca698610a20b753781cb2fb832926703a..18613868480cee56e7c9e138cf6316f16d9dcad9 100644 (file)
--- a/etc/afpd/unix.c
+++ b/etc/afpd/unix.c
@@ -1,6 +1,4 @@
 /*
- * $Id: unix.c,v 1.61 2010-02-10 14:05:37 franklahm Exp $
- *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  */