Merge from branch-2-1: signature is not malloced, so don't free it

diff --combined etc/afpd/afp_options.c
index c86c485900d5e38f8b55d054cbfc26f968768e5d,057a1a32954164ef13330e27398273d27c65c9e9..1bc1ebe1265982cdb5ca3d6bc534eccc6f66b9b1
--- 1/etc/afpd/afp_options.c
--- 2/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@@ -47,7 -47,6 +47,7 @@@ char *strchr (), *strrchr ()
  #include "globals.h"
  #include "status.h"
  #include "auth.h"
 +#include "dircache.h"
  
  #include <atalk/compat.h>
  
@@@ -138,8 -137,6 +138,6 @@@ void afp_options_free(struct afp_option
          free(opt->passwdfile);
      if (opt->signatureopt && (opt->signatureopt != save->signatureopt))
        free(opt->signatureopt);
-     if (opt->signature && (opt->signature != save->signature))
-         free(opt->signature);
      if (opt->k5service && (opt->k5service != save->k5service))
        free(opt->k5service);
      if (opt->k5realm && (opt->k5realm != save->k5realm))
@@@ -197,7 -194,6 +195,7 @@@ void afp_options_init(struct afp_option
      /* don't advertize slp by default */
      options->flags |= OPTION_NOSLP;
  #endif
 +    options->dircachesize = DEFAULT_MAX_DIRCACHE_SIZE;
  }
  
  /* parse an afpd.conf line. i'm doing it this way because it's
@@@ -452,9 -448,6 +450,9 @@@ int afp_options_parseline(char *buf, st
      if ((c = getoption(buf, "-ntseparator")) && (opt = strdup(c)))
         options->ntseparator = opt;
  
 +    if ((c = getoption(buf, "-dircachesize")))
 +        options->dircachesize = atoi(c);
 +     
      return 1;
  }