The branch, master has been updated
via cd83c1d s3:testparm: avoid spurious warnings about dos mode mapping
and create mask if store dos attributes is set
from 749d022 s4 provision: Add some of the AD-specific DNS records to
the directory
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cd83c1d9582e3252b2c964d77aebf1d241d371a6
Author: Gregor Beck <gb...@sernet.de>
Date: Wed Jul 6 15:10:27 2011 +0200
s3:testparm: avoid spurious warnings about dos mode mapping and create mask
if store dos attributes is set
Autobuild-User: Volker Lendecke <vlen...@samba.org>
Autobuild-Date: Thu Jul 7 12:49:01 CEST 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/utils/testparm.c | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 966b61e..9b224d4 100644
--- 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') {
--
Samba Shared Repository
