[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via bd164ac Revert make paranoia check less paranoid - check that key types strictly match via 3628f34 make hmac-md5 the keyed checksum type for arcfour-hmac-md5 via 1787efa use ETYPE_DES3_CBC_SHA1 for the verify step in verify_mic_des3 via d087e71 heimdal: remove checking of KDC PAC signature, delegate to wdc plugin via b69c40f auth/kerberos: Remove unused TALLOC_CTX argument to check_pac_checksum via 49f8113 s4-kdc Do the KDC PAC checksum validation in the Samba plugin via d0bb8b8 s4-kdc: use IDL constant NETLOGON_GENERIC_KRB5_PAC_VALIDATE from 6764e4f samba-tool:dns: DNS names are case insensitive http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit bd164acb8237b4913f01c4c690b65a65e69ac551 Author: Andrew Bartlett abart...@samba.org Date: Thu Dec 15 12:29:01 2011 +1100 Revert make paranoia check less paranoid - check that key types strictly match This reverts commit c25af51232616061bb08eea86aae595b4f029490 because otherwise we could attempt to check a CKSUMTYPE_HMAC_SHA1_96_AES_256 key with a KRB5_ENCTYPE_ARCFOUR_HMAC_MD5 key. Andrew Bartlett Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Thu Jan 12 09:43:07 CET 2012 on sn-devel-104 commit 3628f34aa3b6036a267a0bc586a3f9433b58b9b9 Author: Andrew Bartlett abart...@samba.org Date: Thu Dec 15 16:36:03 2011 +1100 make hmac-md5 the keyed checksum type for arcfour-hmac-md5 commit 1787efaa006b73cd682f6c27f2b5d367495e7e02 Author: Andrew Bartlett abart...@samba.org Date: Thu Dec 15 16:17:09 2011 +1100 use ETYPE_DES3_CBC_SHA1 for the verify step in verify_mic_des3 This allows a strict link between checksum types and key types to be enforced. Andrew Bartlett commit d087e715fc803eae735636b4ebbb4c0f131f9bb4 Author: Andrew Bartlett abart...@samba.org Date: Wed Jan 11 18:19:14 2012 +1100 heimdal: remove checking of KDC PAC signature, delegate to wdc plugin The checking of the KDC signature is more complex than it looks, it may be of a different enc type to that which the ticket is encrypted with, and may even be prefixed with the RODC number. This is better handled in the plugin which can easily look up the DB for the correct key to verify this with, and can also quickly determine if this is an interdomain trust, which we cannot verify the PAC for. Andrew Bartlett commit b69c40ffce7d1ab8828ec6a1df1d46f7e8c51278 Author: Andrew Bartlett abart...@samba.org Date: Wed Jan 11 18:07:41 2012 +1100 auth/kerberos: Remove unused TALLOC_CTX argument to check_pac_checksum commit 49f8113fabd2603b45439404c91d350b4d6eaeac Author: Andrew Bartlett abart...@samba.org Date: Wed Jan 11 18:06:55 2012 +1100 s4-kdc Do the KDC PAC checksum validation in the Samba plugin Here we can fetch the right key, and check if the PAC is likely to be signed by a key that we know. We cannot check the KDC signature on incoming trusts. Andrew Bartlett commit d0bb8b8a15c76c739062e7a78c013b54729dc5ab Author: Andrew Bartlett abart...@samba.org Date: Wed Jan 11 16:13:37 2012 +1100 s4-kdc: use IDL constant NETLOGON_GENERIC_KRB5_PAC_VALIDATE --- Summary of changes: auth/kerberos/kerberos_pac.c |9 +-- libcli/auth/krb5_wrap.h |3 +- source4/heimdal/kdc/krb5tgs.c| 14 +--- source4/heimdal/lib/gssapi/krb5/verify_mic.c |8 ++ source4/heimdal/lib/krb5/crypto-arcfour.c|2 +- source4/heimdal/lib/krb5/crypto.c|2 +- source4/kdc/kdc.c| 31 +-- source4/kdc/mit_samba.c |5 +- source4/kdc/pac-glue.c | 114 +++--- source4/kdc/pac-glue.h | 10 ++- source4/kdc/wdc-samba4.c | 36 - source4/kdc/wscript_build|2 +- 12 files changed, 169 insertions(+), 67 deletions(-) Changeset truncated at 500 lines: diff --git a/auth/kerberos/kerberos_pac.c b/auth/kerberos/kerberos_pac.c index 97fce73..5155c9f 100644 --- a/auth/kerberos/kerberos_pac.c +++ b/auth/kerberos/kerberos_pac.c @@ -28,8 +28,7 @@ #include librpc/gen_ndr/ndr_krb5pac.h #include libcli/auth/krb5_wrap.h -krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx, - DATA_BLOB pac_data, +krb5_error_code check_pac_checksum(DATA_BLOB pac_data, struct PAC_SIGNATURE_DATA *sig, krb5_context context, const krb5_keyblock *keyblock) @@ -304,8 +303,7 @@ NTSTATUS kerberos_decode_pac(TALLOC_CTX
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d3e5a0b s3:smbd: explicitly ask for GENSEC_FEATURE_UNIX_TOKEN
from bd164ac Revert make paranoia check less paranoid - check that key
types strictly match
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d3e5a0bea4595891014fafe75a34f155e789cef3
Author: Stefan Metzmacher me...@samba.org
Date: Wed Jan 11 22:25:38 2012 +0100
s3:smbd: explicitly ask for GENSEC_FEATURE_UNIX_TOKEN
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Thu Jan 12 11:22:53 CET 2012 on sn-devel-104
---
Summary of changes:
source3/smbd/sesssetup.c |3 +++
source3/smbd/smb2_sesssetup.c |3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 08a3c2c..ca380a8 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -634,6 +634,7 @@ static void reply_spnego_negotiate(struct smb_request *req,
}
gensec_want_feature(*gensec_security, GENSEC_FEATURE_SESSION_KEY);
+ gensec_want_feature(*gensec_security, GENSEC_FEATURE_UNIX_TOKEN);
status = gensec_start_mech_by_oid(*gensec_security, GENSEC_OID_NTLMSSP);
if (!NT_STATUS_IS_OK(status)) {
@@ -746,6 +747,7 @@ static void reply_spnego_auth(struct smb_request *req,
}
gensec_want_feature(*gensec_security,
GENSEC_FEATURE_SESSION_KEY);
+ gensec_want_feature(*gensec_security,
GENSEC_FEATURE_UNIX_TOKEN);
status = gensec_start_mech_by_oid(*gensec_security,
GENSEC_OID_NTLMSSP);
if (!NT_STATUS_IS_OK(status)) {
@@ -1155,6 +1157,7 @@ static void reply_sesssetup_and_X_spnego(struct
smb_request *req)
}
gensec_want_feature(vuser-gensec_security,
GENSEC_FEATURE_SESSION_KEY);
+ gensec_want_feature(vuser-gensec_security,
GENSEC_FEATURE_UNIX_TOKEN);
if (sconn-use_gensec_hook) {
status =
gensec_start_mech_by_oid(vuser-gensec_security, GENSEC_OID_SPNEGO);
diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 017319e..0cd24c9 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -381,6 +381,7 @@ static NTSTATUS smbd_smb2_spnego_negotiate(struct
smbd_smb2_session *session,
}
gensec_want_feature(session-gensec_security,
GENSEC_FEATURE_SESSION_KEY);
+ gensec_want_feature(session-gensec_security,
GENSEC_FEATURE_UNIX_TOKEN);
status = gensec_start_mech_by_oid(session-gensec_security,
GENSEC_OID_NTLMSSP);
if (!NT_STATUS_IS_OK(status)) {
@@ -569,6 +570,7 @@ static NTSTATUS smbd_smb2_spnego_auth(struct
smbd_smb2_session *session,
}
gensec_want_feature(session-gensec_security,
GENSEC_FEATURE_SESSION_KEY);
+ gensec_want_feature(session-gensec_security,
GENSEC_FEATURE_UNIX_TOKEN);
status = gensec_start_mech_by_oid(session-gensec_security,
GENSEC_OID_NTLMSSP);
if (!NT_STATUS_IS_OK(status)) {
@@ -643,6 +645,7 @@ static NTSTATUS smbd_smb2_raw_ntlmssp_auth(struct
smbd_smb2_session *session,
}
gensec_want_feature(session-gensec_security,
GENSEC_FEATURE_SESSION_KEY);
+ gensec_want_feature(session-gensec_security,
GENSEC_FEATURE_UNIX_TOKEN);
if (session-sconn-use_gensec_hook) {
status =
gensec_start_mech_by_oid(session-gensec_security, GENSEC_OID_SPNEGO);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1798609 s3: Split a line with 1 statements
from d3e5a0b s3:smbd: explicitly ask for GENSEC_FEATURE_UNIX_TOKEN
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 17986097a39bf2479f244abf40acafa84dfbcd1d
Author: Volker Lendecke v...@samba.org
Date: Thu Jan 12 11:36:02 2012 +0100
s3: Split a line with 1 statements
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Thu Jan 12 13:10:19 CET 2012 on sn-devel-104
---
Summary of changes:
source3/modules/vfs_gpfs.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index ba6ec6d..a588ed1 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -1264,7 +1264,8 @@ int vfs_gpfs_connect(struct vfs_handle_struct *handle,
const char *service,
config = talloc_zero(handle-conn, struct gpfs_config_data);
if (!config) {
SMB_VFS_NEXT_DISCONNECT(handle);
- DEBUG(0, (talloc_zero() failed\n)); return -1;
+ DEBUG(0, (talloc_zero() failed\n));
+ return -1;
}
config-sharemodes = lp_parm_bool(SNUM(handle-conn), gpfs,
--
Samba Shared Repository
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 785c9b6 Add ; after lt and gt from a0827cf Use lt gt instead of and http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 785c9b6d398af27456a142571c577adee4e9ca29 Author: Lars Müller l...@samba.org Date: Thu Jan 12 13:13:34 2012 +0100 Add ; after lt and gt Signed-off-by: SATOH Fumiyasu --- Summary of changes: devel/copyright-policy.html |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/devel/copyright-policy.html b/devel/copyright-policy.html index 42caac5..d24eddc 100644 --- a/devel/copyright-policy.html +++ b/devel/copyright-policy.html @@ -109,7 +109,7 @@ above, add a line that states: pre code - Signed-off-by: Random J Developer ltran...@developer.example.orggt + Signed-off-by: Random J Developer lt;ran...@developer.example.orggt; /code /pre -- Samba Website Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0f14ac4 s4:pygensec/tests: add test for gensec_set_max_update_size()
via 891318e s4:auth/gensec/spnego: add support for fragmented spnego
messages
via b3f8f7e s4:pygensec: add set_max_update_size() and
max_update_size() functions
via 6eea2c3 auth/gensec: add gensec_*max_update_size()
from 1798609 s3: Split a line with 1 statements
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0f14ac40a29bb23bb0a417df4bbeee009400f33e
Author: Stefan Metzmacher me...@samba.org
Date: Wed Jan 11 16:00:59 2012 +0100
s4:pygensec/tests: add test for gensec_set_max_update_size()
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Thu Jan 12 14:47:05 CET 2012 on sn-devel-104
commit 891318ee4cc77077525e698d21398c6db82f0a1a
Author: Stefan Metzmacher me...@samba.org
Date: Sat Dec 24 00:27:45 2011 +0100
s4:auth/gensec/spnego: add support for fragmented spnego messages
metze
commit b3f8f7e8a3c28bc74f252534b1c45c9ed52d8ebe
Author: Stefan Metzmacher me...@samba.org
Date: Wed Jan 11 14:53:52 2012 +0100
s4:pygensec: add set_max_update_size() and max_update_size() functions
metze
commit 6eea2c33c797065f7b189d32648d2cfde5d2e3b9
Author: Stefan Metzmacher me...@samba.org
Date: Sat Dec 24 01:14:26 2011 +0100
auth/gensec: add gensec_*max_update_size()
This is only a hint for the backend, which may want to fragment
update tokens.
metze
---
Summary of changes:
auth/gensec/gensec.c | 15 ++
auth/gensec/gensec.h |4 +
auth/gensec/gensec_start.c |3 +
source4/auth/gensec/pygensec.c | 25 +++
source4/auth/gensec/spnego.c | 208 +++-
source4/scripting/python/samba/tests/gensec.py | 54 ++
6 files changed, 306 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/gensec/gensec.c b/auth/gensec/gensec.c
index ec104a7..d1dcc75 100644
--- a/auth/gensec/gensec.c
+++ b/auth/gensec/gensec.c
@@ -185,6 +185,21 @@ _PUBLIC_ NTSTATUS gensec_session_info(struct
gensec_security *gensec_security,
return gensec_security-ops-session_info(gensec_security, mem_ctx,
session_info);
}
+void gensec_set_max_update_size(struct gensec_security *gensec_security,
+ uint32_t max_update_size)
+{
+ gensec_security-max_update_size = max_update_size;
+}
+
+size_t gensec_max_update_size(struct gensec_security *gensec_security)
+{
+ if (gensec_security-max_update_size == 0) {
+ return UINT32_MAX;
+ }
+
+ return gensec_security-max_update_size;
+}
+
/**
* Next state function for the GENSEC state machine
*
diff --git a/auth/gensec/gensec.h b/auth/gensec/gensec.h
index a1ae634..9982718 100644
--- a/auth/gensec/gensec.h
+++ b/auth/gensec/gensec.h
@@ -167,6 +167,7 @@ struct gensec_security {
enum gensec_role gensec_role;
bool subcontext;
uint32_t want_features;
+ uint32_t max_update_size;
uint8_t dcerpc_auth_level;
struct tsocket_address *local_addr, *remote_addr;
struct gensec_settings *settings;
@@ -223,6 +224,9 @@ NTSTATUS gensec_start_mech_by_ops(struct gensec_security
*gensec_security,
const struct gensec_security_ops *ops);
NTSTATUS gensec_start_mech_by_sasl_list(struct gensec_security
*gensec_security,
const char **sasl_names);
+void gensec_set_max_update_size(struct gensec_security *gensec_security,
+ uint32_t max_update_size);
+size_t gensec_max_update_size(struct gensec_security *gensec_security);
NTSTATUS gensec_update(struct gensec_security *gensec_security, TALLOC_CTX
*out_mem_ctx,
struct tevent_context *ev,
const DATA_BLOB in, DATA_BLOB *out);
diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c
index 9576e53..016967a 100644
--- a/auth/gensec/gensec_start.c
+++ b/auth/gensec/gensec_start.c
@@ -518,6 +518,8 @@ static NTSTATUS gensec_start(TALLOC_CTX *mem_ctx,
(*gensec_security) = talloc_zero(mem_ctx, struct gensec_security);
NT_STATUS_HAVE_NO_MEMORY(*gensec_security);
+ (*gensec_security)-max_update_size = 0;
+
SMB_ASSERT(settings-lp_ctx != NULL);
(*gensec_security)-settings = talloc_reference(*gensec_security,
settings);
@@ -550,6 +552,7 @@ _PUBLIC_ NTSTATUS gensec_subcontext_start(TALLOC_CTX
*mem_ctx,
(*gensec_security)-subcontext = true;
(*gensec_security)-want_features = parent-want_features;
+ (*gensec_security)-max_update_size = parent-max_update_size;
[SCM] CTDB repository - branch 1.0.114 updated - ctdb-1.0.114.3-82-g10dce70
The branch, 1.0.114 has been updated via 10dce70bf8a238702a5b81ffa8ea89edea9fc61f (commit) via 09c76d906a8e79ff74578d617432dd76c504f700 (commit) via ef41e0d2173a208a6536238f9829fb99b1394a44 (commit) via 2e324e2a5000b4eb6676bee35ff2a885f992a159 (commit) via 7f8bf1e36410b6513078c1004ced55d5e8950a52 (commit) via bc22f94f68a346e8e867a91aa05e0be27accb2ba (commit) via 7f73968b20be32754b71f88840443797730f24a8 (commit) via 1f81243770c16daf2755205598c3ed5677bdaa25 (commit) via 52d5095790e8be9f46e9dcb3eb3f4763a0442eda (commit) via b442fe628a0c7a967432f5900c850d7b27a2958f (commit) via 9339dcbd00deabd3ecdcef552ef62777b0b74cfe (commit) via 4c17aa592039b4e6c4db21aae8f463a931ad4185 (commit) via a7d1706c8ebfaa701a7de26f5bceb380cf7f5eb5 (commit) via 2c2eacd2582013e7d7066fa20b7deefcb3086951 (commit) via 2b1b769953f4b0eb922febff625470d0ac12bf3c (commit) via 25ec7c15aa73f238262ebd629b87a00f17ca3291 (commit) via 817f792859e1d27538240e81f24f6220881c1847 (commit) via 6df39465cade56768d8f039ba9ddd4da4894fbbc (commit) via a43455c4529602d58115baa7619021bcc0ed63bf (commit) via de96bae3f567bd1f4de66118792638daa259a635 (commit) via cd81d32b5646906663c713af6615ba90f4de3445 (commit) via 76521192d6dc8759caeb88a0868eb96b8c44c80a (commit) via b41b8388055c3e390851306b4efb10950985668c (commit) via a0d4d199362497b0e5f6eec2c2619ffa6d20bfb6 (commit) via cadad9bf4ca2f636cc97062f7b02b05127d3aac7 (commit) via c616a26447f470208577bbc7df50eae881da3f55 (commit) via e83baa1242b9f120fea4ba778168e5d0a3822f96 (commit) via b05b413bc49fdab4723dd47e71bb10f454a7756e (commit) via f0925fc2802dad4f73f2e1dfd980273e18d3d6a2 (commit) via 9eaf33552513a082940731639f30e0b42bf3865d (commit) via 3c14c72ea749230264165a7f6dea0b7779ae9f75 (commit) via e978f49e507cbbe0211453b5658e69a243d61f5f (commit) via ce32c2f05cd998c1f8b76108bd51ff10e42fcb01 (commit) via 9351e4d8081f9197c7fa8b407c747731326697fa (commit) via a1c3aca9a7c6be049bd1e1ce73837eafde4ec847 (commit) via c4bf65859a6d61c01d94ade7bbbf4eee28d3682d (commit) via f8136e7362a8784b80a8aa6a3b4a193964856002 (commit) via fd92aab082cd80bf7e495b4ffcd14777843b3664 (commit) via 988e2eeb8a19d0b5b4f90fb8f1a6e20fabc4f34b (commit) via 793a9469a7c7fcf48e6210dc2a3ec240d6fd7ec2 (commit) via a2297986cb34972d719e286f683a5a4be802b1b0 (commit) via df8848de3f6d7cee8c3d31bc412ea1f7edca33c0 (commit) via 99185969ea0bd298e11408f526b07ff1435caa9c (commit) via 85c90854c70023e966aba7ef63de83153d29005c (commit) via d89e9686fcfb147515155a082e08f16645efade8 (commit) via 451843e4251c2c8a4393fd2b3dbd83a5b8036f5b (commit) via c9231900a7a356b77741fbc45af39702e524ecd6 (commit) via 9f123c01ea118623d02d95cd4e39d92717acd600 (commit) via 470f9ecddd7288199c8a5224eca46fcb966688ff (commit) via 686bf255af9f4ff965f4987677074ea6edacdb31 (commit) via c3d1b5f405e7474759b38292ffd5e1b91a726f3b (commit) via 44668022af30d1386924e6ec620adab8b7c4465c (commit) via aa4b194516bca264450b38ab174b8520c22fe4c0 (commit) via 00719defe07966d473a92a12d52787c80f9d6a93 (commit) via cab84f289f774397574351fd081da0cb177fe2ed (commit) via 9445f108d705dfe500431fc12a58134078f427db (commit) via 1a8813f1eb734d86c39cba76c5dc1b8814df47ad (commit) via 91dcc9e08dfa6e3609f6e625b22dd913d9d53229 (commit) via 37f82d3d531f5a5db59745586f48af820e9f47c8 (commit) via b0a6758e7e31aee5179f251e3b0c61b286eba489 (commit) via 0eefb7dce5f0a4fb72bbcaa1062bf7e0e4ff0fbf (commit) via 4b15ff406f87a0e25dd23ab5f327bb8cc780a6e9 (commit) via a39b06f6c74a55b6fb910a7f73872a67d290df52 (commit) via 97dcd371a733cf98f8c646acd9d571ddbaf025c1 (commit) via b48a5f21b3a87550fc5ecc7016f5d02ea4956ddf (commit) via 0c966a5be2398f3f676c0ceadfa2d143f7646bc5 (commit) via 2c00993aff00d9db57539baeb0fa6e5f2fa4cec0 (commit) via b2b0ac626dd8c4206f3cb1059527bd5cb56a012e (commit) via 6bc88b966f3f1da4fb27911fc9023f4f609ef46c (commit) via db02dc3d80d311ed932975765c004f2d0c9f51ff (commit) via 3aabb0ea3b512d7474564bc7bae9ec6925fa25ef (commit) via 4c5589f6c7334445eb215025d98e12d48fde9cd3 (commit) via 7b45aa95c8c98991897905109090449318eaaea6 (commit) via cbcf3b4983a63d52110e23cd97ffc8b612dc477c (commit) via 1a9e95992e6962b06ae9502391d10dd966dbd7ef (commit) via cc179bf2e72b6922a032a691fdb3e4e43ecb4386 (commit) via 500405bb626bef80e41662753853b940c0095da2 (commit) via 000c4f89de401435be93d33abf109f0efc6c71f2 (commit) via 2b0cf32fe1494ca3aeb08a98c03b20a04c9be7ca (commit) from 0dfc98ebacfd72a7fb9bf340260f00f5eed7355e (commit)
[SCM] CTDB repository - annotated tag ctdb-1.0.114.4 created - ctdb-1.0.114.4
The annotated tag, ctdb-1.0.114.4 has been created
at aeb27d1ee3d6c5d85c305c75b824769d864c87bc (tag)
tagging 10dce70bf8a238702a5b81ffa8ea89edea9fc61f (commit)
replaces ctdb-1.0.114.3
tagged by Michael Adam
on Thu Jan 12 14:49:41 2012 +0100
- Log -
tag version 1.0.114.4
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEABECAAYFAk8O5QcACgkQyU9JOBhPkDQYzgCggKdP7HelPNnosrMvrvGqMmqk
NEoAn2kNmEj5Hf8qIJCq6xNIv1kT4LOz
=5INF
-END PGP SIGNATURE-
David Disseldorp (1):
io: Make queue_io_read() safe for reentry
Gregor Beck (1):
ltdbtool: ignore empty (deleted) records per default.
Mathieu Parent (1):
Correction of spelling errors
Michael Adam (67):
packaging: honour rpm build target options handed in to makerpms.sh
vacuum: rename size to freelist_size for clarity
vacuum: fix an abundance of indentation white spaces in ctdb_vacuum_db()
vacuum: fix a comment typo in vacuum_traverse()
vacuum: fix horrible indentation/whitespacing for ctdb_vacuum_event()
vacuum: fix a comment typo in vacuum_traverse()
vacuum: write a big and up-to-date explaining comment for ctdb_vacuum_db()
vacuum: update (C) from vacuum rewrite
traverse: add a flag to enable transferring empty records in cluster wide
traverse
client: add version ctdb_traverse_ext() of ctdb_traverse() that can list
empty records.
ctdb: add an option --print-emptyrecords to enable printing of empty
records in dumping databases
doc: document the --print-emptyrecords switch in the ctdb manpage.
ctdb: add an option --print-datasize to only print datasize instead of
dumping data in db dumps
doc: document the --print-datasize parameter to ctdb
ctdb: add an option --print-lmaster to enable printing of lmaster in
ctdb catdb
doc: document the --print-lmaster parameter to ctdb
ctdb: add an option --print-hash to enable printing of record hashes when
dumping dbs
ctdb: add output of jenkins hash to ctdb catdb (with --print-hash)
doc: document the --print-hash parameter to ctdb.
ctdb: add an option --print-recordflags to trigger printing record flags
in catdb and dumpdbbackup
doc: document the --print-recordflags parameter to ctdb
doc: commit generated ctdb.1 manpages after xml change
traverse: fix traversing with empty records by adding a new (internal)
control CTDB_CONTROL_TRAVERSE_START_EXT
fix zero-initialization of header in _ctdbd_allocate_pkt to the correct
size
rb_tree: fix possible access-after-free-error in trbt_traversearray32_node
vacuum: add ctdb_local_remove_from_delete_queue()
ctdb_ltdb_store_server: when storing a record that is not to be scheduled
for deletion, remove it from the delete queue
vacuum: remove update_tuning_db()
vacuum: change get_vacuum_interval() to simply return the
VacuumDefaultInterval tunable
vacuum: use get_vacuum_interval() in ctdb_vacuum_event()
vacuum: remove struct vacuum_tuning_data (unused)
vacuum: add new tunable VacuumInterval and mark
Vacuum{Default,Min,Max}Interval obsolete
vacuum: fix the VacuumInterval tunable's type to uint32_t in
get_vacuum_interval()
vacuum: initialize the delete_count in the vacuum data
vacuum: appropriately rename delete_traverse() to
delete_marshall_traverse()
vacuum: fix and improve a comment
vacuum: improve vacuuming statistics for handling the delete_tree.
vacuum: locally delete the records in the delete_tree that have be
deleted remotely
tools/ctdb: remove functionality of ctdb vacuum, just keeping a stub.
tools/ctdb: allow the ctdb vacuum stub to be run without the daemon
running.
vacuum: introduce a helper variable in add_record_to_vacuum_fetch_list()
to reduce verbosity
vacuum: introduce a helper variable for the vacuum fetch list in
ctdb_vacuum_db()
vacuum: appropriately rename vdata.list to vdata.vacuum_fetch_list
vacuum: rename delete_tree to delete_list
vacuum: factor out the fast vacuuming run into ctdb_vacuum_db_fast()
vacuum: factor out full vacuum run out of ctdb_vacuum_db() as
ctdb_vacuum_db_full()
vacuum: factor processing of vacuum fetch lists out of ctdb_vacuum_db()
vacuum: factor processing of the delete list out of ctdb_vacuum_db()
vacuum: streamline ctdb_process_delete_list()
vacuum: factor out initialization of the vacuum data from ctdb_vacuum_db()
vacuum: add a comment explaining a race in the vacuum code.
vacuum: add statistics output for processing of the delete list
vacuum: initialize (to zero) the vacuum fetch list in
ctdb_vacuum_init_vacuum_data()
vacuum: improve debugging in insert_record_into_delete_queue()
vacuum: add debug message to insert_record_into_delete_queue() for failed
insert
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 103c1cb s3-waf: auth_netlogond depends on tldap.
via ad6d8a5 s3-waf: link SECRETS3 only against samba3util.
via 9bafbf9 s3-waf: Create a smaller samba3util subsystem.
from 0f14ac4 s4:pygensec/tests: add test for gensec_set_max_update_size()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 103c1cb9bf71af1925feb07386a6920807aceca3
Author: Andreas Schneider a...@samba.org
Date: Thu Jan 12 14:50:40 2012 +0100
s3-waf: auth_netlogond depends on tldap.
Autobuild-User: Andreas Schneider a...@cryptomilk.org
Autobuild-Date: Thu Jan 12 17:33:10 CET 2012 on sn-devel-104
commit ad6d8a526e6bbcec1a9db25faf3f8849cd9e9dee
Author: Andreas Schneider a...@samba.org
Date: Thu Jan 12 13:39:39 2012 +0100
s3-waf: link SECRETS3 only against samba3util.
commit 9bafbf99947d24c8e9fad7e8927cfbe4060d6079
Author: Andreas Schneider a...@samba.org
Date: Thu Jan 12 13:39:17 2012 +0100
s3-waf: Create a smaller samba3util subsystem.
---
Summary of changes:
source3/auth/wscript_build |1 +
source3/wscript_build | 27 +++
2 files changed, 20 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index 4894e35..4f04772 100644
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -96,6 +96,7 @@ bld.SAMBA3_MODULE('auth_builtin',
bld.SAMBA3_MODULE('auth_netlogond',
subsystem='auth',
source=AUTH_NETLOGOND_SRC,
+ deps='TLDAP',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_netlogond'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_netlogond'))
diff --git a/source3/wscript_build b/source3/wscript_build
index 12e6fb9..4690561 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -48,20 +48,14 @@ LIB_SRC = '''
lib/id_cache.c
lib/talloc_dict.c
lib/serverid.c
- lib/util_transfer_file.c
lib/addrchange.c
${TDB_LIB_SRC}
../lib/util/debug_s3.c
lib/dumpcore.c
lib/interface.c lib/pidfile.c
- lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c
lib/username.c
lib/access.c lib/smbrun.c
lib/wins_srv.c
- lib/util_sid.c
- lib/util_file.c
- lib/util.c
- lib/util_sock.c lib/sock_exec.c
lib/substitute.c lib/substitute_generic.c
lib/ms_fnmatch.c
lib/tallocmsg.c lib/dmallocmsg.c
@@ -77,6 +71,18 @@ LIB_SRC = '''
libads/krb5_errs.c lib/system_smbd.c lib/audit.c
lib/file_id.c lib/idmap_cache.c'''
+LIB_UTIL_SRC = '''
+ lib/system.c
+ lib/sendfile.c
+ lib/recvfile.c
+ lib/time.c
+ lib/util_sid.c
+ lib/util_file.c
+ lib/util.c
+ lib/util_sock.c
+ lib/util_transfer_file.c
+ lib/sock_exec.c'''
+
POPT_LIB_SRC = '''lib/popt_common.c'''
PARAM_UTIL_SRC = '''param/util.c'''
@@ -796,9 +802,14 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
public_deps='KRB5_WRAP k5crypto LIBTSOCKET CLDAP',
vars=locals())
+bld.SAMBA3_SUBSYSTEM('samba3util',
+ source=LIB_UTIL_SRC,
+ deps='ndr security NDR_SECURITY samba-util',
+ vars=locals())
+
bld.SAMBA3_SUBSYSTEM('samba3core',
source=LIB_SRC,
- deps='LIBTSOCKET LIBCRYPTO ndr security NDR_SECURITY
samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION
KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param
util_str CHARSET3 namearray dbwrap util_sec util_malloc memcache ccan errors3
samba-modules',
+ deps='samba3util LIBTSOCKET LIBCRYPTO NDR_MESSAGING
LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping
util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3
namearray dbwrap util_sec util_malloc memcache ccan errors3 samba-modules',
vars=locals())
bld.SAMBA3_LIBRARY('smbd_shim',
@@ -838,7 +849,7 @@ bld.SAMBA3_SUBSYSTEM('CLDAP',
bld.SAMBA3_SUBSYSTEM('SECRETS3',
source=SECRETS_SRC,
- deps='NDR_SECRETS param samba3core pdb',
+ deps='NDR_SECRETS param samba3util dbwrap pdb',
vars=locals())
bld.SAMBA3_LIBRARY('smbldap',
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 15cdbba s4:repl_cleartext_pwd.py: add optional 'clear_utf16_name'
parameter
via 5efe29b s4:repl_cleartext_pwd.py: add 'attmode' parameter to
convert the attname to utf8
via 9a8b72a s4:repl_cleartext_pwd.py: correctly compare attids as
uint32_t values
from 103c1cb s3-waf: auth_netlogond depends on tldap.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 15cdbba25469d65fc0b74d1a8ada3f5f35bd7c29
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 10 15:14:08 2012 +0100
s4:repl_cleartext_pwd.py: add optional 'clear_utf16_name' parameter
Not all cleartext password (machine passwords) can be converted to utf8,
let's export the raw uint16_t array.
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Thu Jan 12 23:58:12 CET 2012 on sn-devel-104
commit 5efe29baed70b0cbe732350a02b24fc23016e552
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 10 15:15:19 2012 +0100
s4:repl_cleartext_pwd.py: add 'attmode' parameter to convert the attname to
utf8
metze
commit 9a8b72a3180b6aa1beb4b153867d4f9f0df953a1
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 10 15:12:00 2012 +0100
s4:repl_cleartext_pwd.py: correctly compare attids as uint32_t values
metze
---
Summary of changes:
source4/scripting/devel/repl_cleartext_pwd.py | 62 +++--
1 files changed, 47 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/devel/repl_cleartext_pwd.py
b/source4/scripting/devel/repl_cleartext_pwd.py
index ac650d9..840d281 100755
--- a/source4/scripting/devel/repl_cleartext_pwd.py
+++ b/source4/scripting/devel/repl_cleartext_pwd.py
@@ -71,30 +71,50 @@ class globals:
continue
self.global_objs = {}
+def attid_equal(a1,a2):
+return (a1 0x) == (a2 0x)
+
### main code ###
if __name__ == __main__:
-parser = OptionParser(repl_cleartext_pwd.py [options] server dn
cookie_file cleartext_name [attid attname])
+parser = OptionParser(repl_cleartext_pwd.py [options] server dn
cookie_file clear_utf8_name [attid attname attmode] [clear_utf16_name)
sambaopts = options.SambaOptions(parser)
credopts = options.CredentialsOptions(parser)
parser.add_option_group(credopts)
(opts, args) = parser.parse_args()
-if len(args) 4 or len(args) == 5:
-parser.error(more arguments required)
+if len(args) == 4:
+pass
+elif len(args) == 7:
+pass
+elif len(args) = 8:
+pass
+else:
+parser.error(more arguments required - given=%d % (len(args)))
server = args[0]
dn = args[1]
cookie_file = args[2]
if len(cookie_file) == 0:
cookie_file = None
-cleartext_name = args[3]
-if len(args) = 5:
-attid = int(args[4])
+clear_utf8_name = args[3]
+if len(args) = 7:
+try:
+attid = int(args[4], 16)
+except:
+attid = int(args[4])
attname = args[5]
+attmode = args[6]
+if attmode not in [raw, utf8]:
+parser.error(attmode should be 'raw' or 'utf8')
else:
attid = -1
attname = None
+attmode = raw
+if len(args) = 8:
+clear_utf16_name = args[7]
+else:
+clear_utf16_name = None
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp)
@@ -232,7 +252,7 @@ if __name__ == __main__:
is_deleted = False
for i in range(0, obj.attribute_ctr.num_attributes):
attr = obj.attribute_ctr.attributes[i]
-if attr.attid == drsuapi.DRSUAPI_ATTID_isDeleted:
+if attid_equal(attr.attid, drsuapi.DRSUAPI_ATTID_isDeleted):
is_deleted = True
if is_deleted:
obj_item = obj_item.next_object
@@ -242,19 +262,27 @@ if __name__ == __main__:
attvals = None
for i in range(0, obj.attribute_ctr.num_attributes):
attr = obj.attribute_ctr.attributes[i]
-if attr.attid == attid:
+if attid_equal(attr.attid, attid):
attvals = []
for j in range(0, attr.value_ctr.num_values):
assert attr.value_ctr.values[j].blob is not None
-attvals.append(attr.value_ctr.values[j].blob)
-if attr.attid != drsuapi.DRSUAPI_ATTID_supplementalCredentials:
+val_raw = attr.value_ctr.values[j].blob
+val = None
+if attmode == utf8:
+val_unicode = unicode(val_raw, 'utf-16-le')
+val =
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6c1d98e Add comments to all functions (to help me understand it
better).
via 6da246b s3: Fix nested get_share_mode_lock calls
via 6f9442a s3: Move the share_mode_lock handling to its own file
via cfebba9 s3: Put an indirection layer into share_mode_lock
via 9cf6d73 s3: Introduce get_share_mode_lock_fresh()
via 540e51f s3: Replace fill_share_mode_lock()
from 15cdbba s4:repl_cleartext_pwd.py: add optional 'clear_utf16_name'
parameter
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6c1d98eac06df7f033d8a69bb5be985067f96c9b
Author: Jeremy Allison j...@samba.org
Date: Thu Jan 12 14:46:45 2012 -0800
Add comments to all functions (to help me understand it better).
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Fri Jan 13 01:35:03 CET 2012 on sn-devel-104
commit 6da246bae1b000cb3191e114e978510ccacb7e90
Author: Volker Lendecke v...@samba.org
Date: Tue Jan 10 17:07:29 2012 +0100
s3: Fix nested get_share_mode_lock calls
This forces us to only do one real get_share_mode_lock call and
share the data between the nested get_share_mode_lock calls.
Signed-off-by: Jeremy Allison j...@samba.org
commit 6f9442a705b7ca67c78137db537f556385aa8558
Author: Volker Lendecke v...@samba.org
Date: Tue Jan 10 14:13:49 2012 +0100
s3: Move the share_mode_lock handling to its own file
Signed-off-by: Jeremy Allison j...@samba.org
commit cfebba96bdab2097b6115f10b649ec6c23c72519
Author: Volker Lendecke v...@samba.org
Date: Tue Jan 10 13:56:37 2012 +0100
s3: Put an indirection layer into share_mode_lock
Signed-off-by: Jeremy Allison j...@samba.org
commit 9cf6d735d43f6f905b19f52d38c93aa30092333d
Author: Volker Lendecke v...@samba.org
Date: Mon Jan 9 14:30:53 2012 +0100
s3: Introduce get_share_mode_lock_fresh()
This slightly simplifies the code path for all callers which assume
that a share mode exists already. Only the callers in open_file_ntcreate
and open_directory will ever create new share modes.
Signed-off-by: Jeremy Allison j...@samba.org
commit 540e51f77e07cc65b6b097f8ff01cd10f04644d0
Author: Volker Lendecke v...@samba.org
Date: Mon Jan 9 14:09:28 2012 +0100
s3: Replace fill_share_mode_lock()
This replaces fill_share_mode_lock() with the two routines
fresh_share_mode_lock() and parse_share_modes(). This lifts the
decision whether a share mode already existed on level up.
Signed-off-by: Jeremy Allison j...@samba.org
---
Summary of changes:
source3/Makefile.in |2 +-
source3/include/smb.h |4 +
source3/librpc/idl/open_files.idl |2 +-
source3/locking/locking.c | 557 +
source3/locking/proto.h | 11 +-
source3/locking/share_mode_lock.c | 542
source3/smbd/close.c | 30 +--
source3/smbd/open.c | 53 ++--
source3/smbd/oplock.c | 15 +-
source3/smbd/reply.c |7 +-
source3/smbd/trans2.c |7 +-
source3/utils/status.c|8 +-
source3/wscript_build |2 +-
13 files changed, 687 insertions(+), 553 deletions(-)
create mode 100644 source3/locking/share_mode_lock.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index c3dbd31..b92097c 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -793,7 +793,7 @@ RPC_SERVER_OBJ = $(RPC_LSARPC_OBJ) $(RPC_WINREG_OBJ)
$(RPC_INITSHUTDOWN_OBJ) \
RPC_CLIENT_SCHANNEL_OBJ = rpc_client/cli_pipe_schannel.o
LOCKING_OBJ = locking/locking.o locking/brlock.o locking/posix.o \
- librpc/gen_ndr/ndr_open_files.o
+ librpc/gen_ndr/ndr_open_files.o locking/share_mode_lock.o
PRIVILEGES_BASIC_OBJ = ../libcli/security/privileges.o
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 2adfa36..11a05f9 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -163,6 +163,10 @@ struct wb_context;
struct rpc_cli_smbd_conn;
struct fncall_context;
+struct share_mode_lock {
+ struct share_mode_data *data;
+};
+
struct vfs_fsp_data {
struct vfs_fsp_data *next;
struct vfs_handle_struct *owner;
diff --git a/source3/librpc/idl/open_files.idl
b/source3/librpc/idl/open_files.idl
index 9f06a0c..cefb75a 100644
--- a/source3/librpc/idl/open_files.idl
+++ b/source3/librpc/idl/open_files.idl
@@ -44,5 +44,5 @@ interface open_files
uint8 fresh;
uint8 modified;
[ignore] db_record *record;
- } share_mode_lock;
+ } share_mode_data;
}
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 84ad540 selftest: Do not run symbol check if setting up testenv
from 6c1d98e Add comments to all functions (to help me understand it
better).
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 84ad540ab97b64002fd15c0ad3fe07ca61054923
Author: Amitay Isaacs ami...@gmail.com
Date: Thu Jan 12 15:34:16 2012 +1100
selftest: Do not run symbol check if setting up testenv
Autobuild-User: Amitay Isaacs ami...@samba.org
Autobuild-Date: Fri Jan 13 03:11:20 CET 2012 on sn-devel-104
---
Summary of changes:
selftest/wscript |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/wscript b/selftest/wscript
index 67ea5a4..4bd4e66 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -210,7 +210,7 @@ def cmd_test(opt):
# if running all tests, then force a symbol check
env = LOAD_ENVIRONMENT()
CHECK_MAKEFLAGS(env)
-if not Options.options.TESTS:
+if not Options.options.TESTS and not Options.options.TESTENV:
Options.options.DUP_SYMBOLCHECK = True
Scripting.commands.append('build')
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 339d5ea s3-selftest The krb5 encrypted CIFS test was wrong from 84ad540 selftest: Do not run symbol check if setting up testenv http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 339d5ea4e60c4e649e9f29814c5c93b4c0673c3c Author: Andrew Bartlett abart...@samba.org Date: Fri Jan 13 12:42:43 2012 +1100 s3-selftest The krb5 encrypted CIFS test was wrong Sadly this fails in the test environement for now. It needs a /etc/krb5.keytab which we do not provide. Andrew Bartlett Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Fri Jan 13 04:57:22 CET 2012 on sn-devel-104 --- Summary of changes: selftest/knownfail|3 +++ source3/selftest/tests.py |2 +- 2 files changed, 4 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/selftest/knownfail b/selftest/knownfail index 4a9f99e..b0246e7 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -20,6 +20,9 @@ ^samba3.blackbox.rpcclient over ncacn_np with \[spnego,smb2,bigendian\] ^samba3.blackbox.rpcclient over ncacn_np with \[spnego,connect,smb2\] ^samba3.blackbox.rpcclient over ncacn_np with \[spnego,connect,smb2,bigendian\] +# GSSAPI/krb5 encrypted CIFS fails in the test environment at the moment +^samba3.blackbox.smbclient_krb5 -e.smbclient +^samba3.blackbox.smbclient_krb5 old ccache -e.smbclient # these show that we still have some differences between our system # with our internal iconv because it passes except when we bypass our # internal iconv modules diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index dc0c32c..eea9aae 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -305,7 +305,7 @@ for z in smb_options: if have_ads_support: -options_list = [, -E] +options_list = [, -e] for options in options_list: plantestsuite(samba3.blackbox.smbclient_krb5 old ccache %s % options, ktest:local, [os.path.join(samba3srcdir, script/tests/test_smbclient_krb5.sh), -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 342be28 s3:build: add auth/gensec/spnego.o
via 01f246e auth/gensec: move spnego.c to the toplevel
via d88af2f auth/gensec: common helper functions should be in
gensec_util.c
via 3ad7ca5 s4:auth/gensec: inline packet_full_request_u32()
via edaa933 auth/gensec: add some more functions from gensec_start.c to
gensec.h
via bb6e648 auth/gensec: make sure functions from gensec.c are in
gensec.h
via 36829cf s4:auth/gensec: fix compiler warnings in spnego.c
from 339d5ea s3-selftest The krb5 encrypted CIFS test was wrong
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 342be2851a286588ebe5d0cc7e98fc22e9416d80
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jan 12 15:42:08 2012 +0100
s3:build: add auth/gensec/spnego.o
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Fri Jan 13 06:32:30 CET 2012 on sn-devel-104
commit 01f246e873ed15ce7eb9c7a523a5efbfa36c2496
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jan 12 12:21:21 2012 +0100
auth/gensec: move spnego.c to the toplevel
metze
commit d88af2fe24bfc3a55cd2bbfc8898a8dd21cc7cda
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jan 12 22:03:07 2012 +0100
auth/gensec: common helper functions should be in gensec_util.c
This makes the dependencies easier to handle.
metze
commit 3ad7ca59b3914c41486953ebe00221737ccf3d15
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jan 12 22:56:03 2012 +0100
s4:auth/gensec: inline packet_full_request_u32()
This removes the dependency to s4 specific code.
metze
commit edaa933b17b98223f0a951777ff507d96692229a
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jan 12 16:18:38 2012 +0100
auth/gensec: add some more functions from gensec_start.c to gensec.h
metze
commit bb6e64802ee16bf694639546e131817459b26fca
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jan 12 16:18:38 2012 +0100
auth/gensec: make sure functions from gensec.c are in gensec.h
metze
commit 36829cff8f006c52af8d43484f9252f9d1cbd745
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jan 12 17:07:41 2012 +0100
s4:auth/gensec: fix compiler warnings in spnego.c
metze
---
Summary of changes:
auth/gensec/gensec.c | 10 ++--
auth/gensec/gensec.h | 19 +
auth/gensec/gensec_start.c | 36 ++-
auth/gensec/gensec_util.c | 116
{source4/auth = auth}/gensec/spnego.c |7 +--
auth/gensec/wscript_build |7 ++
source3/Makefile.in| 11 ++--
source3/configure.in |3 +
source4/auth/gensec/socket.c | 99 ---
source4/auth/gensec/wscript_build |9 ---
10 files changed, 178 insertions(+), 139 deletions(-)
rename {source4/auth = auth}/gensec/spnego.c (99%)
Changeset truncated at 500 lines:
diff --git a/auth/gensec/gensec.c b/auth/gensec/gensec.c
index d1dcc75..1e61bf0 100644
--- a/auth/gensec/gensec.c
+++ b/auth/gensec/gensec.c
@@ -111,7 +111,7 @@ _PUBLIC_ size_t gensec_sig_size(struct gensec_security
*gensec_security, size_t
return gensec_security-ops-sig_size(gensec_security, data_size);
}
-size_t gensec_max_wrapped_size(struct gensec_security *gensec_security)
+_PUBLIC_ size_t gensec_max_wrapped_size(struct gensec_security
*gensec_security)
{
if (!gensec_security-ops-max_wrapped_size) {
return (1 17);
@@ -120,7 +120,7 @@ size_t gensec_max_wrapped_size(struct gensec_security
*gensec_security)
return gensec_security-ops-max_wrapped_size(gensec_security);
}
-size_t gensec_max_input_size(struct gensec_security *gensec_security)
+_PUBLIC_ size_t gensec_max_input_size(struct gensec_security *gensec_security)
{
if (!gensec_security-ops-max_input_size) {
return (1 17) - gensec_sig_size(gensec_security, 1 17);
@@ -185,13 +185,13 @@ _PUBLIC_ NTSTATUS gensec_session_info(struct
gensec_security *gensec_security,
return gensec_security-ops-session_info(gensec_security, mem_ctx,
session_info);
}
-void gensec_set_max_update_size(struct gensec_security *gensec_security,
+_PUBLIC_ void gensec_set_max_update_size(struct gensec_security
*gensec_security,
uint32_t max_update_size)
{
gensec_security-max_update_size = max_update_size;
}
-size_t gensec_max_update_size(struct gensec_security *gensec_security)
+_PUBLIC_ size_t gensec_max_update_size(struct gensec_security *gensec_security)
{
if (gensec_security-max_update_size == 0) {
return UINT32_MAX;
@@ -571,7 +571,7 @@ _PUBLIC_ NTSTATUS
