s3:testparm: avoid spurious warnings about dos mode mapping and create mask if store...

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Thu Jul  7 12:49:01 CEST 2011 on sn-devel-104

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 966b61e58e033adfebb1d310e2f70bcc973b8c72..9b224d4c1bb39fc0f68d8dc2e52ec41b17ce6f7d 100644 (file)
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -307,25 +307,33 @@ static void do_per_share_checks(int s)
                           lp_servicename(s) );
        }
 
-       if (lp_map_hidden(s) && !(lp_create_mask(s) & S_IXOTH)) {
-               fprintf(stderr,"Invalid combination of parameters for service %s. \
-                          Map hidden can only work if create mask includes octal 01 (S_IXOTH).\n",
-                          lp_servicename(s) );
-       }
-       if (lp_map_hidden(s) && (lp_force_create_mode(s) & S_IXOTH)) {
-               fprintf(stderr,"Invalid combination of parameters for service %s. \
-                          Map hidden can only work if force create mode excludes octal 01 (S_IXOTH).\n",
-                          lp_servicename(s) );
-       }
-       if (lp_map_system(s) && !(lp_create_mask(s) & S_IXGRP)) {
-               fprintf(stderr,"Invalid combination of parameters for service %s. \
-                          Map system can only work if create mask includes octal 010 (S_IXGRP).\n",
-                          lp_servicename(s) );
-       }
-       if (lp_map_system(s) && (lp_force_create_mode(s) & S_IXGRP)) {
-               fprintf(stderr,"Invalid combination of parameters for service %s. \
-                          Map system can only work if force create mode excludes octal 010 (S_IXGRP).\n",
-                          lp_servicename(s) );
+       if (!lp_store_dos_attributes(s) && lp_map_hidden(s)
+           && !(lp_create_mask(s) & S_IXOTH))
+       {
+               fprintf(stderr,"Invalid combination of parameters for service "
+                       "%s. Map hidden can only work if create mask includes "
+                       "octal 01 (S_IXOTH).\n", lp_servicename(s));
+       }
+       if (!lp_store_dos_attributes(s) && lp_map_hidden(s)
+           && (lp_force_create_mode(s) & S_IXOTH))
+       {
+               fprintf(stderr,"Invalid combination of parameters for service "
+                       "%s. Map hidden can only work if force create mode "
+                       "excludes octal 01 (S_IXOTH).\n", lp_servicename(s));
+       }
+       if (!lp_store_dos_attributes(s) && lp_map_system(s)
+           && !(lp_create_mask(s) & S_IXGRP))
+       {
+               fprintf(stderr,"Invalid combination of parameters for service "
+                       "%s. Map system can only work if create mask includes "
+                       "octal 010 (S_IXGRP).\n", lp_servicename(s));
+       }
+       if (!lp_store_dos_attributes(s) && lp_map_system(s)
+           && (lp_force_create_mode(s) & S_IXGRP))
+       {
+               fprintf(stderr,"Invalid combination of parameters for service "
+                       "%s. Map system can only work if force create mode "
+                       "excludes octal 010 (S_IXGRP).\n", lp_servicename(s));
        }
 #ifdef HAVE_CUPS
        if (lp_printing(s) == PRINT_CUPS && *(lp_printcommand(s)) != '\0') {