The branch, master has been updated
via bd3e580 Revert "lib/util:tests/time.c - "test_timestring" - fix it
on Solaris"
via 619a49c lib/util/fault.c - fix "pid_t" printf warning on Solaris
via 2664a67 s4:torture/locktest.c - fix "pid_t" printf warning on
Solaris
via 3b7e2ee s4:torture/locktest.c - fix one indentation
via 0c8cf66 s4:client/client.c - fix Solaris warning by a type cast
via 93d85ca s4:fix some shadowed declaration warnings on Solaris by
renaming the symbols
from 5845cc9 s4-dns: return the correct TTL
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bd3e5804a41fdfc8a43bebd95c53e4f0ff1d7a10
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Mon Dec 6 11:28:22 2010 +0100
Revert "lib/util:tests/time.c - "test_timestring" - fix it on Solaris"
This reverts commit 654e0102ddb0acaaf45fb55c15818722235fcc9f.
This should better be handled by the replace library.
Autobuild-User: Matthias Dieter Wallnöfer <[email protected]>
Autobuild-Date: Mon Dec 6 12:17:31 CET 2010 on sn-devel-104
commit 619a49c4219282bf8776183e76c1b4f0629a6d4c
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Mon Dec 6 11:27:05 2010 +0100
lib/util/fault.c - fix "pid_t" printf warning on Solaris
According to "http://www.ibm.com/developerworks/linux/library/l-solar/";
it's generally a 32bit "int" - therefore this cast should fit.
commit 2664a67c86e817fec2392fa08698813a8800533d
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Mon Dec 6 11:24:55 2010 +0100
s4:torture/locktest.c - fix "pid_t" printf warning on Solaris
According to "http://www.ibm.com/developerworks/linux/library/l-solar/";
it's generally a 32bit "int" - therefore this cast should fit.
commit 3b7e2ee5e4b6e15ddd24f781d389b9dbe88dc887
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Mon Dec 6 11:24:12 2010 +0100
s4:torture/locktest.c - fix one indentation
commit 0c8cf666fc3cd35961e6bc2862b67527b922731a
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Mon Dec 6 11:23:30 2010 +0100
s4:client/client.c - fix Solaris warning by a type cast
commit 93d85ca5fd57d87e720ab627865f0e5af25e07b5
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Mon Dec 6 11:06:27 2010 +0100
s4:fix some shadowed declaration warnings on Solaris by renaming the symbols
-----------------------------------------------------------------------
Summary of changes:
lib/util/fault.c | 2 +-
lib/util/tests/time.c | 7 ++-----
libcli/security/access_check.h | 2 +-
source4/client/client.c | 2 +-
source4/dsdb/common/dsdb_access.c | 11 ++++++-----
source4/dsdb/samdb/ldb_modules/acl_util.c | 25 +++++++++++++++----------
source4/lib/ldb/common/ldb_dn.c | 4 ++--
source4/lib/ldb/include/ldb.h | 2 +-
source4/rpc_server/lsa/dcesrv_lsa.c | 2 +-
source4/torture/locktest.c | 4 ++--
10 files changed, 32 insertions(+), 29 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/fault.c b/lib/util/fault.c
index 11b31d7..bbb3190 100644
--- a/lib/util/fault.c
+++ b/lib/util/fault.c
@@ -125,7 +125,7 @@ _PUBLIC_ _NORETURN_ void smb_panic(const char *why)
char pidstr[20];
char cmdstring[200];
safe_strcpy(cmdstring, panic_action, sizeof(cmdstring));
- snprintf(pidstr, sizeof(pidstr), "%u", getpid());
+ snprintf(pidstr, sizeof(pidstr), "%d", (int) getpid());
all_string_sub(cmdstring, "%PID%", pidstr, sizeof(cmdstring));
if (progname) {
all_string_sub(cmdstring, "%PROG%", progname,
sizeof(cmdstring));
diff --git a/lib/util/tests/time.c b/lib/util/tests/time.c
index 8b0a0c3..78e8121 100644
--- a/lib/util/tests/time.c
+++ b/lib/util/tests/time.c
@@ -64,7 +64,7 @@ static bool test_http_timestring(struct torture_context *tctx)
static bool test_timestring(struct torture_context *tctx)
{
- const char *start = "Thu Jan 1", *start2 = "Thu Jan 01";
+ const char *start = "Thu Jan 1";
char *result;
/*
* Correct test for negative UTC offset. Without the correction, the
@@ -77,10 +77,7 @@ static bool test_timestring(struct torture_context *tctx)
time_t utc_offset = mktime(&local) - mktime(&gmt);
result = timestring(tctx, 42 - (utc_offset < 0 ? utc_offset : 0));
- torture_assert(tctx,
- (strncmp(start, result, strlen(start)) == 0) ||
- (strncmp(start2, result, strlen(start2)) == 0),
- result);
+ torture_assert(tctx, !strncmp(start, result, strlen(start)), result);
return true;
}
diff --git a/libcli/security/access_check.h b/libcli/security/access_check.h
index 700f981..c4923eb 100644
--- a/libcli/security/access_check.h
+++ b/libcli/security/access_check.h
@@ -75,4 +75,4 @@ struct object_tree *get_object_tree_by_GUID(struct
object_tree *root,
/* Change the granted access per each ACE */
void object_tree_modify_access(struct object_tree *root,
- uint32_t access);
+ uint32_t access_mask);
diff --git a/source4/client/client.c b/source4/client/client.c
index 93d6f34..c6c0088 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -2251,7 +2251,7 @@ static int cmd_chmod(struct smbclient_context *ctx, const
char **args)
if (NT_STATUS_IS_ERR(smbcli_unix_chmod(ctx->cli->tree, src, mode))) {
d_printf("%s chmod file %s 0%o\n",
- smbcli_errstr(ctx->cli->tree), src, (mode_t)mode);
+ smbcli_errstr(ctx->cli->tree), src, (unsigned)mode);
return 1;
}
diff --git a/source4/dsdb/common/dsdb_access.c
b/source4/dsdb/common/dsdb_access.c
index ebbe4f4..39e67b7 100644
--- a/source4/dsdb/common/dsdb_access.c
+++ b/source4/dsdb/common/dsdb_access.c
@@ -87,7 +87,7 @@ int dsdb_check_access_on_dn_internal(struct ldb_context *ldb,
TALLOC_CTX *mem_ctx,
struct security_token *token,
struct ldb_dn *dn,
- uint32_t access,
+ uint32_t access_mask,
const struct GUID *guid)
{
struct security_descriptor *sd = NULL;
@@ -108,12 +108,13 @@ int dsdb_check_access_on_dn_internal(struct ldb_context
*ldb,
}
sid = samdb_result_dom_sid(mem_ctx, acl_res->msgs[0], "objectSid");
if (guid) {
- if (!insert_in_object_tree(mem_ctx, guid, access, &root,
&new_node)) {
+ if (!insert_in_object_tree(mem_ctx, guid, access_mask, &root,
+ &new_node)) {
return ldb_operr(ldb);
}
}
status = sec_access_check_ds(sd, token,
- access,
+ access_mask,
&access_granted,
root,
sid);
@@ -137,7 +138,7 @@ int dsdb_check_access_on_dn(struct ldb_context *ldb,
TALLOC_CTX *mem_ctx,
struct ldb_dn *dn,
struct security_token *token,
- uint32_t access,
+ uint32_t access_mask,
const char *ext_right)
{
int ret;
@@ -163,7 +164,7 @@ int dsdb_check_access_on_dn(struct ldb_context *ldb,
mem_ctx,
token,
dn,
- access,
+ access_mask,
&guid);
}
diff --git a/source4/dsdb/samdb/ldb_modules/acl_util.c
b/source4/dsdb/samdb/ldb_modules/acl_util.c
index 1a84704..1fb8b9a 100644
--- a/source4/dsdb/samdb/ldb_modules/acl_util.c
+++ b/source4/dsdb/samdb/ldb_modules/acl_util.c
@@ -54,7 +54,7 @@ struct security_token *acl_user_token(struct ldb_module
*module)
int dsdb_module_check_access_on_dn(struct ldb_module *module,
TALLOC_CTX *mem_ctx,
struct ldb_dn *dn,
- uint32_t access,
+ uint32_t access_mask,
const struct GUID *guid)
{
int ret;
@@ -82,14 +82,14 @@ int dsdb_module_check_access_on_dn(struct ldb_module
*module,
mem_ctx,
session_info->security_token,
dn,
- access,
+ access_mask,
guid);
}
int dsdb_module_check_access_on_guid(struct ldb_module *module,
TALLOC_CTX *mem_ctx,
struct GUID *guid,
- uint32_t access,
+ uint32_t access_mask,
const struct GUID *oc_guid)
{
int ret;
@@ -119,7 +119,7 @@ int dsdb_module_check_access_on_guid(struct ldb_module
*module,
mem_ctx,
session_info->security_token,
acl_res->msgs[0]->dn,
- access,
+ access_mask,
oc_guid);
}
@@ -127,7 +127,7 @@ int acl_check_access_on_attribute(struct ldb_module *module,
TALLOC_CTX *mem_ctx,
struct security_descriptor *sd,
struct dom_sid *rp_sid,
- uint32_t access,
+ uint32_t access_mask,
const struct dsdb_attribute *attr)
{
int ret;
@@ -140,28 +140,33 @@ int acl_check_access_on_attribute(struct ldb_module
*module,
if (attr) {
if (!GUID_all_zero(&attr->attributeSecurityGUID)) {
if (!insert_in_object_tree(tmp_ctx,
-
&attr->attributeSecurityGUID, access,
- &root, &new_node)) {
+ &attr->attributeSecurityGUID,
+ access_mask, &root,
+ &new_node)) {
DEBUG(10, ("acl_search: cannot add to object
tree securityGUID\n"));
goto fail;
}
if (!insert_in_object_tree(tmp_ctx,
- &attr->schemaIDGUID, access,
&new_node, &new_node)) {
+ &attr->schemaIDGUID,
+ access_mask, &new_node,
+ &new_node)) {
DEBUG(10, ("acl_search: cannot add to object
tree attributeGUID\n"));
goto fail;
}
}
else {
if (!insert_in_object_tree(tmp_ctx,
- &attr->schemaIDGUID, access,
&root, &new_node)) {
+ &attr->schemaIDGUID,
+ access_mask, &root,
+ &new_node)) {
DEBUG(10, ("acl_search: cannot add to object
tree attributeGUID\n"));
goto fail;
}
}
}
status = sec_access_check_ds(sd, token,
- access,
+ access_mask,
&access_granted,
root,
rp_sid);
diff --git a/source4/lib/ldb/common/ldb_dn.c b/source4/lib/ldb/common/ldb_dn.c
index 9bf8658..1b714c9 100644
--- a/source4/lib/ldb/common/ldb_dn.c
+++ b/source4/lib/ldb/common/ldb_dn.c
@@ -887,11 +887,11 @@ char *ldb_dn_get_extended_linearized(TALLOC_CTX *mem_ctx,
struct ldb_dn *dn, int
/*
filter out all but an acceptable list of extended DN components
*/
-void ldb_dn_extended_filter(struct ldb_dn *dn, const char * const *accept)
+void ldb_dn_extended_filter(struct ldb_dn *dn, const char * const *accept_list)
{
unsigned int i;
for (i=0; i<dn->ext_comp_num; i++) {
- if (!ldb_attr_in_list(accept, dn->ext_components[i].name)) {
+ if (!ldb_attr_in_list(accept_list, dn->ext_components[i].name))
{
memmove(&dn->ext_components[i],
&dn->ext_components[i+1],
(dn->ext_comp_num-(i+1))*sizeof(dn->ext_components[0]));
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 1deed84..0c3196a 100644
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -1692,7 +1692,7 @@ char *ldb_dn_alloc_linearized(TALLOC_CTX *mem_ctx, struct
ldb_dn *dn);
char *ldb_dn_get_extended_linearized(TALLOC_CTX *mem_ctx, struct ldb_dn *dn,
int mode);
const struct ldb_val *ldb_dn_get_extended_component(struct ldb_dn *dn, const
char *name);
int ldb_dn_set_extended_component(struct ldb_dn *dn, const char *name, const
struct ldb_val *val);
-void ldb_dn_extended_filter(struct ldb_dn *dn, const char * const *accept);
+void ldb_dn_extended_filter(struct ldb_dn *dn, const char * const
*accept_list);
void ldb_dn_remove_extended_components(struct ldb_dn *dn);
bool ldb_dn_has_extended(struct ldb_dn *dn);
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c
b/source4/rpc_server/lsa/dcesrv_lsa.c
index a3c8846..0854f25 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -4051,7 +4051,7 @@ static NTSTATUS make_ft_info(TALLOC_CTX *mem_ctx,
}
static NTSTATUS add_collision(struct lsa_ForestTrustCollisionInfo *c_info,
- uint32_t index, uint32_t collision_type,
+ uint32_t idx, uint32_t collision_type,
uint32_t conflict_type, const char *tdo_name);
static NTSTATUS check_ft_info(TALLOC_CTX *mem_ctx,
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index dff014b..445a626 100644
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -154,7 +154,7 @@ static struct smbcli_state *connect_one(struct
tevent_context *ev,
}
- myname = talloc_asprintf(mem_ctx, "lock-%u-%u", getpid(), snum);
+ myname = talloc_asprintf(mem_ctx, "lock-%d-%d", (int) getpid(), snum);
cli_credentials_set_workstation(servers[snum], myname, CRED_SPECIFIED);
do {
@@ -405,7 +405,7 @@ static int retest(struct smbcli_state
*cli[NSERVERS][NCONNECTIONS],
*/
static int test_locks(struct tevent_context *ev,
struct loadparm_context *lp_ctx,
- TALLOC_CTX *mem_ctx,
+ TALLOC_CTX *mem_ctx,
char *share[NSERVERS])
{
struct smbcli_state *cli[NSERVERS][NCONNECTIONS];
--
Samba Shared Repository
