Merge master

diff --combined etc/afpd/afp_options.c
index 87817abd06e0774588032144af378f9395c6c4ba,407a594a769511d4aa39c9cbde24aba75b3c23a7..c966e464e8ccd2fbe0a716f619e3c76da9e6295d
--- 1/etc/afpd/afp_options.c
--- 2/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@@ -406,10 -406,8 +406,10 @@@ int afp_options_parseline(char *buf, st
  
      if ((c = getoption(buf, "-port")))
          options->port = strdup(c);
 +#ifndef NO_DDP
      if ((c = getoption(buf, "-ddpaddr")))
          atalk_aton(c, &options->ddpaddr);
 +#endif
      if ((c = getoption(buf, "-signature")) && (opt = strdup(c)))
          options->signatureopt = opt;
  
@@@ -623,11 -621,18 +623,18 @@@ static void show_version_extended(void 
  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);
  }
  
  /*