The branch, master has been updated
via 1fc1dfe s4:torture/libnetapi: remove allow_warnings=True
via 069740c s4:torture/libnetapi: avoid compiler warning
via e09754b s4:torture/winbind: remove allow_warnings=True
via 5154e60 s4:torture/winbind: avoid compiler warnings
via 4c1a5a4 s4:torture/wscript_build: remove allow_warnings=True for
torture_rpc
via 698b69e s4:torture/rpc: avoid compiler warnings
via 3e9e03f s4:torture/wscript_build: remove allow_warnings=True for
TORTURE_RAW
via 116e3ef s4:torture/raw: avoid compiler warnings
via c1c4dbe s4:torture/wscript_build: remove allow_warnings=True for
TORTURE_NDR
via b504794 s4:torture/ndr: #if 0 unused code
via 3f52d83 s4:torture/smb2: remove allow_warnings=True
via 7eab1de s4:torture/smb2: avoid compiler warnings
via 56503d3 ldb:wscript: remove allow_warnings=True for ldb_sample
via b5ee6ae ldb:tests/sample_module: don't be lazy and use
ldb_msg_copy_shallow/ldb_build_add_req
via 382c56e s4:auth/gensec_cyrus_sasl: allow_warnings=True
via 96a4b14 s4:auth/gensec_cyrus_sasl: remove compiler warnings
via f99d954 s4:auth/gensec_gssapi: remove allow_warnings=True
via 2bf79c4 s4:auth/gensec_gssapi: remove compiler warnings
via bf77d78 auth/kerberos: remove allow_warnings=True
via 21ed0ef auth/kerberos: avoid compiler warnings
via 0a4adb6 s4:lib/tls: remove allow_warnings=True
via f074e27 s4:lib/tls: add tls_cert_generate() prototype to tls.h
via 41c75a7 s4:rpc_server/samr: remove allow_warnings=True
via c67550b s4:rpc_server/samr: use the same logic in *info_DomInfo7()
as in info_DomGeneralInformation()
via 5e563ba s4:rpc_server/samr: handle ROLE_AUTO explicit to avoid a
compiler warning
via 544ee5b s4:rpc_server/samr: remove unused variables
via f1e653c s4:rpc_server/drsuapi: remove allow_warnings=True
via cd9a6a3 s4:rpc_server/drsuapi: fix const warning in
writespn_check_spn()
via c772fe8 s4:rpc_server/drsuapi: remove unused variable in
dcesrv_drsuapi_DsWriteAccountSpn()
via 07d29da s4:rpc_server/drsuapi: fix warnings in
dcesrv_drsuapi_DsGetDomainControllerInfo_1()
via ea2ff2c s3:rpc_server/wscript_build: remove allow_warnings=True
from RPC_SPOOLSS
via 821f2c7 s3:rpc_server/spoolss: make use of SPOOLSS_JOB_CONTROL_NOOP
via 02d221d spoolss.idl: add SPOOLSS_JOB_CONTROL_NOOP = 0
via 274de6f s3:wscript_build: remove allow_warnings=True from
LIBNET_DSSYNC
via 0cc1eec s3:libnet: remove unused variables
via a46a006 libcli/auth: add forward declaration for struct
wkssvc_PasswordBuffer
via 409cf45 libcli/auth: add some const to
netlogon_creds_server_{init,step_check}()
from 1f523a6 ctdb-tests: Avoid early exits in scripts that appear on
tail of a pipe
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1fc1dfe921d565849960567b59c7702100fbc1aa
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 23:10:26 2015 +0100
s4:torture/libnetapi: remove allow_warnings=True
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Fri Mar 20 23:23:55 CET 2015 on sn-devel-104
commit 069740ca5eed04a741328550807800810a66df83
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 23:10:01 2015 +0100
s4:torture/libnetapi: avoid compiler warning
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit e09754b46b1b1187c62a316cfced2beb7539f62b
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 23:08:33 2015 +0100
s4:torture/winbind: remove allow_warnings=True
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 5154e60421880032756895e3cff229be7de8415f
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 23:08:02 2015 +0100
s4:torture/winbind: avoid compiler warnings
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 4c1a5a48b90c1d2bf5be67824457a2018f50ad6a
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 23:04:09 2015 +0100
s4:torture/wscript_build: remove allow_warnings=True for torture_rpc
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 698b69e702592904dc6fa4fbc687e8cda7e7a92e
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 23:03:48 2015 +0100
s4:torture/rpc: avoid compiler warnings
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 3e9e03fb5652ba0fdaf28374987568fda022a357
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 22:53:00 2015 +0100
s4:torture/wscript_build: remove allow_warnings=True for TORTURE_RAW
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 116e3ef23c8ebefe60556a9e5a91388e9a9862d9
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 22:52:32 2015 +0100
s4:torture/raw: avoid compiler warnings
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit c1c4dbe75986eb34739c169d9f3a7a74577afec9
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 22:46:13 2015 +0100
s4:torture/wscript_build: remove allow_warnings=True for TORTURE_NDR
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit b504794bf5f47e660f45a1c261164357c70bf7de
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 22:45:17 2015 +0100
s4:torture/ndr: #if 0 unused code
This avoids compiler warnings, but keep the code arround to be activated
later.
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 3f52d83307b41a2487a8cbd5166aaacd14dfda20
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 22:39:33 2015 +0100
s4:torture/smb2: remove allow_warnings=True
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 7eab1de0f198e4e61dabe8010a9331c4f2f972a8
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 22:39:11 2015 +0100
s4:torture/smb2: avoid compiler warnings
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 56503d32c36bd4e46e87e72d5823f452314436e1
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 22:17:06 2015 +0100
ldb:wscript: remove allow_warnings=True for ldb_sample
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit b5ee6ae29da5751a375cf7cde6f05aaf83a43ef7
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 22:17:06 2015 +0100
ldb:tests/sample_module: don't be lazy and use
ldb_msg_copy_shallow/ldb_build_add_req
If we want to modify the the passed request on its way down the module
chain,
we should use the proper way and use ldb_msg_copy_shallow() and
ldb_build_add_req().
This way we don't alter the callers const structure.
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 382c56e9f355b9558771a52af951ef1fc3a6f1db
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 22:03:59 2015 +0100
s4:auth/gensec_cyrus_sasl: allow_warnings=True
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 96a4b1463f260cdf8dd938bf6d506259aa8719b3
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 22:03:59 2015 +0100
s4:auth/gensec_cyrus_sasl: remove compiler warnings
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit f99d9548fd77496e848283bb8f2fd5c42ee9e884
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 21:52:12 2015 +0100
s4:auth/gensec_gssapi: remove allow_warnings=True
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 2bf79c419ddef693e74bcf33375ba56533b4774b
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 21:52:12 2015 +0100
s4:auth/gensec_gssapi: remove compiler warnings
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit bf77d78fd8ff442e6cefdaec1d9ee0f344c075d7
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 21:49:32 2015 +0100
auth/kerberos: remove allow_warnings=True
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 21ed0efac0b8371a7d56320875b88fbde161990e
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 21:49:05 2015 +0100
auth/kerberos: avoid compiler warnings
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 0a4adb6730d0ec0e681ca9606b5a06934cf5ee7a
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 21:43:00 2015 +0100
s4:lib/tls: remove allow_warnings=True
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit f074e271a15215fe5e30f83bb170bd99a6e0ae92
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 21:42:19 2015 +0100
s4:lib/tls: add tls_cert_generate() prototype to tls.h
This avoids compiler warnings...
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 41c75a776ee670f9ec2a8bfaaffdbb6722dc6075
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 16:12:11 2015 +0100
s4:rpc_server/samr: remove allow_warnings=True
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit c67550b6d845b7085cdbce9247a73f8b43714e5d
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 16:07:43 2015 +0100
s4:rpc_server/samr: use the same logic in *info_DomInfo7() as in
info_DomGeneralInformation()
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 5e563ba27b9e224f216b870467a37a11e71f01d0
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 16:07:03 2015 +0100
s4:rpc_server/samr: handle ROLE_AUTO explicit to avoid a compiler warning
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 544ee5becf71a809553b6f172cb6ccf39dbe1558
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 10:23:39 2015 +0100
s4:rpc_server/samr: remove unused variables
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit f1e653c76ddbc63ecab16b673fcb96b2b7376543
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 10:15:47 2015 +0100
s4:rpc_server/drsuapi: remove allow_warnings=True
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit cd9a6a35ad3ef81fc196f72a298fe21ea07632b3
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 10:15:47 2015 +0100
s4:rpc_server/drsuapi: fix const warning in writespn_check_spn()
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit c772fe8b1d30e897254bfc837d495d4d9e5ee877
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 10:15:47 2015 +0100
s4:rpc_server/drsuapi: remove unused variable in
dcesrv_drsuapi_DsWriteAccountSpn()
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 07d29da5a7b019cc5742c9209f42a015cdcb538d
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 10:15:47 2015 +0100
s4:rpc_server/drsuapi: fix warnings in
dcesrv_drsuapi_DsGetDomainControllerInfo_1()
'default' is already handled in an earlier switch statement,
so this won't be reached but avoids a warning.
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit ea2ff2c7ff23a14986c6d12ac1172462ee4542e1
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 10:03:41 2015 +0100
s3:rpc_server/wscript_build: remove allow_warnings=True from RPC_SPOOLSS
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 821f2c77b80fb80e65aa8f616d703b7e09889d4c
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 10:03:08 2015 +0100
s3:rpc_server/spoolss: make use of SPOOLSS_JOB_CONTROL_NOOP
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 02d221debef92298a20910151e8f2df6bf9c78e8
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 10:01:27 2015 +0100
spoolss.idl: add SPOOLSS_JOB_CONTROL_NOOP = 0
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 274de6f5acb12d41e600d1391d2a9f6270045edd
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 09:51:49 2015 +0100
s3:wscript_build: remove allow_warnings=True from LIBNET_DSSYNC
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 0cc1eec6452ae31a0e3ac7d3f8f2e2b71cc858df
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 09:51:16 2015 +0100
s3:libnet: remove unused variables
Signed-off-by: Stefan Metzmacher <me...@samba.org>
commit a46a00673d00659feaa4c53b049b16d71347243a
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Mar 18 09:50:44 2015 +0100
libcli/auth: add forward declaration for struct wkssvc_PasswordBuffer
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 409cf45147f4f607b1f16baf837ef35ddc5c147a
Author: Stefan Metzmacher <me...@samba.org>
Date: Thu Mar 19 16:26:03 2015 +0100
libcli/auth: add some const to netlogon_creds_server_{init,step_check}()
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
auth/kerberos/gssapi_pac.c | 16 ++++--
auth/kerberos/wscript_build | 1 -
lib/ldb/tests/sample_module.c | 77 ++++++++++++++++++++++++-----
lib/ldb/wscript | 1 -
libcli/auth/credentials.c | 4 +-
libcli/auth/proto.h | 5 +-
librpc/idl/spoolss.idl | 1 +
source3/libnet/libnet_dssync_passdb.c | 16 ------
source3/rpc_server/spoolss/srv_spoolss_nt.c | 2 +-
source3/rpc_server/wscript_build | 1 -
source3/wscript_build | 1 -
source4/auth/gensec/cyrus_sasl.c | 16 +++---
source4/auth/gensec/gensec_gssapi.c | 20 ++++----
source4/auth/gensec/wscript_build | 2 -
source4/lib/tls/tls.h | 5 ++
source4/lib/tls/tls_tstream.c | 2 -
source4/lib/tls/tlscert.c | 1 +
source4/lib/tls/wscript | 1 -
source4/rpc_server/drsuapi/dcesrv_drsuapi.c | 2 +
source4/rpc_server/drsuapi/writespn.c | 5 +-
source4/rpc_server/samr/dcesrv_samr.c | 13 ++---
source4/rpc_server/wscript_build | 2 -
source4/torture/libnetapi/libnetapi_group.c | 2 +-
source4/torture/libnetapi/wscript_build | 1 -
source4/torture/ndr/epmap.c | 2 +
source4/torture/ndr/lsa.c | 2 +
source4/torture/ndr/netlogon.c | 2 +
source4/torture/ndr/ntlmssp.c | 2 +
source4/torture/ndr/winreg.c | 4 ++
source4/torture/raw/samba3misc.c | 2 -
source4/torture/raw/search.c | 11 +++--
source4/torture/raw/streams.c | 9 +---
source4/torture/rpc/lsa.c | 8 +--
source4/torture/rpc/samlogon.c | 16 +++---
source4/torture/rpc/schannel.c | 3 +-
source4/torture/smb2/dir.c | 26 +++++-----
source4/torture/smb2/notify.c | 5 ++
source4/torture/smb2/oplock.c | 1 -
source4/torture/smb2/streams.c | 7 +--
source4/torture/smb2/wscript_build | 1 -
source4/torture/winbind/struct_based.c | 6 +--
source4/torture/winbind/wscript_build | 1 -
source4/torture/wscript_build | 3 --
43 files changed, 175 insertions(+), 133 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/kerberos/gssapi_pac.c b/auth/kerberos/gssapi_pac.c
index 99181a1..c6fa909 100644
--- a/auth/kerberos/gssapi_pac.c
+++ b/auth/kerberos/gssapi_pac.c
@@ -54,7 +54,7 @@ const gss_OID_desc * const gss_mech_krb5_wrong =
krb5_gss_oid_array+2;
gss_OID_desc gse_sesskey_inq_oid = {
GSS_KRB5_INQ_SSPI_SESSION_KEY_OID_LENGTH,
- (void *)GSS_KRB5_INQ_SSPI_SESSION_KEY_OID
+ discard_const(GSS_KRB5_INQ_SSPI_SESSION_KEY_OID)
};
#ifndef GSS_KRB5_SESSION_KEY_ENCTYPE_OID
@@ -64,7 +64,7 @@ gss_OID_desc gse_sesskey_inq_oid = {
gss_OID_desc gse_sesskeytype_oid = {
GSS_KRB5_SESSION_KEY_ENCTYPE_OID_LENGTH,
- (void *)GSS_KRB5_SESSION_KEY_ENCTYPE_OID
+ discard_const(GSS_KRB5_SESSION_KEY_ENCTYPE_OID)
};
/* The Heimdal OID for getting the PAC */
@@ -236,7 +236,7 @@ NTSTATUS gssapi_get_session_key(TALLOC_CTX *mem_ctx,
if (keytype) {
int diflen, i;
- const char *p;
+ const uint8_t *p;
if (set->count < 2) {
@@ -266,7 +266,7 @@ NTSTATUS gssapi_get_session_key(TALLOC_CTX *mem_ctx,
gss_maj = gss_release_buffer_set(&gss_min, &set);
return NT_STATUS_OK;
}
- p = (uint8_t *)set->elements[1].value +
gse_sesskeytype_oid.length;
+ p = (const uint8_t *)set->elements[1].value +
gse_sesskeytype_oid.length;
diflen = set->elements[1].length - gse_sesskeytype_oid.length;
if (diflen <= 0) {
gss_maj = gss_release_buffer_set(&gss_min, &set);
@@ -307,9 +307,17 @@ char *gssapi_error_string(TALLOC_CTX *mem_ctx,
disp_maj_stat = gss_display_status(&disp_min_stat, maj_stat,
GSS_C_GSS_CODE, mech,
&msg_ctx, &maj_error_message);
+ if (disp_maj_stat != 0) {
+ maj_error_message.value = NULL;
+ maj_error_message.length = 0;
+ }
disp_maj_stat = gss_display_status(&disp_min_stat, min_stat,
GSS_C_MECH_CODE, mech,
&msg_ctx, &min_error_message);
+ if (disp_maj_stat != 0) {
+ min_error_message.value = NULL;
+ min_error_message.length = 0;
+ }
maj_error_string = talloc_strndup(mem_ctx,
(char *)maj_error_message.value,
diff --git a/auth/kerberos/wscript_build b/auth/kerberos/wscript_build
index 15b4889..97b8879 100755
--- a/auth/kerberos/wscript_build
+++ b/auth/kerberos/wscript_build
@@ -1,5 +1,4 @@
#!/usr/bin/env python
bld.SAMBA_SUBSYSTEM('KRB5_PAC',
source='gssapi_pac.c kerberos_pac.c',
- allow_warnings=True,
deps='gssapi_krb5 ndr-krb5pac krb5samba')
diff --git a/lib/ldb/tests/sample_module.c b/lib/ldb/tests/sample_module.c
index bee40a5..6ba9ed2 100644
--- a/lib/ldb/tests/sample_module.c
+++ b/lib/ldb/tests/sample_module.c
@@ -22,24 +22,75 @@
*/
#include "replace.h"
-#include "system/filesys.h"
-#include "system/time.h"
#include "ldb_module.h"
-static int sample_add(struct ldb_module *mod, struct ldb_request *req)
+static int sample_add_callback(struct ldb_request *down_req,
+ struct ldb_reply *ares)
{
- struct ldb_control *control;
+ struct ldb_request *req =
+ talloc_get_type_abort(down_req->context,
+ struct ldb_request);
+
+ if (ares == NULL) {
+ return ldb_module_done(req, NULL, NULL,
+ LDB_ERR_OPERATIONS_ERROR);
+ }
+
+ if (ares->type == LDB_REPLY_REFERRAL) {
+ return ldb_module_send_referral(req, ares->referral);
+ }
- ldb_msg_add_fmt(req->op.add.message, "touchedBy", "sample");
+ if (ares->error != LDB_SUCCESS) {
+ return ldb_module_done(req, ares->controls,
+ ares->response, ares->error);
+ }
+
+ if (ares->type != LDB_REPLY_DONE) {
+ return ldb_module_done(req, NULL, NULL,
+ LDB_ERR_OPERATIONS_ERROR);
+ }
+
+ return ldb_module_done(req, ares->controls,
+ ares->response, LDB_SUCCESS);
+}
+
+static int sample_add(struct ldb_module *mod, struct ldb_request *req)
+{
+ struct ldb_context *ldb = ldb_module_get_ctx(mod);
+ struct ldb_control *control = NULL;
+ struct ldb_message *msg = NULL;
+ struct ldb_request *down_req = NULL;
+ int ret;
/* check if there's a relax control */
control = ldb_request_get_control(req, LDB_CONTROL_RELAX_OID);
- if (control == NULL) {
- /* not found go on */
- return ldb_next_request(mod, req);
- } else {
+ if (control != NULL) {
return LDB_ERR_UNWILLING_TO_PERFORM;
}
+
+ msg = ldb_msg_copy_shallow(req, req->op.add.message);
+ if (msg == NULL) {
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+
+ ret = ldb_msg_add_fmt(msg, "touchedBy", "sample");
+ if (ret != LDB_SUCCESS) {
+ return ret;
+ }
+
+ ret = ldb_build_add_req(&down_req, ldb, req,
+ msg,
+ req->controls,
+ req, sample_add_callback,
+ req);
+ if (ret != LDB_SUCCESS) {
+ return ret;
+ }
+
+ talloc_steal(down_req, msg);
+
+ /* go on with the call chain */
+ return ldb_next_request(mod, down_req);
}
static int sample_modify(struct ldb_module *mod, struct ldb_request *req)
@@ -48,12 +99,12 @@ static int sample_modify(struct ldb_module *mod, struct
ldb_request *req)
/* check if there's a relax control */
control = ldb_request_get_control(req, LDB_CONTROL_RELAX_OID);
- if (control == NULL) {
- /* not found go on */
- return ldb_next_request(mod, req);
- } else {
+ if (control != NULL) {
return LDB_ERR_UNWILLING_TO_PERFORM;
}
+
+ /* not found go on */
+ return ldb_next_request(mod, req);
}
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 1067a00..886b3e7 100755
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -216,7 +216,6 @@ def build(bld):
'tests/sample_module.c',
init_function='ldb_sample_init',
internal_module=False,
- allow_warnings=True,
module_init_name='ldb_init_module',
deps='ldb',
subsystem='ldb')
diff --git a/libcli/auth/credentials.c b/libcli/auth/credentials.c
index 06f5728..91f37b7 100644
--- a/libcli/auth/credentials.c
+++ b/libcli/auth/credentials.c
@@ -419,7 +419,7 @@ struct netlogon_creds_CredentialState
*netlogon_creds_server_init(TALLOC_CTX *me
const struct
netr_Credential *client_challenge,
const struct
netr_Credential *server_challenge,
const struct
samr_Password *machine_password,
- struct
netr_Credential *credentials_in,
+ const struct
netr_Credential *credentials_in,
struct
netr_Credential *credentials_out,
uint32_t
negotiate_flags)
{
@@ -484,7 +484,7 @@ struct netlogon_creds_CredentialState
*netlogon_creds_server_init(TALLOC_CTX *me
}
NTSTATUS netlogon_creds_server_step_check(struct
netlogon_creds_CredentialState *creds,
- struct netr_Authenticator
*received_authenticator,
+ const struct netr_Authenticator
*received_authenticator,
struct netr_Authenticator
*return_authenticator)
{
if (!received_authenticator || !return_authenticator) {
diff --git a/libcli/auth/proto.h b/libcli/auth/proto.h
index 0c319d3..c58a23f 100644
--- a/libcli/auth/proto.h
+++ b/libcli/auth/proto.h
@@ -52,11 +52,11 @@ struct netlogon_creds_CredentialState
*netlogon_creds_server_init(TALLOC_CTX *me
const struct
netr_Credential *client_challenge,
const struct
netr_Credential *server_challenge,
const struct
samr_Password *machine_password,
- struct
netr_Credential *credentials_in,
+ const struct
netr_Credential *credentials_in,
struct
netr_Credential *credentials_out,
uint32_t
negotiate_flags);
NTSTATUS netlogon_creds_server_step_check(struct
netlogon_creds_CredentialState *creds,
- struct netr_Authenticator
*received_authenticator,
+ const struct netr_Authenticator
*received_authenticator,
struct netr_Authenticator
*return_authenticator) ;
void netlogon_creds_decrypt_samlogon_validation(struct
netlogon_creds_CredentialState *creds,
uint16_t validation_level,
@@ -189,6 +189,7 @@ bool set_pw_in_buffer(uint8_t buffer[516], DATA_BLOB
*password);
************************************************************/
bool extract_pw_from_buffer(TALLOC_CTX *mem_ctx,
uint8_t in_buffer[516], DATA_BLOB *new_pass);
+struct wkssvc_PasswordBuffer;
void encode_wkssvc_join_password_buffer(TALLOC_CTX *mem_ctx,
const char *pwd,
DATA_BLOB *session_key,
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index e7fecfe..5bbc267 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -1067,6 +1067,7 @@ cpp_quote("#define spoolss_security_descriptor
security_descriptor")
} spoolss_JobInfoContainer;
typedef [v1_enum] enum {
+ SPOOLSS_JOB_CONTROL_NOOP = 0,
SPOOLSS_JOB_CONTROL_PAUSE = 1,
SPOOLSS_JOB_CONTROL_RESUME = 2,
SPOOLSS_JOB_CONTROL_CANCEL = 3,
diff --git a/source3/libnet/libnet_dssync_passdb.c
b/source3/libnet/libnet_dssync_passdb.c
index 22eff90..5617776 100644
--- a/source3/libnet/libnet_dssync_passdb.c
+++ b/source3/libnet/libnet_dssync_passdb.c
@@ -1119,7 +1119,6 @@ static NTSTATUS sam_account_from_object(struct samu
*account,
const char *profilePath;
const char *description;
const char *userWorkstations;
- const char *comment;
DATA_BLOB userParameters;
struct dom_sid objectSid;
uint32_t primaryGroupID;
@@ -1151,7 +1150,6 @@ static NTSTATUS sam_account_from_object(struct samu
*account,
GET_STRING(profilePath);
GET_STRING(description);
GET_STRING(userWorkstations);
- GET_STRING(comment);
GET_BLOB(userParameters);
GET_UINT32(primaryGroupID);
GET_UINT32(userAccountControl);
@@ -1367,12 +1365,10 @@ static NTSTATUS handle_account_object(struct
dssync_passdb *pctx,
uint32_t rid;
const char *sAMAccountName;
- uint32_t sAMAccountType;
uint32_t userAccountControl;
user_sid = cur->object.identifier->sid;
GET_STRING_EX(sAMAccountName, true);
- GET_UINT32_EX(sAMAccountType, true);
GET_UINT32_EX(userAccountControl, true);
status = dom_sid_split_rid(mem_ctx, &user_sid, NULL, &rid);
@@ -1489,8 +1485,6 @@ static NTSTATUS handle_alias_object(struct dssync_passdb
*pctx,
bool insert = true;
const char *sAMAccountName;
- uint32_t sAMAccountType;
- uint32_t groupType;
const char *description;
uint32_t i;
uint32_t num_members = 0;
@@ -1498,8 +1492,6 @@ static NTSTATUS handle_alias_object(struct dssync_passdb
*pctx,
group_sid = cur->object.identifier->sid;
GET_STRING_EX(sAMAccountName, true);
- GET_UINT32_EX(sAMAccountType, true);
- GET_UINT32_EX(groupType, true);
GET_STRING(description);
status = find_drsuapi_attr_dn(obj, cur, DRSUAPI_ATTID_member,
@@ -1628,8 +1620,6 @@ static NTSTATUS handle_group_object(struct dssync_passdb
*pctx,
bool insert = true;
const char *sAMAccountName;
- uint32_t sAMAccountType;
- uint32_t groupType;
const char *description;
uint32_t i;
uint32_t num_members = 0;
@@ -1637,8 +1627,6 @@ static NTSTATUS handle_group_object(struct dssync_passdb
*pctx,
group_sid = cur->object.identifier->sid;
GET_STRING_EX(sAMAccountName, true);
- GET_UINT32_EX(sAMAccountType, true);
- GET_UINT32_EX(groupType, true);
GET_STRING(description);
status = find_drsuapi_attr_dn(obj, cur, DRSUAPI_ATTID_member,
@@ -1781,7 +1769,6 @@ static NTSTATUS parse_object(struct dssync_passdb *pctx,
struct drsuapi_DsReplicaAttribute *attr;
char *name = NULL;
- uint32_t uacc = 0;
uint32_t sam_type = 0;
DEBUG(3, ("parsing object '%s'\n", cur->object.identifier->dn));
@@ -1809,9 +1796,6 @@ static NTSTATUS parse_object(struct dssync_passdb *pctx,
case DRSUAPI_ATTID_sAMAccountType:
sam_type = IVAL(blob->data, 0);
break;
- case DRSUAPI_ATTID_userAccountControl:
- uacc = IVAL(blob->data, 0);
- break;
default:
break;
}
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c
b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index a195eb6..d61b072c 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -7548,7 +7548,7 @@ WERROR _spoolss_SetJob(struct pipes_struct *p,
errcode = print_job_resume(session_info, p->msg_ctx,
snum, r->in.job_id);
break;
- case 0:
+ case SPOOLSS_JOB_CONTROL_NOOP:
errcode = WERR_OK;
break;
default:
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index 481d39c..d0fe86d 100755
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -96,7 +96,6 @@ bld.SAMBA3_SUBSYSTEM('RPC_SPOOLSS',
source='''spoolss/srv_spoolss_nt.c
../../librpc/gen_ndr/srv_spoolss.c
spoolss/srv_spoolss_util.c''',
- allow_warnings=True,
deps='PRINTING PRINTBACKEND LIBCLI_WINREG_INTERNAL')
bld.SAMBA3_SUBSYSTEM('RPC_SRVSVC',
diff --git a/source3/wscript_build b/source3/wscript_build
index 518888b..8870e9f 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -713,7 +713,6 @@ bld.SAMBA3_SUBSYSTEM('LIBNET_DSSYNC',
source='''libnet/libnet_dssync.c
libnet/libnet_dssync_passdb.c
libnet/libnet_dssync_keytab.c''',
- allow_warnings=True,
deps='LIBNET RPC_NDR_DRSUAPI')
bld.SAMBA3_SUBSYSTEM('LIBNET_SAMSYNC',
diff --git a/source4/auth/gensec/cyrus_sasl.c b/source4/auth/gensec/cyrus_sasl.c
index 08dccd6..72acc52 100644
--- a/source4/auth/gensec/cyrus_sasl.c
+++ b/source4/auth/gensec/cyrus_sasl.c
@@ -117,6 +117,8 @@ static int gensec_sasl_dispose(struct gensec_sasl_state
*gensec_sasl_state)
return SASL_OK;
}
+typedef int (*__gensec_sasl_callback_t)(void);
+
static NTSTATUS gensec_sasl_client_start(struct gensec_security
*gensec_security)
{
struct gensec_sasl_state *gensec_sasl_state;
@@ -137,19 +139,19 @@ static NTSTATUS gensec_sasl_client_start(struct
gensec_security *gensec_security
callbacks = talloc_array(gensec_sasl_state, sasl_callback_t, 5);
callbacks[0].id = SASL_CB_USER;
- callbacks[0].proc = gensec_sasl_get_user;
+ callbacks[0].proc = (__gensec_sasl_callback_t)gensec_sasl_get_user;
callbacks[0].context = gensec_security;
- callbacks[1].id = SASL_CB_AUTHNAME;
- callbacks[1].proc = gensec_sasl_get_user;
+ callbacks[1].id = SASL_CB_AUTHNAME;
+ callbacks[1].proc = (__gensec_sasl_callback_t)gensec_sasl_get_user;
callbacks[1].context = gensec_security;
callbacks[2].id = SASL_CB_GETREALM;
- callbacks[2].proc = gensec_sasl_get_realm;
+ callbacks[2].proc = (__gensec_sasl_callback_t)gensec_sasl_get_realm;
callbacks[2].context = gensec_security;
callbacks[3].id = SASL_CB_PASS;
- callbacks[3].proc = gensec_sasl_get_password;
+ callbacks[3].proc = (__gensec_sasl_callback_t)gensec_sasl_get_password;
callbacks[3].context = gensec_security;
callbacks[4].id = SASL_CB_LIST_END;
@@ -392,12 +394,12 @@ NTSTATUS gensec_sasl_init(void)
static const sasl_callback_t callbacks[] = {
{
.id = SASL_CB_LOG,
- .proc = gensec_sasl_log,
+ .proc = (__gensec_sasl_callback_t)gensec_sasl_log,
.context = NULL,
},
{
.id = SASL_CB_LIST_END,
- .proc = gensec_sasl_log,
+ .proc = NULL,
.context = NULL,
}
};
diff --git a/source4/auth/gensec/gensec_gssapi.c
b/source4/auth/gensec/gensec_gssapi.c
index 59dd434..930911d 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -56,24 +56,26 @@ static size_t gensec_gssapi_max_wrapped_size(struct
gensec_security *gensec_secu
static int gensec_gssapi_destructor(struct gensec_gssapi_state
*gensec_gssapi_state)
{
- OM_uint32 maj_stat, min_stat;
-
+ OM_uint32 min_stat;
+
if (gensec_gssapi_state->delegated_cred_handle != GSS_C_NO_CREDENTIAL) {
- maj_stat = gss_release_cred(&min_stat,
-
&gensec_gssapi_state->delegated_cred_handle);
+ gss_release_cred(&min_stat,
+ &gensec_gssapi_state->delegated_cred_handle);
}
if (gensec_gssapi_state->gssapi_context != GSS_C_NO_CONTEXT) {
- maj_stat = gss_delete_sec_context (&min_stat,
-
&gensec_gssapi_state->gssapi_context,
- GSS_C_NO_BUFFER);
+ gss_delete_sec_context(&min_stat,
+ &gensec_gssapi_state->gssapi_context,
+ GSS_C_NO_BUFFER);
}
if (gensec_gssapi_state->server_name != GSS_C_NO_NAME) {
- maj_stat = gss_release_name(&min_stat,
&gensec_gssapi_state->server_name);
+ gss_release_name(&min_stat,
+ &gensec_gssapi_state->server_name);
}
if (gensec_gssapi_state->client_name != GSS_C_NO_NAME) {
- maj_stat = gss_release_name(&min_stat,
&gensec_gssapi_state->client_name);
+ gss_release_name(&min_stat,
+ &gensec_gssapi_state->client_name);
}
if (gensec_gssapi_state->lucid) {
diff --git a/source4/auth/gensec/wscript_build
b/source4/auth/gensec/wscript_build
index 1a44a90..097a740 100755
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -19,7 +19,6 @@ bld.SAMBA_MODULE('gensec_gssapi',
source='gensec_gssapi.c',
subsystem='gensec',
init_function='gensec_gssapi_init',
- allow_warnings=True,
deps='gssapi samba-credentials authkrb5 com_err gensec_util'
)
@@ -29,7 +28,6 @@ bld.SAMBA_MODULE('cyrus_sasl',
subsystem='gensec',
init_function='gensec_sasl_init',
deps='samba-credentials sasl2',
- allow_warnings=True,
enabled=bld.CONFIG_SET('HAVE_SASL')
)
diff --git a/source4/lib/tls/tls.h b/source4/lib/tls/tls.h
index ed3c81e..64ab7c2 100644
--- a/source4/lib/tls/tls.h
+++ b/source4/lib/tls/tls.h
@@ -45,6 +45,11 @@ struct socket_context *tls_init_server(struct tls_params
*parms,
struct tevent_fd *fde,
const char *plain_chars);
+void tls_cert_generate(TALLOC_CTX *mem_ctx,
+ const char *hostname,
+ const char *keyfile, const char *certfile,
+ const char *cafile);
+
/*
call tls_init_client() on each new client connection
*/
diff --git a/source4/lib/tls/tls_tstream.c b/source4/lib/tls/tls_tstream.c
--
Samba Shared Repository
