Missing semicolon and disabling of creatdir_inherit_acl

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index e8fe6c82234cc299edf5791b76502f26ef93b9c9..e20adc4096ebe1a33d57480cb7fc0d7a731ff5ca 100644 (file)
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -249,7 +249,7 @@ int afp_options_parseline(char *buf, struct afp_options *options)
     if (strstr(buf, " -noacl2maccess"))
         options->flags &= ~OPTION_ACL2MACCESS;
     if (strstr(buf, " -nouuid"))
-        options->flags &= ~OPTION_UUID
+        options->flags &= ~OPTION_UUID;
 
     /* passwd bits */
     if (strstr(buf, " -nosavepassword"))

diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c
index be6a3cad13ba05786c269d86058a651e5cd79199..562a4a99d260ffcc316d9a290336187925e1899e 100644 (file)
--- a/etc/afpd/directory.c
+++ b/etc/afpd/directory.c
@@ -2138,13 +2138,13 @@ int afp_createdir(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_
     ad_close_metadata( &ad);
 
 createdir_done:
-#ifdef HAVE_ACLS
+#if 0
     /* FIXME: are we really inside the created dir? */
     if (createdir_inherit_acl(vol) != 0) {
         LOG(log_error, logtype_afpd, "Error inhereting ACL to .AppleDouble directory");
         return AFPERR_MISC;
     }
-#endif /* HAVE_ACLS */
+#endif
 
     memcpy( rbuf, &dir->d_did, sizeof( u_int32_t ));
     *rbuflen = sizeof( u_int32_t );