[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 7fb82a5 krb5: Require gss_get_name_attribute or Heimdal's PAC parsing to build with krb5 via 19deda2 krb5: Require krb5_string_to_key be available to build with krb5 via cfe68f2 krb5: Require krb5_set_real_time is available to build with krb5 via 0c6af1e krb5: Require krb5_principal_compare_any_realm be available to build with krb5 via 39d73e2 krb5: Require krb5_get_renewed_creds be available to build with krb5 via a33d86a krb5: Remove now unused checks for krb5_verify_checksum via 39b476d krb5: Require krb5_get_init_creds_opt_alloc/free for build with krb5 via fc7b34c krb5: Require krb5_fwd_tgt_creds to be available to build with krb5 via 016fc0a krb5: Require krb5_get_host_realm and krb5_free_host_realm be available to build with krb5 via 6b2e742 krb5: Require krb5_c_verify_checksum is available to build with krb5 via 17e61e4 krb5: Require krb5_c_enctype_compare is available to build with krb5 from 803dc38 s4:provision: add "+dns" to server services if the dns backend is SAMBA_INTERNAL http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 7fb82a5a247b95bcd981574d6c0db013c954e026 Author: Andrew Bartlett Date: Fri Jan 6 18:32:41 2012 +1100 krb5: Require gss_get_name_attribute or Heimdal's PAC parsing to build with krb5 Autobuild-User: Andrew Bartlett Autobuild-Date: Tue Jan 10 23:23:07 CET 2012 on sn-devel-104 commit 19deda26d0ee61b5e5b41a09181d156b9159663d Author: Andrew Bartlett Date: Thu Jan 5 11:39:14 2012 +1100 krb5: Require krb5_string_to_key be available to build with krb5 commit cfe68f2d5fbd749c3dce7a1a5fa67d2d0a631bf2 Author: Andrew Bartlett Date: Thu Jan 5 11:34:12 2012 +1100 krb5: Require krb5_set_real_time is available to build with krb5 commit 0c6af1e2da4619634c3806b5c0ee022bef935bb5 Author: Andrew Bartlett Date: Thu Jan 5 11:30:22 2012 +1100 krb5: Require krb5_principal_compare_any_realm be available to build with krb5 commit 39d73e2420be17cc7db16353e1a51a5d2123f9f1 Author: Andrew Bartlett Date: Thu Jan 5 11:16:24 2012 +1100 krb5: Require krb5_get_renewed_creds be available to build with krb5 commit a33d86a74592498ec731d57e8cd2ff6a260635bc Author: Andrew Bartlett Date: Thu Jan 5 11:09:46 2012 +1100 krb5: Remove now unused checks for krb5_verify_checksum commit 39b476d1c9f97b5d1fbc9b08d7a85ac0d59934f2 Author: Andrew Bartlett Date: Thu Jan 5 11:06:28 2012 +1100 krb5: Require krb5_get_init_creds_opt_alloc/free for build with krb5 This also assumes the modern API with a krb5_context argument. Andrew Bartlett commit fc7b34c83a2fe44b905e8af44dcb6d06154f688d Author: Andrew Bartlett Date: Thu Jan 5 10:59:44 2012 +1100 krb5: Require krb5_fwd_tgt_creds to be available to build with krb5 commit 016fc0af0c30a22d0154ca6c67bb31bac893fb7b Author: Andrew Bartlett Date: Thu Jan 5 10:54:50 2012 +1100 krb5: Require krb5_get_host_realm and krb5_free_host_realm be available to build with krb5 commit 6b2e742d6c719258c8ff1c2309847e88bdae97e7 Author: Andrew Bartlett Date: Thu Jan 5 10:51:29 2012 +1100 krb5: Require krb5_c_verify_checksum is available to build with krb5 commit 17e61e4290d7d95b0bdd2accda24e526484a1c51 Author: Andrew Bartlett Date: Thu Jan 5 10:46:24 2012 +1100 krb5: Require krb5_c_enctype_compare is available to build with krb5 --- Summary of changes: libcli/auth/krb5_wrap.c | 113 ++- source3/configure.in| 92 +- source3/include/krb5_protos.h |4 - source3/libads/kerberos.c |4 - source3/libsmb/clikrb5.c| 112 ++ source3/wscript | 59 source4/auth/kerberos/kerberos.h|4 - source4/heimdal_build/wscript_configure |4 - 8 files changed, 148 insertions(+), 244 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/auth/krb5_wrap.c b/libcli/auth/krb5_wrap.c index e7e071d..f528822 100644 --- a/libcli/auth/krb5_wrap.c +++ b/libcli/auth/krb5_wrap.c @@ -27,7 +27,7 @@ #include "libcli/auth/krb5_wrap.h" #include "librpc/gen_ndr/krb5pac.h" -#if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_STRING_TO_KEY) && defined(HAVE_KRB5_ENCRYPT_BLOCK) +#if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_ENCRYPT_BLOCK) int create_kerberos_key_from_string_direct(krb5_context context, krb5_principal host_princ, krb5_data *password, @@ -187,35 +187,7 @@ krb5_error_code smb_krb
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 803dc38 s4:provision: add "+dns" to server services if the dns backend is SAMBA_INTERNAL via 83c149d s4:provision: add a server services line to the smb.conf template for the dc via f489c68 s4:provision: add the possibility to provision "server services" in smb.conf via a876d51 s4:provision: improve a message from 0f79184 samba: check for AES encryption type defines. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 803dc389d1ade89708a3fedc91dd2c271f4a495b Author: Michael Adam Date: Sun Jan 8 01:02:58 2012 +0100 s4:provision: add "+dns" to server services if the dns backend is SAMBA_INTERNAL Signed-off-by: Kai Blin Autobuild-User: Kai Blin Autobuild-Date: Tue Jan 10 21:17:45 CET 2012 on sn-devel-104 commit 83c149de4d7ba91f799959bc411516fd163917df Author: Michael Adam Date: Thu Jan 5 00:45:12 2012 +0100 s4:provision: add a server services line to the smb.conf template for the dc Signed-off-by: Kai Blin commit f489c681ea4dcdf13c62876cb0e21ca93882599b Author: Michael Adam Date: Thu Jan 5 00:44:39 2012 +0100 s4:provision: add the possibility to provision "server services" in smb.conf Signed-off-by: Kai Blin commit a876d519fedc50ad4958ae772a2b836f00dcea48 Author: Michael Adam Date: Thu Jan 5 00:05:26 2012 +0100 s4:provision: improve a message Signed-off-by: Kai Blin --- Summary of changes: .../scripting/python/samba/provision/__init__.py | 22 +++ source4/setup/provision.smb.conf.dc|2 + 2 files changed, 19 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index 5c4866c..295e272 100644 --- a/source4/scripting/python/samba/provision/__init__.py +++ b/source4/scripting/python/samba/provision/__init__.py @@ -554,7 +554,8 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, def make_smbconf(smbconf, hostname, domain, realm, serverrole, - targetdir, sid_generator="internal", eadb=False, lp=None): + targetdir, sid_generator="internal", eadb=False, lp=None, + server_services=None): """Create a new smb.conf file based on a couple of basic settings. """ assert smbconf is not None @@ -603,6 +604,11 @@ def make_smbconf(smbconf, hostname, domain, realm, serverrole, privdir = lp.get("private dir") lp.set("posix:eadb", os.path.abspath(os.path.join(privdir, "eadb.tdb"))) +if server_services is not None: +server_services_line = "server services = " + " ".join(server_services) +else: +server_services_line = "" + if targetdir is not None: privatedir_line = "private dir = " + os.path.abspath(os.path.join(targetdir, "private")) lockdir_line = "lock dir = " + os.path.abspath(targetdir) @@ -632,7 +638,8 @@ def make_smbconf(smbconf, hostname, domain, realm, serverrole, "PRIVATEDIR_LINE": privatedir_line, "LOCKDIR_LINE": lockdir_line, "STATEDIR_LINE": statedir_line, -"CACHEDIR_LINE": cachedir_line +"CACHEDIR_LINE": cachedir_line, +"SERVER_SERVICES_LINE": server_services_line }) # reload the smb.conf @@ -1586,6 +1593,10 @@ def provision(logger, session_info, credentials, smbconf=None, if not os.path.exists(os.path.dirname(smbconf)): os.makedirs(os.path.dirname(smbconf)) +server_services = None +if dns_backend == "SAMBA_INTERNAL": +server_services = [ "+dns" ] + # only install a new smb.conf if there isn't one there already if os.path.exists(smbconf): # if Samba Team members can't figure out the weird errors @@ -1596,10 +1607,11 @@ def provision(logger, session_info, credentials, smbconf=None, if data is None or data == "": make_smbconf(smbconf, hostname, domain, realm, serverrole, targetdir, sid_generator, useeadb, - lp=lp) + lp=lp, server_services=server_services) else: make_smbconf(smbconf, hostname, domain, realm, serverrole, - targetdir, sid_generator, useeadb, lp=lp) + targetdir, sid_generator, useeadb, lp=lp, + server_services=server_services) if lp is None: lp = samba.param.LoadParm() @@ -1776,7 +1788,7 @@ def provision(logger, session_info, credentials, smbconf=None, logger.info("Failed to chown %s to bind gid %u", dns_keytab_path, paths.bind_gid) -logger.info("Please install the phpLDAP
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via aa217fb s3-libads: fix malloc/talloc mismatch in ads_keytab_verify_ticket(). from d2aa10c libcli/cldap: fix a crash bug in cldap_socket_recv_dgram() (bug #8593) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit aa217fb42c124800c0e1327768a45b4b07f63e6e Author: Günther Deschner Date: Fri Jan 6 16:10:55 2012 +0100 s3-libads: fix malloc/talloc mismatch in ads_keytab_verify_ticket(). Guenther Fix big #8692 (ads_keytab_verify_ticket mixes talloc allocation with malloc free). (cherry picked from commit 6da7abe87db15d260db807643a25a96fc05e5ad9) --- Summary of changes: source3/libads/kerberos_verify.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/libads/kerberos_verify.c b/source3/libads/kerberos_verify.c index 68ba73c..b4c574a 100644 --- a/source3/libads/kerberos_verify.c +++ b/source3/libads/kerberos_verify.c @@ -268,7 +268,7 @@ static bool ads_keytab_verify_ticket(krb5_context context, } } - SAFE_FREE(entry_princ_s); + TALLOC_FREE(entry_princ_s); { krb5_keytab_entry zero_kt_entry; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 6da7abe s3-libads: fix malloc/talloc mismatch in ads_keytab_verify_ticket(). from 740a001 libcli/cldap: fix a crash bug in cldap_socket_recv_dgram() (bug #8593) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 6da7abe87db15d260db807643a25a96fc05e5ad9 Author: Günther Deschner Date: Fri Jan 6 16:10:55 2012 +0100 s3-libads: fix malloc/talloc mismatch in ads_keytab_verify_ticket(). Guenther Fix big #8692 (ads_keytab_verify_ticket mixes talloc allocation with malloc free). --- Summary of changes: source3/libads/kerberos_verify.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/libads/kerberos_verify.c b/source3/libads/kerberos_verify.c index 7eda7fd..d4c68cd 100644 --- a/source3/libads/kerberos_verify.c +++ b/source3/libads/kerberos_verify.c @@ -298,7 +298,7 @@ out: } } - SAFE_FREE(entry_princ_s); + TALLOC_FREE(entry_princ_s); { krb5_keytab_entry zero_kt_entry; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 740a001 libcli/cldap: fix a crash bug in cldap_socket_recv_dgram() (bug #8593) from ff4e1df s3:lib/ctdbd_conn: try ctdbd_init_connection() as root (bug #8684) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 740a001971bab647c1ab129b3dd2fbccaddc4e7b Author: Stefan Metzmacher Date: Thu Nov 10 14:43:55 2011 +0100 libcli/cldap: fix a crash bug in cldap_socket_recv_dgram() (bug #8593) After a calling any wrapper of tevent_req_notify_callback(), e.g. tevent_req_nterror(), tevent_req_done(), tevent_req_nomem(), a function has to return immediately otherwise it is very likely to crash. metze (similar to commit 17f1a97a614db4ed8292544988cb6a6cf56621d8) --- Summary of changes: libcli/cldap/cldap.c | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c index 363ffbd..aa34a6d 100644 --- a/libcli/cldap/cldap.c +++ b/libcli/cldap/cldap.c @@ -273,12 +273,9 @@ static bool cldap_socket_recv_dgram(struct cldap_socket *c, DLIST_REMOVE(c->searches.list, search); - if (!cldap_recvfrom_setup(c)) { - goto nomem; - } + cldap_recvfrom_setup(c); tevent_req_done(search->req); - talloc_free(in); return true; nomem: @@ -286,6 +283,7 @@ nomem: error: status = map_nt_error_from_unix(in->recv_errno); nterror: + TALLOC_FREE(in); /* in connected mode the first pending search gets the error */ if (!c->connected) { /* otherwise we just ignore the error */ @@ -294,9 +292,11 @@ nterror: if (!c->searches.list) { goto done; } + cldap_recvfrom_setup(c); tevent_req_nterror(c->searches.list->req, status); + return true; done: - talloc_free(in); + TALLOC_FREE(in); return false; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via d2aa10c libcli/cldap: fix a crash bug in cldap_socket_recv_dgram() (bug #8593) from 1d61fe6 s3:lib/ctdbd_conn: try ctdbd_init_connection() as root (bug #8684) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit d2aa10c255932b2d3060fcfc5cea19caef213724 Author: Stefan Metzmacher Date: Thu Nov 10 14:43:55 2011 +0100 libcli/cldap: fix a crash bug in cldap_socket_recv_dgram() (bug #8593) After a calling any wrapper of tevent_req_notify_callback(), e.g. tevent_req_nterror(), tevent_req_done(), tevent_req_nomem(), a function has to return immediately otherwise it is very likely to crash. metze (similar to commit 17f1a97a614db4ed8292544988cb6a6cf56621d8) --- Summary of changes: libcli/cldap/cldap.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c index 191d0ee..a01cbf8 100644 --- a/libcli/cldap/cldap.c +++ b/libcli/cldap/cldap.c @@ -278,6 +278,7 @@ nomem: error: status = map_nt_error_from_unix(in->recv_errno); nterror: + TALLOC_FREE(in); /* in connected mode the first pending search gets the error */ if (!c->connected) { /* otherwise we just ignore the error */ @@ -288,7 +289,7 @@ nterror: } tevent_req_nterror(c->searches.list->req, status); done: - talloc_free(in); + TALLOC_FREE(in); } /* -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 1d61fe6 s3:lib/ctdbd_conn: try ctdbd_init_connection() as root (bug #8684) from 93c76f9 Fix bug #8686 - Packet validation checks can be done before length validation causing uninitialized memory read. (cherry picked from commit 24ac26ddfd9ee8841d1984e710a4dfe535b9abcf) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 1d61fe68230dc307c107b9eabf9583f8571f5d61 Author: Stefan Metzmacher Date: Fri Dec 23 14:45:45 2011 +0100 s3:lib/ctdbd_conn: try ctdbd_init_connection() as root (bug #8684) ctdbd_traverse is only called if the main db_context is already open. So if we could get to information via dbwrap_fetch, we should also be able to traverse. metze Autobuild-User: Stefan Metzmacher Autobuild-Date: Fri Dec 23 18:19:14 CET 2011 on sn-devel-104 (cherry picked from commit 4a1895eb9921ad533910d08823c2814c470875fd) --- Summary of changes: source3/lib/ctdbd_conn.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index 6b50009..9ae8f9f 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -1131,7 +1131,9 @@ NTSTATUS ctdbd_traverse(uint32 db_id, int cstatus; struct ctdbd_traverse_state state; + become_root(); status = ctdbd_init_connection(NULL, &conn); + unbecome_root(); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("ctdbd_init_connection failed: %s\n", nt_errstr(status))); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via ff4e1df s3:lib/ctdbd_conn: try ctdbd_init_connection() as root (bug #8684) from d619930 s3-printing: fix migrate printer code (bug 8618) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit ff4e1df575a3d7eb484b31d6afe46825ba418981 Author: Stefan Metzmacher Date: Fri Dec 23 14:45:45 2011 +0100 s3:lib/ctdbd_conn: try ctdbd_init_connection() as root (bug #8684) ctdbd_traverse is only called if the main db_context is already open. So if we could get to information via dbwrap_fetch, we should also be able to traverse. metze Autobuild-User: Stefan Metzmacher Autobuild-Date: Fri Dec 23 18:19:14 CET 2011 on sn-devel-104 (cherry picked from commit 4a1895eb9921ad533910d08823c2814c470875fd) --- Summary of changes: source3/lib/ctdbd_conn.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index 1d01da6..4e8f090 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -1200,7 +1200,9 @@ NTSTATUS ctdbd_traverse(uint32 db_id, int cstatus; struct ctdbd_traverse_state state; + become_root(); status = ctdbd_init_connection(NULL, &conn); + unbecome_root(); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("ctdbd_init_connection failed: %s\n", nt_errstr(status))); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via d619930 s3-printing: fix migrate printer code (bug 8618) from 24ac26d Fix bug #8686 - Packet validation checks can be done before length validation causing uninitialized memory read. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit d61993043fcb7676a58658476421f5f4ff1a3fea Author: Björn Baumbach Date: Fri Nov 18 18:54:56 2011 +0100 s3-printing: fix migrate printer code (bug 8618) Removed path from driver files. We only need the basenames. --- Summary of changes: source3/printing/nt_printing_migrate.c | 27 +++ 1 files changed, 27 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/printing/nt_printing_migrate.c b/source3/printing/nt_printing_migrate.c index e927a23..6eb2f44 100644 --- a/source3/printing/nt_printing_migrate.c +++ b/source3/printing/nt_printing_migrate.c @@ -3,6 +3,7 @@ * RPC Pipe client / server routines * * Copyright (c) Andreas Schneider2010. + * Copyright (C) Bjoern Baumbach 2011 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,6 +28,20 @@ #include "librpc/gen_ndr/ndr_security.h" #include "rpc_client/cli_winreg_spoolss.h" +static const char *driver_file_basename(const char *file) +{ + const char *basefile; + + basefile = strrchr(file, '\\'); + if (basefile == NULL) { + basefile = file; + } else { + basefile++; + } + + return basefile; +} + NTSTATUS printing_tdb_migrate_form(TALLOC_CTX *mem_ctx, struct rpc_pipe_client *winreg_pipe, const char *key_name, @@ -100,6 +115,7 @@ NTSTATUS printing_tdb_migrate_driver(TALLOC_CTX *mem_ctx, WERROR result; const char *driver_name; uint32_t driver_version; + int i; blob = data_blob_const(data, length); @@ -118,8 +134,19 @@ NTSTATUS printing_tdb_migrate_driver(TALLOC_CTX *mem_ctx, ZERO_STRUCT(d3); ZERO_STRUCT(a); + /* remove paths from file names */ + if (r.dependent_files != NULL) { + for (i = 0 ; r.dependent_files[i] != NULL; i++) { + r.dependent_files[i] = driver_file_basename(r.dependent_files[i]); + } + } a.string = r.dependent_files; + r.driverpath = driver_file_basename(r.driverpath); + r.configfile = driver_file_basename(r.configfile); + r.datafile = driver_file_basename(r.datafile); + r.helpfile = driver_file_basename(r.helpfile); + d3.architecture = r.environment; d3.config_file = r.configfile; d3.data_file = r.datafile; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 93c76f9 Fix bug #8686 - Packet validation checks can be done before length validation causing uninitialized memory read. (cherry picked from commit 24ac26ddfd9ee8841d1984e710a4dfe535b9abcf) from 4e6955a Fix bug #8687 - net memberships usage info is wrong http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 93c76f96b82ec27be97c390cd1ef5d965766e273 Author: Volker Lendecke Date: Wed Jan 4 11:09:54 2012 -0800 Fix bug #8686 - Packet validation checks can be done before length validation causing uninitialized memory read. (cherry picked from commit 24ac26ddfd9ee8841d1984e710a4dfe535b9abcf) --- Summary of changes: source3/smbd/process.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 634af00..cb8600a 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -1273,8 +1273,8 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req, in /* Make sure this is an SMB packet. smb_size contains NetBIOS header * so subtract 4 from it. */ - if (!valid_smb_header(req->inbuf) - || (size < (smb_size - 4))) { + if ((size < (smb_size - 4)) || + !valid_smb_header(req->inbuf)) { DEBUG(2,("Non-SMB packet of length %d. Terminating server\n", smb_len(req->inbuf))); exit_server_cleanly("Non-SMB packet"); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 24ac26d Fix bug #8686 - Packet validation checks can be done before length validation causing uninitialized memory read. from 0453544 Fix bug #8687 - net memberships usage info is wrong http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 24ac26ddfd9ee8841d1984e710a4dfe535b9abcf Author: Volker Lendecke Date: Wed Jan 4 11:09:54 2012 -0800 Fix bug #8686 - Packet validation checks can be done before length validation causing uninitialized memory read. --- Summary of changes: source3/smbd/process.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/process.c b/source3/smbd/process.c index b370423..5aa19cb 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -1442,8 +1442,8 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req, in /* Make sure this is an SMB packet. smb_size contains NetBIOS header * so subtract 4 from it. */ - if (!valid_smb_header(req->inbuf) - || (size < (smb_size - 4))) { + if ((size < (smb_size - 4)) || + !valid_smb_header(req->inbuf)) { DEBUG(2,("Non-SMB packet of length %d. Terminating server\n", smb_len(req->inbuf))); exit_server_cleanly("Non-SMB packet"); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 0f79184 samba: check for AES encryption type defines. from 91ffcdd talloc/testsuite: fix compiler warnings http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0f7918425a3deb3cbbc91cffcfdbbd00926c3937 Author: Günther Deschner Date: Thu Dec 15 17:50:33 2011 +0100 samba: check for AES encryption type defines. Guenther Autobuild-User: Günther Deschner Autobuild-Date: Tue Jan 10 15:05:38 CET 2012 on sn-devel-104 --- Summary of changes: source3/configure.in| 21 + source3/wscript |2 ++ source4/heimdal_build/wscript_configure |2 ++ 3 files changed, 25 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/configure.in b/source3/configure.in index 32561fa..c671a42 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -4146,6 +4146,27 @@ if test x"$with_ads_support" != x"no"; then found_arcfour_hmac=yes fi + AC_CACHE_CHECK([for ENCTYPE_AES128_CTS_HMAC_SHA1_96], + samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96,[ +AC_TRY_COMPILE([#include ], + [krb5_enctype enctype; enctype = ENCTYPE_AES128_CTS_HMAC_SHA1_96;], + samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96=yes, + samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96=no)]) + if test x"$samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96" = x"yes"; then +AC_DEFINE(HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96,1, + [Whether the ENCTYPE_AES128_CTS_HMAC_SHA1_96 key type definition is available]) + fi + AC_CACHE_CHECK([for ENCTYPE_AES256_CTS_HMAC_SHA1_96], + samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96,[ +AC_TRY_COMPILE([#include ], + [krb5_enctype enctype; enctype = ENCTYPE_AES256_CTS_HMAC_SHA1_96;], + samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96=yes, + samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96=no)]) + if test x"$samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96" = x"yes"; then +AC_DEFINE(HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96,1, + [Whether the ENCTYPE_AES256_CTS_HMAC_SHA1_96 key type definition is available]) + fi + AC_CACHE_CHECK([for AP_OPTS_USE_SUBKEY], samba_cv_HAVE_AP_OPTS_USE_SUBKEY,[ AC_TRY_COMPILE([#include ], diff --git a/source3/wscript b/source3/wscript index 9a32ab7..1592ccb 100644 --- a/source3/wscript +++ b/source3/wscript @@ -598,6 +598,8 @@ krb5_get_credentials_for_user krb5_get_host_realm krb5_free_host_realm''', conf.CHECK_VARIABLE('KV5M_KEYTAB', headers='krb5.h') conf.CHECK_VARIABLE('KRB5_KU_OTHER_CKSUM', headers='krb5.h') conf.CHECK_VARIABLE('KRB5_KEYUSAGE_APP_DATA_CKSUM', headers='krb5.h') + conf.CHECK_VARIABLE('ENCTYPE_AES128_CTS_HMAC_SHA1_96', headers='krb5.h') + conf.CHECK_VARIABLE('ENCTYPE_AES256_CTS_HMAC_SHA1_96', headers='krb5.h') conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'key', headers='krb5.h', define='HAVE_KRB5_KEYTAB_ENTRY_KEY') conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'keyblock', headers='krb5.h', diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure index 5dc4aa1..2c111b9 100644 --- a/source4/heimdal_build/wscript_configure +++ b/source4/heimdal_build/wscript_configure @@ -152,6 +152,8 @@ conf.define('HAVE_AP_OPTS_USE_SUBKEY', 1) conf.define('HAVE_ENCTYPE_ARCFOUR_HMAC_MD5', 1) conf.define('HAVE_ENCTYPE_ARCFOUR_HMAC', 1) conf.define('HAVE_KRB5_PDU_NONE_DECL', 1) +conf.define('HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96', 1) +conf.define('HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96', 1) heimdal_includedirs = [] heimdal_libdirs = [] -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 91ffcdd talloc/testsuite: fix compiler warnings from a8441f9 s3-aio_pthread: Fix the build http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 91ffcdd5a962141f1b780126621ca8b908da8dcf Author: Stefan Metzmacher Date: Wed Jan 4 12:57:10 2012 +0100 talloc/testsuite: fix compiler warnings metze Autobuild-User: Stefan Metzmacher Autobuild-Date: Tue Jan 10 13:31:33 CET 2012 on sn-devel-104 --- Summary of changes: lib/talloc/testsuite.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/talloc/testsuite.c b/lib/talloc/testsuite.c index 7860ad2..7191703 100644 --- a/lib/talloc/testsuite.c +++ b/lib/talloc/testsuite.c @@ -1315,7 +1315,8 @@ static bool test_rusty(void) static bool test_free_children(void) { void *root; - const char *p1, *p2, *name, *name2; + char *p1, *p2; + const char *name, *name2; talloc_enable_null_tracking(); root = talloc_new(NULL); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a8441f9 s3-aio_pthread: Fix the build via eae9c74 s3-aio_pthread: Make "pd_list" static from 354e43c s4:python tests __init__.py - do not depend on "subprocess.check_call()" http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a8441f933e495a12a6c5717e6203140962439728 Author: Volker Lendecke Date: Tue Jan 10 10:12:49 2012 +0100 s3-aio_pthread: Fix the build Autobuild-User: Volker Lendecke Autobuild-Date: Tue Jan 10 11:54:01 CET 2012 on sn-devel-104 commit eae9c74794994de990b9877247893de21a410b1c Author: Volker Lendecke Date: Tue Jan 10 10:12:49 2012 +0100 s3-aio_pthread: Make "pd_list" static --- Summary of changes: source3/modules/vfs_aio_pthread.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_aio_pthread.c b/source3/modules/vfs_aio_pthread.c index 78cea8e..82611b0 100644 --- a/source3/modules/vfs_aio_pthread.c +++ b/source3/modules/vfs_aio_pthread.c @@ -25,7 +25,7 @@ #include "system/filesys.h" #include "system/shmem.h" #include "smbd/smbd.h" -#include "pthreadpool.h" +#include "lib/pthreadpool/pthreadpool.h" struct aio_extra; static struct pthreadpool *pool; @@ -42,7 +42,7 @@ struct aio_private_data { }; /* List of outstanding requests we have. */ -struct aio_private_data *pd_list; +static struct aio_private_data *pd_list; static void aio_pthread_handle_completion(struct event_context *event_ctx, struct fd_event *event, -- Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.12-156-g85879ed
The branch, master has been updated via 85879edd09ffa26f87c566954cbd2c14f1e331ed (commit) from d0f85478c37828eb8a24315d4326eb4eaedb9afc (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit 85879edd09ffa26f87c566954cbd2c14f1e331ed Author: Michael Adam Date: Tue Jan 10 10:30:22 2012 +0100 server: fix a comment typo --- Summary of changes: server/ctdb_call.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/server/ctdb_call.c b/server/ctdb_call.c index 145fd00..654fff4 100644 --- a/server/ctdb_call.c +++ b/server/ctdb_call.c @@ -112,7 +112,7 @@ static void ctdb_send_error(struct ctdb_context *ctdb, * on the wire (or in the local queue). So in case the record has * migrated off the new destinaton of the call packet, instead of * going back to the LMASTER to get the new DMASTER, we try to - * reduce rountrips by first chasing the record a couple of times + * reduce round-trips by first chasing the record a couple of times * before giving up the direct chase and finally going back to the * LMASTER (again). Note that this works because of this: When * a record is migrated off a node, then the new DMASTER is stored -- CTDB repository