The branch, master has been updated
via 91ce32b... s4:param/secrets.c - add some "char *" casts
via 2859b9d... s4:net tool - add a "discard_const_p" to suppress the
"PySys_SetArgv" warning
via 5b824eb... s4:torture - remove unused variables
via b7b464e... s4:auth/ntlm/auth_developer.c -
"fixed_challenge_get_challenge" - fix the assignment of the challenge
via 0086db6... LDB:sample_module.c - remove code parts which generate
warnings
from 5f080d8... s4-python: Fix compilation of samba._ldb.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 91ce32b4c428d2fc514eef150c625de6cb91345b
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Tue Apr 6 14:52:38 2010 +0200
s4:param/secrets.c - add some "char *" casts
Also this quiets some warnings.
commit 2859b9df99bf2b49e90feca3ad7b7de6be816fe7
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Tue Apr 6 14:36:06 2010 +0200
s4:net tool - add a "discard_const_p" to suppress the "PySys_SetArgv"
warning
commit 5b824eb17bc11b2de8b2df9b9bc55db1d0e08df0
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Tue Apr 6 14:32:27 2010 +0200
s4:torture - remove unused variables
commit b7b464eeee96a57fb94c1f0899bfdb6639a70eb6
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Tue Apr 6 14:26:20 2010 +0200
s4:auth/ntlm/auth_developer.c - "fixed_challenge_get_challenge" - fix the
assignment of the challenge
This is a string buffer and not a DATA_BLOB.
commit 0086db6c0cdf0c7afccc143259c8c55382e466aa
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Tue Apr 6 14:09:38 2010 +0200
LDB:sample_module.c - remove code parts which generate warnings
Btw: The use of the "ldb_msg_add_fmt" operation directly on the request
message
object is strongly discouraged. Better is to make a shallow copy of this
message
and attach it to a new child request which is handled by the following
modules.
-----------------------------------------------------------------------
Summary of changes:
source4/auth/ntlm/auth_developer.c | 7 ++-----
source4/lib/ldb/tests/sample_module.c | 4 ----
source4/param/secrets.c | 6 +++---
source4/torture/raw/setfileinfo.c | 1 -
source4/torture/rpc/samr.c | 1 -
source4/torture/smb2/create.c | 2 +-
source4/utils/net/net.c | 2 +-
7 files changed, 7 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/auth/ntlm/auth_developer.c
b/source4/auth/ntlm/auth_developer.c
index c904831..96491d6 100644
--- a/source4/auth/ntlm/auth_developer.c
+++ b/source4/auth/ntlm/auth_developer.c
@@ -150,15 +150,12 @@ static const struct auth_operations
name_to_ntstatus_auth_ops = {
*
* @return NT_STATUS_UNSUCCESSFUL
**/
-static NTSTATUS fixed_challenge_get_challenge(struct auth_method_context *ctx,
TALLOC_CTX *mem_ctx, DATA_BLOB *_blob)
+static NTSTATUS fixed_challenge_get_challenge(struct auth_method_context *ctx,
TALLOC_CTX *mem_ctx, uint8_t chal[8])
{
- DATA_BLOB blob;
const char *challenge = "I am a teapot";
- blob = data_blob_talloc(mem_ctx, challenge, 8);
- NT_STATUS_HAVE_NO_MEMORY(blob.data);
+ memcpy(chal, challenge, 8);
- *_blob = blob;
return NT_STATUS_OK;
}
diff --git a/source4/lib/ldb/tests/sample_module.c
b/source4/lib/ldb/tests/sample_module.c
index bb7906e..f48a1ee 100644
--- a/source4/lib/ldb/tests/sample_module.c
+++ b/source4/lib/ldb/tests/sample_module.c
@@ -26,9 +26,6 @@
int sample_add(struct ldb_module *mod, struct ldb_request *req)
{
struct ldb_control *control;
- struct ldb_control *controls;
- ldb_msg_add_fmt(req->op.add.message, "touchedBy", "sample");
-
/* check if there's a relax control */
control = ldb_request_get_control(req, LDB_CONTROL_RELAX_OID);
@@ -43,7 +40,6 @@ int sample_add(struct ldb_module *mod, struct ldb_request
*req)
int sample_modify(struct ldb_module *mod, struct ldb_request *req)
{
struct ldb_control *control;
- struct ldb_control *controls;
/* check if there's a relax control */
control = ldb_request_get_control(req, LDB_CONTROL_RELAX_OID);
diff --git a/source4/param/secrets.c b/source4/param/secrets.c
index 407e27f..2962bcd 100644
--- a/source4/param/secrets.c
+++ b/source4/param/secrets.c
@@ -166,14 +166,14 @@ struct dom_sid *secrets_get_domain_sid(TALLOC_CTX
*mem_ctx,
if (ldb_ret != LDB_SUCCESS) {
*errstring = talloc_asprintf(mem_ctx, "Failed to find record
for %s in %s: %s: %s",
- domain, ldb_get_opaque(ldb,
"ldb_url"),
+ domain, (char *)
ldb_get_opaque(ldb, "ldb_url"),
ldb_strerror(ldb_ret),
ldb_errstring(ldb));
return NULL;
}
v = ldb_msg_find_ldb_val(msg, "objectSid");
if (v == NULL) {
*errstring = talloc_asprintf(mem_ctx, "Failed to find a SID on
record for %s in %s",
- domain, ldb_get_opaque(ldb,
"ldb_url"));
+ domain, (char *)
ldb_get_opaque(ldb, "ldb_url"));
return NULL;
}
result = talloc(mem_ctx, struct dom_sid);
@@ -186,7 +186,7 @@ struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx,
(ndr_pull_flags_fn_t)ndr_pull_dom_sid);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
*errstring = talloc_asprintf(mem_ctx, "Failed to parse SID on
record for %s in %s",
- domain, ldb_get_opaque(ldb,
"ldb_url"));
+ domain, (char *)
ldb_get_opaque(ldb, "ldb_url"));
talloc_free(result);
talloc_free(ldb);
return NULL;
diff --git a/source4/torture/raw/setfileinfo.c
b/source4/torture/raw/setfileinfo.c
index 8b540b2..5d7cb05 100644
--- a/source4/torture/raw/setfileinfo.c
+++ b/source4/torture/raw/setfileinfo.c
@@ -981,7 +981,6 @@ torture_raw_sfileinfo_archive(struct torture_context *tctx,
union smb_setfileinfo sfinfo;
union smb_fileinfo finfo;
uint16_t fnum=0;
- uint32_t access_mask = 0;
if (!torture_setup_dir(cli, BASEDIR)) {
return false;
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index bb451cf..d40d162 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -2705,7 +2705,6 @@ static bool test_GetAliasMembership(struct
dcerpc_binding_handle *b,
struct samr_GetAliasMembership r;
struct lsa_SidArray sids;
struct samr_Ids rids;
- NTSTATUS status;
torture_comment(tctx, "Testing GetAliasMembership\n");
diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c
index b89b14a..c573f25 100644
--- a/source4/torture/smb2/create.c
+++ b/source4/torture/smb2/create.c
@@ -475,7 +475,7 @@ static bool test_create_acl_ext(struct torture_context
*tctx, struct smb2_tree *
struct smb2_create io;
NTSTATUS status;
struct security_ace ace;
- struct security_descriptor *sd, *sd2;
+ struct security_descriptor *sd;
struct dom_sid *test_sid;
union smb_fileinfo q = {};
uint32_t attrib =
diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 62d7afc..83cc64d 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -315,7 +315,7 @@ static int binary_net(int argc, const char **argv)
}
py_load_samba_modules();
Py_Initialize();
- PySys_SetArgv(argc, argv);
+ PySys_SetArgv(argc, discard_const_p(char *, argv));
py_update_path("bin"); /* FIXME: Can't assume this is always the case */
py_cmds = py_commands();
--
Samba Shared Repository
