sync 3.0 into HEAD for the last time

(This used to be commit c17a7dc9a190156a069da3e861c18fd3f81224ad)

1 files changed, 21 insertions, 0 deletions

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 16918ecd4a..0a87b4bc1e 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -287,6 +287,27 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
 					   Level II oplocks can only be set if oplocks are also set.\n",
 					   lp_servicename(s) );
 			}
+
+			if (lp_map_hidden(s) && !(lp_create_mask(s) & S_IXOTH)) {
+				printf("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)) {
+				printf("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)) {
+				printf("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)) {
+				printf("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) );
+			}
 		}
 	}