[PATCH 2/2] testparm: Reformat text and add a newline.
Andreas Schneider
asn at samba.org
Mon Oct 21 04:45:40 MDT 2013
Signed-off-by: Andreas Schneider <asn at samba.org>
---
source3/utils/testparm.c | 160 +++++++++++++++++++++++++++++++----------------
1 file changed, 107 insertions(+), 53 deletions(-)
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index c494181..6bfb6ee 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -69,61 +69,68 @@ static int do_global_checks(void)
const char *socket_options;
if (lp_security() >= SEC_DOMAIN && !lp_encrypted_passwords()) {
- fprintf(stderr, "ERROR: in 'security=domain' mode the 'encrypt passwords' parameter must always be set to 'true'.\n");
+ fprintf(stderr, "ERROR: in 'security=domain' mode the "
+ "'encrypt passwords' parameter must always be "
+ "set to 'true'.\n\n");
ret = 1;
}
if (lp_we_are_a_wins_server() && lp_wins_server_list()) {
- fprintf(stderr, "ERROR: both 'wins support = true' and 'wins server = <server list>' \
-cannot be set in the smb.conf file. nmbd will abort with this setting.\n");
+ fprintf(stderr, "ERROR: both 'wins support = true' and "
+ "'wins server = <server list>' cannot be set in "
+ "the smb.conf file. nmbd will abort with this "
+ "setting.\n\n");
ret = 1;
}
if (strequal(lp_workgroup(), lp_netbios_name())) {
- fprintf(stderr, "WARNING: 'workgroup' and 'netbios name' " \
- "must differ.\n");
+ fprintf(stderr, "WARNING: 'workgroup' and 'netbios name' "
+ "must differ.\n\n");
ret = 1;
}
if (!directory_exist_stat(lp_lockdir(), &st)) {
- fprintf(stderr, "ERROR: lock directory %s does not exist\n",
+ fprintf(stderr, "ERROR: lock directory %s does not exist\n\n",
lp_lockdir());
ret = 1;
} else if ((st.st_ex_mode & 0777) != 0755) {
- fprintf(stderr, "WARNING: lock directory %s should have permissions 0755 for browsing to work\n",
+ fprintf(stderr, "WARNING: lock directory %s should have "
+ "permissions 0755 for browsing to work\n\n",
lp_lockdir());
ret = 1;
}
if (!directory_exist_stat(lp_statedir(), &st)) {
- fprintf(stderr, "ERROR: state directory %s does not exist\n",
+ fprintf(stderr, "ERROR: state directory %s does not exist\n\n",
lp_statedir());
ret = 1;
} else if ((st.st_ex_mode & 0777) != 0755) {
- fprintf(stderr, "WARNING: state directory %s should have permissions 0755 for browsing to work\n",
+ fprintf(stderr, "WARNING: state directory %s should have "
+ "permissions 0755 for browsing to work\n\n",
lp_statedir());
ret = 1;
}
if (!directory_exist_stat(lp_cachedir(), &st)) {
- fprintf(stderr, "ERROR: cache directory %s does not exist\n",
+ fprintf(stderr, "ERROR: cache directory %s does not exist\n\n",
lp_cachedir());
ret = 1;
} else if ((st.st_ex_mode & 0777) != 0755) {
- fprintf(stderr, "WARNING: cache directory %s should have permissions 0755 for browsing to work\n",
+ fprintf(stderr, "WARNING: cache directory %s should have "
+ "permissions 0755 for browsing to work\n\n",
lp_cachedir());
ret = 1;
}
if (!directory_exist_stat(lp_piddir(), &st)) {
- fprintf(stderr, "ERROR: pid directory %s does not exist\n",
+ fprintf(stderr, "ERROR: pid directory %s does not exist\n\n",
lp_piddir());
ret = 1;
}
if (lp_passdb_expand_explicit()) {
fprintf(stderr, "WARNING: passdb expand explicit = yes is "
- "deprecated\n");
+ "deprecated\n\n");
}
/*
@@ -165,8 +172,10 @@ cannot be set in the smb.conf file. nmbd will abort with this setting.\n");
else
sec_setting = "";
- fprintf(stderr, "ERROR: The setting 'security=%s' requires the 'password server' parameter be set\n"
- "to the default value * or a valid password server.\n", sec_setting );
+ fprintf(stderr, "ERROR: The setting 'security=%s' requires the "
+ "'password server' parameter be set to the "
+ "default value * or a valid password server.\n\n",
+ sec_setting );
ret = 1;
}
@@ -179,8 +188,12 @@ cannot be set in the smb.conf file. nmbd will abort with this setting.\n");
else
sec_setting = "";
- fprintf(stderr, "WARNING: The setting 'security=%s' should NOT be combined with the 'password server' parameter.\n"
- "(by default Samba will discover the correct DC to contact automatically).\n", sec_setting );
+ fprintf(stderr, "WARNING: The setting 'security=%s' should NOT "
+ "be combined with the 'password server' "
+ "parameter.\n"
+ "(by default Samba will discover the correct DC "
+ "to contact automatically).\n\n",
+ sec_setting );
}
/*
@@ -200,8 +213,10 @@ cannot be set in the smb.conf file. nmbd will abort with this setting.\n");
if((lp_passwd_program(talloc_tos()) == NULL) ||
(strlen(lp_passwd_program(talloc_tos())) == 0))
{
- fprintf( stderr, "ERROR: the 'unix password sync' parameter is set and there is no valid 'passwd program' \
-parameter.\n" );
+ fprintf(stderr,
+ "ERROR: the 'unix password sync' "
+ "parameter is set and there is no valid "
+ "'passwd program' parameter.\n\n");
ret = 1;
} else {
const char *passwd_prog;
@@ -214,8 +229,13 @@ parameter.\n" );
&p,
&truncated_prog, NULL);
if (truncated_prog && access(truncated_prog, F_OK) == -1) {
- fprintf(stderr, "ERROR: the 'unix password sync' parameter is set and the 'passwd program' (%s) \
-cannot be executed (error was %s).\n", truncated_prog, strerror(errno) );
+ fprintf(stderr,
+ "ERROR: the 'unix password sync' "
+ "parameter is set and the "
+ "'passwd program' (%s) cannot be "
+ "executed (error was %s).\n\n",
+ truncated_prog,
+ strerror(errno));
ret = 1;
}
}
@@ -225,8 +245,10 @@ cannot be executed (error was %s).\n", truncated_prog, strerror(errno) );
#endif
if(lp_passwd_chat(talloc_tos()) == NULL) {
- fprintf(stderr, "ERROR: the 'unix password sync' parameter is set and there is no valid 'passwd chat' \
-parameter.\n");
+ fprintf(stderr,
+ "ERROR: the 'unix password sync' parameter is "
+ "set and there is no valid 'passwd chat' "
+ "parameter.\n\n");
ret = 1;
}
@@ -235,7 +257,10 @@ parameter.\n");
{
/* check if there's a %u parameter present */
if(strstr_m(lp_passwd_program(talloc_tos()), "%u") == NULL) {
- fprintf(stderr, "ERROR: the 'passwd program' (%s) requires a '%%u' parameter.\n", lp_passwd_program(talloc_tos()));
+ fprintf(stderr,
+ "ERROR: the 'passwd program' (%s) "
+ "requires a '%%u' parameter.\n\n",
+ lp_passwd_program(talloc_tos()));
ret = 1;
}
}
@@ -247,48 +272,59 @@ parameter.\n");
if(lp_encrypted_passwords()) {
if(strstr_m( lp_passwd_chat(talloc_tos()), "%o")!=NULL) {
- fprintf(stderr, "ERROR: the 'passwd chat' script [%s] expects to use the old plaintext password \
-via the %%o substitution. With encrypted passwords this is not possible.\n", lp_passwd_chat(talloc_tos()) );
+ fprintf(stderr,
+ "ERROR: the 'passwd chat' script [%s] "
+ "expects to use the old plaintext "
+ "password via the %%o substitution. With "
+ "encrypted passwords this is not "
+ "possible.\n\n",
+ lp_passwd_chat(talloc_tos()) );
ret = 1;
}
}
}
if (strlen(lp_winbind_separator()) != 1) {
- fprintf(stderr,"ERROR: the 'winbind separator' parameter must be a single character.\n");
+ fprintf(stderr, "ERROR: the 'winbind separator' parameter must "
+ "be a single character.\n\n");
ret = 1;
}
if (*lp_winbind_separator() == '+') {
- fprintf(stderr,"'winbind separator = +' might cause problems with group membership.\n");
+ fprintf(stderr, "'winbind separator = +' might cause problems "
+ "with group membership.\n\n");
}
if (lp_algorithmic_rid_base() < BASE_RID) {
/* Try to prevent admin foot-shooting, we can't put algorithmic
rids below 1000, that's the 'well known RIDs' on NT */
- fprintf(stderr,"'algorithmic rid base' must be equal to or above %lu\n", BASE_RID);
+ fprintf(stderr, "'algorithmic rid base' must be equal to or "
+ "above %lu\n\n", BASE_RID);
}
if (lp_algorithmic_rid_base() & 1) {
- fprintf(stderr,"'algorithmic rid base' must be even.\n");
+ fprintf(stderr, "'algorithmic rid base' must be even.\n\n");
}
#ifndef HAVE_DLOPEN
if (lp_preload_modules()) {
- fprintf(stderr,"WARNING: 'preload modules = ' set while loading plugins not supported.\n");
+ fprintf(stderr, "WARNING: 'preload modules = ' set while loading "
+ "plugins not supported.\n\n");
}
#endif
if (!lp_passdb_backend()) {
- fprintf(stderr,"ERROR: passdb backend must have a value or be left out\n");
+ fprintf(stderr, "ERROR: passdb backend must have a value or be "
+ "left out\n\n");
}
if (lp_os_level() > 255) {
- fprintf(stderr,"WARNING: Maximum value for 'os level' is 255!\n");
+ fprintf(stderr, "WARNING: Maximum value for 'os level' is "
+ "255!\n\n");
}
if (strequal(lp_dos_charset(), "UTF8") || strequal(lp_dos_charset(), "UTF-8")) {
- fprintf(stderr, "ERROR: 'dos charset' must not be UTF8\n");
+ fprintf(stderr, "ERROR: 'dos charset' must not be UTF8\n\n");
ret = 1;
}
@@ -309,8 +345,12 @@ static void do_per_share_checks(int s)
char *hasstar = strchr_m(deny_list[i], '*');
char *hasquery = strchr_m(deny_list[i], '?');
if(hasstar || hasquery) {
- fprintf(stderr,"Invalid character %c in hosts deny list (%s) for service %s.\n",
- hasstar ? *hasstar : *hasquery, deny_list[i], lp_servicename(talloc_tos(), s) );
+ fprintf(stderr,
+ "Invalid character %c in hosts deny list "
+ "(%s) for service %s.\n\n",
+ hasstar ? *hasstar : *hasquery,
+ deny_list[i],
+ lp_servicename(talloc_tos(), s));
}
}
}
@@ -320,50 +360,64 @@ static void do_per_share_checks(int s)
char *hasstar = strchr_m(allow_list[i], '*');
char *hasquery = strchr_m(allow_list[i], '?');
if(hasstar || hasquery) {
- fprintf(stderr,"Invalid character %c in hosts allow list (%s) for service %s.\n",
- hasstar ? *hasstar : *hasquery, allow_list[i], lp_servicename(talloc_tos(), s) );
+ fprintf(stderr,
+ "Invalid character %c in hosts allow "
+ "list (%s) for service %s.\n\n",
+ hasstar ? *hasstar : *hasquery,
+ allow_list[i],
+ lp_servicename(talloc_tos(), s));
}
}
}
if(lp_level2_oplocks(s) && !lp_oplocks(s)) {
- fprintf(stderr,"Invalid combination of parameters for service %s. \
- Level II oplocks can only be set if oplocks are also set.\n",
- lp_servicename(talloc_tos(), s) );
+ fprintf(stderr, "Invalid combination of parameters for service "
+ "%s. Level II oplocks can only be set if oplocks "
+ "are also set.\n\n",
+ lp_servicename(talloc_tos(), 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(talloc_tos(), s));
+ fprintf(stderr,
+ "Invalid combination of parameters for service %s. Map "
+ "hidden can only work if create mask includes octal "
+ "01 (S_IXOTH).\n\n",
+ lp_servicename(talloc_tos(), 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 "
+ 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(talloc_tos(), s));
+ "excludes octal 01 (S_IXOTH).\n\n",
+ lp_servicename(talloc_tos(), 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 "
+ 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(talloc_tos(), s));
+ "octal 010 (S_IXGRP).\n\n",
+ lp_servicename(talloc_tos(), 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 "
+ 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(talloc_tos(), s));
+ "excludes octal 010 (S_IXGRP).\n\n",
+ lp_servicename(talloc_tos(), s));
}
if (lp_printing(s) == PRINT_CUPS && *(lp_printcommand(talloc_tos(), s)) != '\0') {
- fprintf(stderr,"Warning: Service %s defines a print command, but \
-rameter is ignored when using CUPS libraries.\n",
- lp_servicename(talloc_tos(), s) );
+ fprintf(stderr,
+ "Warning: Service %s defines a print command, but "
+ "parameter is ignored when using CUPS libraries.\n\n",
+ lp_servicename(talloc_tos(), s));
}
}
--
1.8.4
More information about the samba-technical
mailing list