The branch, master has been updated
via 71b49f5 s3:loadparm: fix an implicit cast warning in string
intialization in init_globals()
via cf50df5 s3:loadparm: add support for P_BYTES to lp_do_parameter() -
fix a build warning
via 5158fd1 s3:loadparm: add support for P_CMDLIST to lp_do_parameter -
fix a build warning
via 3c8e94b s3:loadparm: add support for P_CMDLIST to
lp_save_defaults() - fix build warning
via ebdec40 s3:loadparm: add support for P_BYTES to lp_save_defaults -
fix build warning
via ae0f667 s3:loadparm: add support for P_CMDLIST to is_default() -
fix build warning
via 8223eb7 s3:loadparm: add support for P_BYTES to is_default() - fix
build warning
via 8ecf51a s3:loadparm: add support for P_CMDLIST to print_parameter -
fix build warning.
via 81e4d1f s3:loadparm: add support for P_BYTES to print_parameter() -
fix build warning.
via 72f23c7 s3:loadparm: add support for P_CMDLIST to equal_parameter()
- fix build warning
via 641beeb s3:loadparm: add suppor for P_BYTES to equal_parameter() -
fix build warning
via 64afd5c s3:loadparm: szNetbiosAliases is now a const char ** - cast
properly
via cc897b1 s3:loadparm: szWinbindNssInfo is now a const char **
instead of a char ** - cast properly
via fc525c8 s3:loadparm: fix a check that was accidentially an
assignment in lp_servicebynum()
via 2568a8b s3:loadparm: untangle assignment from check in do_section()
from fb766cd s3-waf: fix a libcrypto configure check
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 71b49f5596f6d70001dbc5d569a7349a86081036
Author: Michael Adam <ob...@samba.org>
Date: Thu Jul 21 17:22:22 2011 +0200
s3:loadparm: fix an implicit cast warning in string intialization in
init_globals()
Autobuild-User: Michael Adam <ob...@samba.org>
Autobuild-Date: Thu Jul 21 18:39:15 CEST 2011 on sn-devel-104
commit cf50df5c6915395ceba1e78aa860ac26e6434aae
Author: Michael Adam <ob...@samba.org>
Date: Thu Jul 21 17:20:16 2011 +0200
s3:loadparm: add support for P_BYTES to lp_do_parameter() - fix a build
warning
(taken from s4 loadparm)
commit 5158fd1688cdf42fdf1f08b31e7231f06825b8ba
Author: Michael Adam <ob...@samba.org>
Date: Thu Jul 21 17:18:40 2011 +0200
s3:loadparm: add support for P_CMDLIST to lp_do_parameter - fix a build
warning
commit 3c8e94b6c432daa36245c3937bfbf0c9ced47ee5
Author: Michael Adam <ob...@samba.org>
Date: Thu Jul 21 17:15:31 2011 +0200
s3:loadparm: add support for P_CMDLIST to lp_save_defaults() - fix build
warning
commit ebdec404a4ad27c98334d4e2b1fd24a19dda45ed
Author: Michael Adam <ob...@samba.org>
Date: Thu Jul 21 17:14:56 2011 +0200
s3:loadparm: add support for P_BYTES to lp_save_defaults - fix build warning
commit ae0f66756a189207f5db4e8c28354b7735a47aa3
Author: Michael Adam <ob...@samba.org>
Date: Thu Jul 21 17:13:44 2011 +0200
s3:loadparm: add support for P_CMDLIST to is_default() - fix build warning
commit 8223eb7a27549a079dcf6d81009f8ec3f127b4c8
Author: Michael Adam <ob...@samba.org>
Date: Thu Jul 21 17:13:24 2011 +0200
s3:loadparm: add support for P_BYTES to is_default() - fix build warning
commit 8ecf51a553533e8f95e57236903553b3e81b06fc
Author: Michael Adam <ob...@samba.org>
Date: Thu Jul 21 17:11:44 2011 +0200
s3:loadparm: add support for P_CMDLIST to print_parameter - fix build
warning.
commit 81e4d1f63d1b14cd1c1265f1d1b571d47cc62ea6
Author: Michael Adam <ob...@samba.org>
Date: Thu Jul 21 17:05:46 2011 +0200
s3:loadparm: add support for P_BYTES to print_parameter() - fix build
warning.
commit 72f23c7ba30e18468e199aa943dc0a4bdf790136
Author: Michael Adam <ob...@samba.org>
Date: Thu Jul 21 17:04:16 2011 +0200
s3:loadparm: add support for P_CMDLIST to equal_parameter() - fix build
warning
commit 641beeb2a35c889f388c0125be44b63a10845ffc
Author: Michael Adam <ob...@samba.org>
Date: Thu Jul 21 17:03:58 2011 +0200
s3:loadparm: add suppor for P_BYTES to equal_parameter() - fix build warning
commit 64afd5c4865578622dc3915bce83640256ae51c5
Author: Michael Adam <ob...@samba.org>
Date: Thu Jul 21 17:02:14 2011 +0200
s3:loadparm: szNetbiosAliases is now a const char ** - cast properly
commit cc897b13ffa9ac5558cfa40c0eb473644e020bec
Author: Michael Adam <ob...@samba.org>
Date: Thu Jul 21 17:01:38 2011 +0200
s3:loadparm: szWinbindNssInfo is now a const char ** instead of a char ** -
cast properly
commit fc525c8a25fa2623eaae1b12281988e0aea1f220
Author: Michael Adam <ob...@samba.org>
Date: Thu Jul 21 14:10:50 2011 +0200
s3:loadparm: fix a check that was accidentially an assignment in
lp_servicebynum()
commit 2568a8b4635bb7fb76dbd4bdd5eb2decb09f708a
Author: Michael Adam <ob...@samba.org>
Date: Wed Jul 20 16:48:07 2011 +0200
s3:loadparm: untangle assignment from check in do_section()
-----------------------------------------------------------------------
Summary of changes:
source3/param/loadparm.c | 55 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 3b4ff6a..16eb719 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4706,7 +4706,7 @@ static void init_globals(bool reinit_globals)
if ((parm_table[i].type == P_STRING ||
parm_table[i].type == P_USTRING))
{
- string_set(lp_parm_ptr(NULL, &parm_table[i]), "");
+ string_set((char **)lp_parm_ptr(NULL, &parm_table[i]),
"");
}
}
@@ -4951,7 +4951,7 @@ static void init_globals(bool reinit_globals)
Globals.bWinbindTrustedDomainsOnly = false;
Globals.bWinbindNestedGroups = true;
Globals.winbind_expand_groups = 1;
- Globals.szWinbindNssInfo = str_list_make_v3(NULL, "template", NULL);
+ Globals.szWinbindNssInfo = (const char **)str_list_make_v3(NULL,
"template", NULL);
Globals.bWinbindRefreshTickets = false;
Globals.bWinbindOfflineLogon = false;
@@ -6421,7 +6421,7 @@ struct loadparm_service *lp_service(const char
*pszServiceName)
struct loadparm_service *lp_servicebynum(int snum)
{
- if (snum = -1 || !LP_SNUM_OK(snum)) {
+ if ((snum == -1) || !LP_SNUM_OK(snum)) {
return NULL;
}
return ServicePtrs[snum];
@@ -6970,8 +6970,8 @@ static bool handle_realm(struct loadparm_context *unused,
int snum, const char *
static bool handle_netbios_aliases(struct loadparm_context *unused, int snum,
const char *pszParmValue, char **ptr)
{
TALLOC_FREE(Globals.szNetbiosAliases);
- Globals.szNetbiosAliases = str_list_make_v3(NULL, pszParmValue, NULL);
- return set_netbios_aliases((const char **)Globals.szNetbiosAliases);
+ Globals.szNetbiosAliases = (const char **)str_list_make_v3(NULL,
pszParmValue, NULL);
+ return set_netbios_aliases(Globals.szNetbiosAliases);
}
/***************************************************************************
@@ -7391,7 +7391,23 @@ bool lp_do_parameter(int snum, const char *pszParmName,
const char *pszParmValue
}
break;
+ case P_BYTES:
+ {
+ uint64_t val;
+ if (conv_str_size_error(pszParmValue, &val)) {
+ if (val <= INT_MAX) {
+ *(int *)parm_ptr = (int)val;
+ break;
+ }
+ }
+
+ DEBUG(0,("lp_do_parameter(%s): value is not "
+ "a valid size specifier!\n", pszParmValue));
+ return false;
+ }
+
case P_LIST:
+ case P_CMDLIST:
TALLOC_FREE(*((char ***)parm_ptr));
*(char ***)parm_ptr = str_list_make_v3(
NULL, pszParmValue, NULL);
@@ -7526,6 +7542,8 @@ bool lp_set_option(const char *option)
static void print_parameter(struct parm_struct *p, void *ptr, FILE * f)
{
+ /* For the seperation of lists values that we print below */
+ const char *list_sep = ", ";
int i;
switch (p->type)
{
@@ -7548,6 +7566,7 @@ static void print_parameter(struct parm_struct *p, void
*ptr, FILE * f)
break;
case P_INTEGER:
+ case P_BYTES:
fprintf(f, "%d", *(int *)ptr);
break;
@@ -7562,15 +7581,23 @@ static void print_parameter(struct parm_struct *p, void
*ptr, FILE * f)
break;
}
+ case P_CMDLIST:
+ list_sep = " ";
+ /* fall through */
case P_LIST:
if ((char ***)ptr && *(char ***)ptr) {
char **list = *(char ***)ptr;
for (; *list; list++) {
/* surround strings with whitespace in
double quotes */
- if ( strchr_m( *list, ' ' ) )
- fprintf(f, "\"%s\"%s", *list,
((*(list+1))?", ":""));
- else
- fprintf(f, "%s%s", *list,
((*(list+1))?", ":""));
+ if (*(list+1) == NULL) {
+ /* last item, no extra
separator */
+ list_sep = "";
+ }
+ if ( strchr_m( *list, ' ' ) ) {
+ fprintf(f, "\"%s\"%s", *list,
list_sep);
+ } else {
+ fprintf(f, "%s%s", *list,
list_sep);
+ }
}
}
break;
@@ -7600,12 +7627,14 @@ static bool equal_parameter(parm_type type, void *ptr1,
void *ptr2)
case P_INTEGER:
case P_ENUM:
case P_OCTAL:
+ case P_BYTES:
return (*((int *)ptr1) == *((int *)ptr2));
case P_CHAR:
return (*((char *)ptr1) == *((char *)ptr2));
case P_LIST:
+ case P_CMDLIST:
return str_list_equal(*(const char ***)ptr1, *(const
char ***)ptr2);
case P_STRING:
@@ -7674,8 +7703,8 @@ static bool do_section(const char *pszSectionName, void
*userdata)
/* issued by the post-processing of a previous section. */
DEBUG(2, ("Processing section \"[%s]\"\n", pszSectionName));
- if ((iServiceIndex = add_a_service(&sDefault, pszSectionName))
- < 0) {
+ iServiceIndex = add_a_service(&sDefault, pszSectionName);
+ if (iServiceIndex < 0) {
DEBUG(0, ("Failed to add a new service\n"));
return (false);
}
@@ -7698,6 +7727,7 @@ static bool is_default(int i)
return false;
switch (parm_table[i].type) {
case P_LIST:
+ case P_CMDLIST:
return str_list_equal((const char
**)parm_table[i].def.lvalue,
*(const char
***)lp_parm_ptr(NULL,
&parm_table[i]));
@@ -7718,6 +7748,7 @@ static bool is_default(int i)
case P_INTEGER:
case P_OCTAL:
case P_ENUM:
+ case P_BYTES:
return parm_table[i].def.ivalue ==
*(int *)lp_parm_ptr(NULL,
&parm_table[i]);
@@ -8113,6 +8144,7 @@ static void lp_save_defaults(void)
continue;
switch (parm_table[i].type) {
case P_LIST:
+ case P_CMDLIST:
parm_table[i].def.lvalue = str_list_copy(
NULL, *(const char
***)lp_parm_ptr(NULL, &parm_table[i]));
break;
@@ -8132,6 +8164,7 @@ static void lp_save_defaults(void)
case P_INTEGER:
case P_OCTAL:
case P_ENUM:
+ case P_BYTES:
parm_table[i].def.ivalue =
*(int *)lp_parm_ptr(NULL,
&parm_table[i]);
break;
--
Samba Shared Repository
