]> arthur.barton.de Git - netatalk.git/commitdiff
Merge branch 2-1: Fix for uninitialized AFP signature. From HAT.
authorFrank Lahm <franklahm@googlemail.com>
Wed, 26 May 2010 08:32:37 +0000 (10:32 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Wed, 26 May 2010 08:32:37 +0000 (10:32 +0200)
1  2 
etc/afpd/afp_options.c
etc/afpd/globals.h

index 0761724f292760d73b7c14e1a785af8e869e32c9,ebc9a653e79e1ee890de1d051fd2cec6d7be4d73..c86c485900d5e38f8b55d054cbfc26f968768e5d
@@@ -449,16 -450,6 +452,9 @@@ int afp_options_parseline(char *buf, st
      if ((c = getoption(buf, "-ntseparator")) && (opt = strdup(c)))
         options->ntseparator = opt;
  
-     if ((c = getoption(buf, "-signature")) && (opt = strdup(c))) {
-         set_signature(opt, options);
-     }
-     else {
-         set_signature("auto", options);
-     }
 +    if ((c = getoption(buf, "-dircachesize")))
 +        options->dircachesize = atoi(c);
 +     
      return 1;
  }
  
Simple merge