#include <stdio.h>
#include <stdlib.h>
-
-/* STDC check */
-#if STDC_HEADERS
#include <string.h>
-#else /* STDC_HEADERS */
-#ifndef HAVE_STRCHR
-#define strchr index
-#define strrchr index
-#endif /* HAVE_STRCHR */
-char *strchr (), *strrchr ();
-#ifndef HAVE_MEMCPY
-#define memcpy(d,s,n) bcopy ((s), (d), (n))
-#define memmove(d,s,n) bcopy ((s), (d), (n))
-#endif /* ! HAVE_MEMCPY */
-#endif /* STDC_HEADERS */
-
#include <ctype.h>
-#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
#include <sys/param.h>
#include <sys/socket.h>
#include <atalk/logger.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+
#ifdef HAVE_NETDB_H
#include <netdb.h>
#endif /* HAVE_NETDB_H */
+#ifdef ADMIN_GRP
+#include <grp.h>
+#include <sys/types.h>
+#endif /* ADMIN_GRP */
+
#include <atalk/paths.h>
#include <atalk/util.h>
+#include <atalk/compat.h>
+
#include "globals.h"
#include "status.h"
#include "auth.h"
#include "dircache.h"
-#include <atalk/compat.h>
-
-#ifdef ADMIN_GRP
-#include <grp.h>
-#include <sys/types.h>
-#endif /* ADMIN_GRP */
-
#ifndef MIN
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#endif /* MIN */
options->flags |= OPTION_NOSLP;
#endif
options->dircachesize = DEFAULT_MAX_DIRCACHE_SIZE;
+ options->flags |= OPTION_ACL2MACCESS;
+ options->flags |= OPTION_UUID;
}
/* parse an afpd.conf line. i'm doing it this way because it's
options->flags |= OPTION_CUSTOMICON;
if (strstr(buf, " -advertise_ssh"))
options->flags |= OPTION_ANNOUNCESSH;
- if (strstr(buf, " -acl2uarights"))
- options->flags |= OPTION_ACL2UARIGHTS;
+ if (strstr(buf, " -noacl2maccess"))
+ options->flags &= ~OPTION_ACL2MACCESS;
/* passwd bits */
if (strstr(buf, " -nosavepassword"))
#else
puts( "No" );
#endif
+
+ printf( " ACL support:\t" );
+#ifdef HAVE_ACLS
+ puts( "Yes" );
+#else
+ puts( "No" );
+#endif
+
+ printf( " EA support:\t" );
+ puts( EA_MODULES );
+
+ printf( " LDAP support:\t" );
+#ifdef HAVE_LDAP
+ puts( "Yes" );
+#else
+ puts( "No" );
+#endif
}
/*
static void show_paths( void )
{
printf( " afpd.conf:\t%s\n", _PATH_AFPDCONF );
- printf( " afp_signature.conf:\t%s\n", _PATH_AFPDSIGCONF );
printf( " AppleVolumes.system:\t%s\n", _PATH_AFPDSYSVOL );
printf( " AppleVolumes.default:\t%s\n", _PATH_AFPDDEFVOL );
+ printf( " afp_signature.conf:\t%s\n", _PATH_AFPDSIGCONF );
+ printf( " afp_voluuid.conf:\t%s\n", _PATH_AFPDUUIDCONF );
+#ifdef HAVE_LDAP
+ printf( " afp_ldap.conf:\t%s\n", _PATH_ACL_LDAPCONF );
+#else
+ printf( " afp_ldap.conf:\tnot supported\n");
+#endif
printf( " UAM search path:\t%s\n", _PATH_AFPDUAMPATH );
- printf( " Server messages path:\t%s\n", SERVERTEXT);
+ printf( " Server messages path:\t%s\n", SERVERTEXT);
+ printf( " lockfile:\t%s\n", _PATH_AFPDLOCK);
}
/*