[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d5b8b804fe4 Add ROLE_IPA_DC into two more places
from eafcef18584 s3:locking: fix debug level for NT_STATUS_NOT_FOUND
messanges in get_static_share_mode_data
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d5b8b804fe46eee2969abb479dc7bf3f109fffe4
Author: Alexander Bokovoy
Date: Mon Apr 24 19:26:19 2023 +0300
Add ROLE_IPA_DC into two more places
Missed two more places originally when introduced ROLE_IPA_DC.
Signed-off-by: Alexander Bokovoy
Reviewed-by: Andreas Schneider
Autobuild-User(master): Alexander Bokovoy
Autobuild-Date(master): Tue Apr 25 07:46:36 UTC 2023 on atb-devel-224
---
Summary of changes:
auth/credentials/credentials_secrets.c | 1 +
lib/param/util.c | 1 +
2 files changed, 2 insertions(+)
Changeset truncated at 500 lines:
diff --git a/auth/credentials/credentials_secrets.c
b/auth/credentials/credentials_secrets.c
index ab2c9ddeef9..8469d6e116f 100644
--- a/auth/credentials/credentials_secrets.c
+++ b/auth/credentials/credentials_secrets.c
@@ -387,6 +387,7 @@ _PUBLIC_ NTSTATUS
cli_credentials_set_machine_account_db_ctx(struct cli_credenti
FALL_THROUGH;
case ROLE_ACTIVE_DIRECTORY_DC:
+ case ROLE_IPA_DC:
use_kerberos = CRED_USE_KERBEROS_DESIRED;
break;
}
diff --git a/lib/param/util.c b/lib/param/util.c
index 9a0fc102de8..b9055e86e9d 100644
--- a/lib/param/util.c
+++ b/lib/param/util.c
@@ -266,6 +266,7 @@ const char *lpcfg_sam_dnsname(struct loadparm_context
*lp_ctx)
{
switch (lpcfg_server_role(lp_ctx)) {
case ROLE_ACTIVE_DIRECTORY_DC:
+ case ROLE_IPA_DC:
return lpcfg_dnsdomain(lp_ctx);
default:
return NULL;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 36c861e25b1 printing/bgqd: Disable systemd notifications
from 309f1982263 s4/auth/simple_bind: correctly report TLS state
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 36c861e25b1d9c5ce44bfcb46247e7e4747930c5
Author: FeRD (Frank Dana)
Date: Mon Jan 24 22:14:31 2022 -0500
printing/bgqd: Disable systemd notifications
samba-bgqd daemon is started by existing Samba daemons. When running
under systemd, those daemons control systemd notifications and
samba-bgqd messages need to be silenced.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14947
Signed-off-by: FeRD (Frank Dana)
Reviewed-by: Alexander Bokovoy
Reviewed-by: Andreas Schneider
Autobuild-User(master): Alexander Bokovoy
Autobuild-Date(master): Thu Jan 27 10:53:50 UTC 2022 on sn-devel-184
---
Summary of changes:
source3/printing/samba-bgqd.c | 3 +++
1 file changed, 3 insertions(+)
Changeset truncated at 500 lines:
diff --git a/source3/printing/samba-bgqd.c b/source3/printing/samba-bgqd.c
index f21327fc622..59ed0cc40db 100644
--- a/source3/printing/samba-bgqd.c
+++ b/source3/printing/samba-bgqd.c
@@ -252,6 +252,9 @@ int main(int argc, const char *argv[])
log_stdout = (debug_get_log_type() == DEBUG_STDOUT);
+ /* main process will notify systemd */
+ daemon_sd_notifications(false);
+
if (!cmdline_daemon_cfg->fork) {
daemon_status(progname, "Starting process ... ");
} else {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c69b66f649c IPA DC: add missing checks
from 240addaed7b smbd: Convert ret==false into !ret
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c69b66f649c1d47a7367f7efe25b8df32369a3a5
Author: Alexander Bokovoy
Date: Fri Nov 12 19:06:01 2021 +0200
IPA DC: add missing checks
When introducing FreeIPA support, two places were forgotten:
- schannel gensec module needs to be aware of IPA DC
- _lsa_QueryInfoPolicy should treat IPA DC as PDC
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14903
Signed-off-by: Alexander Bokovoy
Reviewed-by: Guenther Deschner
Autobuild-User(master): Alexander Bokovoy
Autobuild-Date(master): Sat Nov 13 07:01:26 UTC 2021 on sn-devel-184
---
Summary of changes:
auth/gensec/schannel.c | 1 +
source3/rpc_server/lsa/srv_lsa_nt.c | 1 +
2 files changed, 2 insertions(+)
Changeset truncated at 500 lines:
diff --git a/auth/gensec/schannel.c b/auth/gensec/schannel.c
index 0cdae141ead..6ebbe8f3179 100644
--- a/auth/gensec/schannel.c
+++ b/auth/gensec/schannel.c
@@ -1080,6 +1080,7 @@ static NTSTATUS schannel_server_start(struct
gensec_security *gensec_security)
case ROLE_DOMAIN_BDC:
case ROLE_DOMAIN_PDC:
case ROLE_ACTIVE_DIRECTORY_DC:
+ case ROLE_IPA_DC:
return NT_STATUS_OK;
default:
return NT_STATUS_NOT_IMPLEMENTED;
diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c
b/source3/rpc_server/lsa/srv_lsa_nt.c
index 8d71b5252ab..ea92a22cbc9 100644
--- a/source3/rpc_server/lsa/srv_lsa_nt.c
+++ b/source3/rpc_server/lsa/srv_lsa_nt.c
@@ -683,6 +683,7 @@ NTSTATUS _lsa_QueryInfoPolicy(struct pipes_struct *p,
switch (lp_server_role()) {
case ROLE_DOMAIN_PDC:
case ROLE_DOMAIN_BDC:
+ case ROLE_IPA_DC:
name = get_global_sam_name();
sid = dom_sid_dup(p->mem_ctx,
get_global_sam_sid());
if (!sid) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8036bf9717f s3:smbd: Fix possible null pointer dereference in token_contains_name() via 2a8b672652d auth_sam: use pdb_get_domain_info to look up DNS forest information from dcd5a64ca74 selftest/subunithelper: also output as much of unterminated DETAILS https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8036bf9717f83e83c3e4a9cf00fded42e9a5de15 Author: Andreas Schneider Date: Wed Nov 11 13:42:06 2020 +0100 s3:smbd: Fix possible null pointer dereference in token_contains_name() BUG: https://bugzilla.samba.org/show_bug.cgi?id=14572 Signed-off-by: Andreas Schneider Reviewed-by: Alexander Bokovoy Autobuild-User(master): Alexander Bokovoy Autobuild-Date(master): Thu Nov 12 15:13:47 UTC 2020 on sn-devel-184 commit 2a8b672652dcbcf55ec59be537773d76f0f14d0a Author: Alexander Bokovoy Date: Wed Nov 11 14:42:55 2020 +0200 auth_sam: use pdb_get_domain_info to look up DNS forest information When Samba is used as a part of FreeIPA domain controller, Windows clients for a trusted AD forest may try to authenticate (perform logon operation) as a REALM\name user account. Fix auth_sam plugins to accept DNS forest name if we are running on a DC with PASSDB module providing domain information (e.g. pdb_get_domain_info() returning non-NULL structure). Right now, only FreeIPA or Samba AD DC PASSDB backends return this information but Samba AD DC configuration is explicitly ignored by the two auth_sam (strict and netlogon3) modules. Detailed logs below: [2020/11/11 09:23:53.281296, 1, pid=42677, effective(65534, 65534), real(65534, 0), class=rpc_parse] ../../librpc/ndr/ndr.c:482(ndr_print_function_debug) netr_LogonSamLogonWithFlags: struct netr_LogonSamLogonWithFlags in: struct netr_LogonSamLogonWithFlags server_name : * server_name : '\\master.ipa.test' computer_name: * computer_name: 'AD1' credential : * credential: struct netr_Authenticator cred: struct netr_Credential data : 529f4b087c5f6546 timestamp: Wed Nov 11 09:23:55 AM 2020 UTC return_authenticator : * return_authenticator: struct netr_Authenticator cred: struct netr_Credential data : 204f28f62201 timestamp: Fri May 2 06:37:50 AM 1986 UTC logon_level : NetlogonNetworkTransitiveInformation (6) logon: * logon: union netr_LogonLevel(case 6) network : * network: struct netr_NetworkInfo identity_info: struct netr_IdentityInfo domain_name: struct lsa_String length : 0x0010 (16) size : 0x01fe (510) string : * string : 'IPA.TEST' parameter_control: 0x2ae0 (10976) 0: MSV1_0_CLEARTEXT_PASSWORD_ALLOWED 0: MSV1_0_UPDATE_LOGON_STATISTICS 0: MSV1_0_RETURN_USER_PARAMETERS 0: MSV1_0_DONT_TRY_GUEST_ACCOUNT 1: MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT 1: MSV1_0_RETURN_PASSWORD_EXPIRY 1: MSV1_0_USE_CLIENT_CHALLENGE 0: MSV1_0_TRY_GUEST_ACCOUNT_ONLY 1: MSV1_0_RETURN_PROFILE_PATH 0: MSV1_0_TRY_SPECIFIED_DOMAIN_ONLY 1: MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT 0: MSV1_0_DISABLE_PERSONAL_FALLBACK 1: MSV1_0_ALLOW_FORCE_GUEST 0: MSV1_0_CLEARTEXT_PASSWORD_SUPPLIED 0: MSV1_0_USE_DOMAIN_FOR_ROUTING_ONLY 0: MSV1_0_ALLOW_MSVCHAPV2 0: MSV1_0_S4U2SELF
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 31c703766fd lookup_name: allow lookup names prefixed with DNS
forest root for FreeIPA DC
from f214a3ba5a3 selftest: Windows 2019 implements the RemoveDollar
behaviour for Enterprise principals
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 31c703766fd2b89737826fb7e9a707f0622bb8cd
Author: Alexander Bokovoy
Date: Tue Nov 10 17:35:24 2020 +0200
lookup_name: allow lookup names prefixed with DNS forest root for FreeIPA DC
In FreeIPA deployment with active Global Catalog service, when a two-way
trust to Active Directory forest is established, Windows systems can
look up FreeIPA users and groups. When using a security tab in Windows
Explorer on AD side, a lookup over a trusted forest might come as
realm\name instead of NetBIOS domain name:
[2020/01/13 11:12:39.859134, 1, pid=33253, effective(1732401004,
1732401004), real(1732401004, 0), class=rpc_parse]
../../librpc/ndr/ndr.c:471(ndr_print_function_debug)
lsa_LookupNames3: struct lsa_LookupNames3
in: struct lsa_LookupNames3
handle : *
handle: struct policy_handle
handle_type : 0x (0)
uuid :
000e---1c5e-a750e581
num_names: 0x0001 (1)
names: ARRAY(1)
names: struct lsa_String
length : 0x001e (30)
size : 0x0020 (32)
string : *
string : 'ipa.test\admins'
sids : *
sids: struct lsa_TransSidArray3
count: 0x (0)
sids : NULL
level:
LSA_LOOKUP_NAMES_UPLEVEL_TRUSTS_ONLY2 (6)
count: *
count: 0x (0)
lookup_options :
LSA_LOOKUP_OPTION_SEARCH_ISOLATED_NAMES (0)
client_revision : LSA_CLIENT_REVISION_2 (2)
If we are running as a DC and PASSDB supports returning domain info
(pdb_get_domain_info() returns a valid structure), check domain of the
name in lookup_name() against DNS forest name and allow the request to
be done against the primary domain. This corresponds to FreeIPA's use of
Samba as a DC. For normal domain members a realm-based lookup falls back
to a lookup over to its own domain controller with the help of winbindd.
Signed-off-by: Alexander Bokovoy
Reviewed-by: Stefan Metzmacher
Autobuild-User(master): Alexander Bokovoy
Autobuild-Date(master): Wed Nov 11 10:59:01 UTC 2020 on sn-devel-184
---
Summary of changes:
source3/passdb/lookup_sid.c | 37 -
1 file changed, 28 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index ff8a16619a8..cf80a300189 100644
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -113,17 +113,36 @@ bool lookup_name(TALLOC_CTX *mem_ctx,
full_name, domain, name));
DEBUG(10, ("lookup_name: flags = 0x0%x\n", flags));
- if (((flags & LOOKUP_NAME_DOMAIN) || (flags == 0)) &&
- strequal(domain, get_global_sam_name()))
- {
+ if ((flags & LOOKUP_NAME_DOMAIN) || (flags == 0)) {
+ bool check_global_sam = false;
+
+ check_global_sam = strequal(domain, get_global_sam_name());
+
+ /* If we are running on a DC that has PASSDB module with domain
+* information, check if DNS forest name is matching the domain
+* name. This is the case of FreeIPA domain controller when
+* trusted AD DC looks up users found in a Global Catalog of
+* the forest root domain. */
+ if (!check_global_sam && (IS_DC)) {
+ struct pdb_domain_info *dom_info = NULL;
+ dom_info = pdb_get_domain_info(tmp_ctx);
+
+ if ((dom_info != NULL) && (dom_info->dns_forest !=
NULL)) {
+ check_global_sam = strequal(domain,
dom_info->dns_forest);
+ }
- /
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ca07dc775cb Revert "lookup_name: allow lookup for own realm"
via 5d80b179a1a Revert "cli_credentials: add a helper to parse user or
group names"
via 49efe0ca0b0 Revert "cli_credentials_parse_string: fix parsing of
principals"
from 8aebd48698e bootstrap: Add Fedora 33
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ca07dc775cbf0d6736783ced8d0dfb6ddec8520f
Author: Alexander Bokovoy
Date: Wed Nov 4 19:21:24 2020 +0200
Revert "lookup_name: allow lookup for own realm"
This reverts commit f901691209867b32c2d7c5c9274eee196f541654.
Autobuild-User(master): Alexander Bokovoy
Autobuild-Date(master): Thu Nov 5 07:53:03 UTC 2020 on sn-devel-184
commit 5d80b179a1ae43325dde821fc6a869b6c1a1eeea
Author: Alexander Bokovoy
Date: Wed Nov 4 19:21:20 2020 +0200
Revert "cli_credentials: add a helper to parse user or group names"
This reverts commit 00f4262ed0b22f6e333e5a29c5590b62c783905c.
commit 49efe0ca0b07396764f78434989165f941cf5f91
Author: Alexander Bokovoy
Date: Wed Nov 4 19:20:58 2020 +0200
Revert "cli_credentials_parse_string: fix parsing of principals"
This reverts commit eb0474d27bae4592b25ac6bf600da29c6a1cb9f8.
---
Summary of changes:
auth/credentials/credentials.c | 23 ++-
auth/credentials/credentials.h | 1 -
auth/credentials/tests/test_creds.c | 58 +---
python/samba/tests/credentials.py | 4 +-
source3/passdb/lookup_sid.c | 76 ++---
5 files changed, 27 insertions(+), 135 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/credentials/credentials.c b/auth/credentials/credentials.c
index 53bba78176b..1bdd6f15a09 100644
--- a/auth/credentials/credentials.c
+++ b/auth/credentials/credentials.c
@@ -836,34 +836,17 @@ _PUBLIC_ void cli_credentials_parse_string(struct
cli_credentials *credentials,
cli_credentials_set_password(credentials, p+1, obtained);
}
- cli_credentials_parse_name(credentials, uname, obtained);
-}
-
-/**
- * Given a string, parse it into a domain, username and realm fields
- *
- * The format accepted is [domain\\]user or user[@realm]
- *
- * @param credentials Credentials structure on which to set the components
- * @param data the string containing the username, prefixed or suffixed with
domain or realm
- * @param obtained This enum describes how 'specified' this credential name is.
- */
-
-_PUBLIC_ void cli_credentials_parse_name(struct cli_credentials *credentials,
const char *data, enum credentials_obtained obtained)
-{
- char *uname, *p;
-
- uname = talloc_strdup(credentials, data);
if ((p = strchr_m(uname,'@'))) {
/*
* We also need to set username and domain
* in order to undo the effect of
* cli_credentials_guess().
*/
- cli_credentials_set_principal(credentials, uname, obtained);
- *p = 0;
cli_credentials_set_username(credentials, uname, obtained);
cli_credentials_set_domain(credentials, "", obtained);
+
+ cli_credentials_set_principal(credentials, uname, obtained);
+ *p = 0;
cli_credentials_set_realm(credentials, p+1, obtained);
return;
} else if ((p = strchr_m(uname,'\\'))
diff --git a/auth/credentials/credentials.h b/auth/credentials/credentials.h
index 7c7120b9f55..f468b8558dd 100644
--- a/auth/credentials/credentials.h
+++ b/auth/credentials/credentials.h
@@ -155,7 +155,6 @@ bool cli_credentials_set_password(struct cli_credentials
*cred,
enum credentials_obtained obtained);
struct cli_credentials *cli_credentials_init_anon(TALLOC_CTX *mem_ctx);
void cli_credentials_parse_string(struct cli_credentials *credentials, const
char *data, enum credentials_obtained obtained);
-void cli_credentials_parse_name(struct cli_credentials *credentials, const
char *data, enum credentials_obtained obtained);
struct samr_Password *cli_credentials_get_nt_hash(struct cli_credentials *cred,
TALLOC_CTX *mem_ctx);
struct samr_Password *cli_credentials_get_old_nt_hash(struct cli_credentials
*cred,
diff --git a/auth/credentials/tests/test_creds.c
b/auth/credentials/tests/test_creds.c
index 38550d6ecf9..d2d3d30d73d 100644
--- a/auth/credentials/tests/test_creds.c
+++ b/auth/credentials/tests/test_creds.c
@@ -187,7 +187,7 @@ static void torture_creds_parse_string(void **state)
assert_string_equal(creds->domain, "");
assert_int_equal(creds->d
Re: cli_credentials_parse_name... (Re: [SCM] Samba Shared Repository - branch master updated)
On to, 05 marras 2020, Andrew Bartlett wrote: > On Wed, 2020-11-04 at 19:23 +0200, Alexander Bokovoy wrote: > > On ke, 04 marras 2020, Stefan Metzmacher wrote: > > > Am 04.11.20 um 17:24 schrieb Alexander Bokovoy: > > > > The branch, master has been updated > > > >via f9016912098 lookup_name: allow lookup for own realm > > > >via 00f4262ed0b cli_credentials: add a helper to parse > > > > user or group names > > > >via eb0474d27ba cli_credentials_parse_string: fix parsing > > > > of principals > > > > from a1b021200e3 selftest: add test for new "samba-tool > > > > user unlock" command > > > > > > > > https://git.samba.org/?p=samba.git;a=shortlog;h=master > > > > > > > > > > > > - Log - > > > > > > > > commit f901691209867b32c2d7c5c9274eee196f541654 > > > > Author: Alexander Bokovoy > > > > Date: Wed Nov 4 14:21:33 2020 +0200 > > > > > > > > lookup_name: allow lookup for own realm > > > > > > > > When using a security tab in Windows Explorer, a lookup over > > > > a trusted > > > > forest might come as realm\name instead of NetBIOS domain > > > > name: > > > > > > > > - > > > > --- > > > > [2020/01/13 11:12:39.859134, 1, pid=33253, > > > > effective(1732401004, 1732401004), real(1732401004, 0), > > > > class=rpc_parse] > > > > ../../librpc/ndr/ndr.c:471(ndr_print_function_debug) > > > >lsa_LookupNames3: struct lsa_LookupNames3 > > > > in: struct lsa_LookupNames3 > > > > handle : * > > > > handle: struct policy_handle > > > > handle_type : 0x > > > > (0) > > > > uuid : 000e- > > > > --1c5e-a750e581 > > > > num_names: 0x0001 (1) > > > > names: ARRAY(1) > > > > names: struct lsa_String > > > > length : 0x001e (30) > > > > size : 0x0020 (32) > > > > string : * > > > > string : > > > > 'ipa.test\admins' > > > > sids : * > > > > sids: struct lsa_TransSidArray3 > > > > count: 0x > > > > (0) > > > > sids : NULL > > > > level: > > > > LSA_LOOKUP_NAMES_UPLEVEL_TRUSTS_ONLY2 (6) > > > > count: * > > > > count: 0x (0) > > > > lookup_options : > > > > LSA_LOOKUP_OPTION_SEARCH_ISOLATED_NAMES (0) > > > > client_revision : > > > > LSA_CLIENT_REVISION_2 (2) > > > > > > > > ... > > > > > > > > diff --git a/auth/credentials/tests/test_creds.c > > > > b/auth/credentials/tests/test_creds.c > > > > index d2d3d30d73d..38550d6ecf9 100644 > > > > --- a/auth/credentials/tests/test_creds.c > > > > +++ b/auth/credentials/tests/test_creds.c > > > > @@ -187,7 +187,7 @@ static void torture_creds_parse_string(void > > > > **state) > > > > assert_string_equal(creds->domain, ""); > > > > assert_int_equal(creds->domain_obtained, CRED_SPECIFIED); > > > > > > > > - assert_string_equal(creds->username, "wurst@brot.realm"); > > > > + assert_string_equal(creds->username, "wurst"); > > > > > > I'm sorry but this is wrong! > > > I'm wondering why this wasn't covered by any high level test. > > > > > > This needs to result in domain="" and username="wurst@brot.realm" > > > and that's exactly what we need to u
Re: cli_credentials_parse_name... (Re: [SCM] Samba Shared Repository - branch master updated)
On ke, 04 marras 2020, Stefan Metzmacher wrote: > Am 04.11.20 um 17:24 schrieb Alexander Bokovoy: > > The branch, master has been updated > >via f9016912098 lookup_name: allow lookup for own realm > >via 00f4262ed0b cli_credentials: add a helper to parse user or > > group names > >via eb0474d27ba cli_credentials_parse_string: fix parsing of > > principals > > from a1b021200e3 selftest: add test for new "samba-tool user unlock" > > command > > > > https://git.samba.org/?p=samba.git;a=shortlog;h=master > > > > > > - Log --------- > > commit f901691209867b32c2d7c5c9274eee196f541654 > > Author: Alexander Bokovoy > > Date: Wed Nov 4 14:21:33 2020 +0200 > > > > lookup_name: allow lookup for own realm > > > > When using a security tab in Windows Explorer, a lookup over a trusted > > forest might come as realm\name instead of NetBIOS domain name: > > > > > > [2020/01/13 11:12:39.859134, 1, pid=33253, effective(1732401004, > > 1732401004), real(1732401004, 0), class=rpc_parse] > > ../../librpc/ndr/ndr.c:471(ndr_print_function_debug) > >lsa_LookupNames3: struct lsa_LookupNames3 > > in: struct lsa_LookupNames3 > > handle : * > > handle: struct policy_handle > > handle_type : 0x (0) > > uuid : > > 000e---1c5e-a750e581 > > num_names: 0x0001 (1) > > names: ARRAY(1) > > names: struct lsa_String > > length : 0x001e (30) > > size : 0x0020 (32) > > string : * > > string : 'ipa.test\admins' > > sids : * > > sids: struct lsa_TransSidArray3 > > count: 0x (0) > > sids : NULL > > level: > > LSA_LOOKUP_NAMES_UPLEVEL_TRUSTS_ONLY2 (6) > > count: * > > count: 0x (0) > > lookup_options : > > LSA_LOOKUP_OPTION_SEARCH_ISOLATED_NAMES (0) > > client_revision : LSA_CLIENT_REVISION_2 (2) > > > > ... > > > > diff --git a/auth/credentials/tests/test_creds.c > > b/auth/credentials/tests/test_creds.c > > index d2d3d30d73d..38550d6ecf9 100644 > > --- a/auth/credentials/tests/test_creds.c > > +++ b/auth/credentials/tests/test_creds.c > > @@ -187,7 +187,7 @@ static void torture_creds_parse_string(void **state) > > assert_string_equal(creds->domain, ""); > > assert_int_equal(creds->domain_obtained, CRED_SPECIFIED); > > > > - assert_string_equal(creds->username, "wurst@brot.realm"); > > + assert_string_equal(creds->username, "wurst"); > > I'm sorry but this is wrong! > I'm wondering why this wasn't covered by any high level test. > > This needs to result in domain="" and username="wurst@brot.realm" > and that's exactly what we need to use for NTLMSSP. > Also note that "brot.realm" may not be a realm and "wurst" may not > be a sAMAccountName. A userPrincipalName can be > anything@anydomain-of-msDS-SPNSuffixes. > > I fear we need to revert these changes. > From the merge request > (https://gitlab.com/samba-team/samba/-/merge_requests/1658) > I didn't really look at the whole patchset (with behavior change) > I only focused on CRED_NO_PASSWORD. > > I think we need to logic we have in wb_irpc_lsa_LookupNames4_call() and/or > parse_domain_user() here. I'm pushing a revert for now and will look at those. -- / Alexander Bokovoy
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f9016912098 lookup_name: allow lookup for own realm
via 00f4262ed0b cli_credentials: add a helper to parse user or group
names
via eb0474d27ba cli_credentials_parse_string: fix parsing of principals
from a1b021200e3 selftest: add test for new "samba-tool user unlock"
command
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f901691209867b32c2d7c5c9274eee196f541654
Author: Alexander Bokovoy
Date: Wed Nov 4 14:21:33 2020 +0200
lookup_name: allow lookup for own realm
When using a security tab in Windows Explorer, a lookup over a trusted
forest might come as realm\name instead of NetBIOS domain name:
[2020/01/13 11:12:39.859134, 1, pid=33253, effective(1732401004,
1732401004), real(1732401004, 0), class=rpc_parse]
../../librpc/ndr/ndr.c:471(ndr_print_function_debug)
lsa_LookupNames3: struct lsa_LookupNames3
in: struct lsa_LookupNames3
handle : *
handle: struct policy_handle
handle_type : 0x (0)
uuid :
000e---1c5e-a750e581
num_names: 0x0001 (1)
names: ARRAY(1)
names: struct lsa_String
length : 0x001e (30)
size : 0x0020 (32)
string : *
string : 'ipa.test\admins'
sids : *
sids: struct lsa_TransSidArray3
count: 0x (0)
sids : NULL
level:
LSA_LOOKUP_NAMES_UPLEVEL_TRUSTS_ONLY2 (6)
count: *
count: 0x (0)
lookup_options :
LSA_LOOKUP_OPTION_SEARCH_ISOLATED_NAMES (0)
client_revision : LSA_CLIENT_REVISION_2 (2)
Allow this lookup using realm to be done against primary domain when we
are a domain controller. This corresponds to FreeIPA use of Samba as a
DC. For normal domain members a realm-based lookup falls back to a
lookup over to its own domain controller with the help of winbindd.
Refactor user name parsing code to reuse cli_credentials_* API to be
consistent with other places. cli_credentials_parse_name() handles
both domain and realm-based user name variants.
Signed-off-by: Alexander Bokovoy
Reviewed-by: Andreas Schneider
Reviewed-by: Stefan Metzmacher
Autobuild-User(master): Alexander Bokovoy
Autobuild-Date(master): Wed Nov 4 16:23:40 UTC 2020 on sn-devel-184
commit 00f4262ed0b22f6e333e5a29c5590b62c783905c
Author: Alexander Bokovoy
Date: Wed Nov 4 14:00:58 2020 +0200
cli_credentials: add a helper to parse user or group names
cli_credentials_parse_string() parses a string specified for -U option
in command line tools. It has a side-effect that '%' character is always
considered to be a separator after which a password is specified.
Active Directory does allow to create user or group objects with '%' in
the name. It means cli_credentials_parse_string() will not be able to
properly parse such name.
Introduce cli_credentials_parse_name() for the cases when a password is
not expected in the name and call to cli_credentials_parse_name() from
cli_credentials_parse_string().
Test cli_credentials_parse_name() with its intended use in lookup_name()
refactoring.
Signed-off-by: Alexander Bokovoy
Reviewed-by: Andreas Schneider
Reviewed-by: Stefan Metzmacher
commit eb0474d27bae4592b25ac6bf600da29c6a1cb9f8
Author: Alexander Bokovoy
Date: Wed Oct 7 19:25:24 2020 +0300
cli_credentials_parse_string: fix parsing of principals
When parsing a principal-like name, user name was left with full
principal instead of taking only the left part before '@' sign.
>>> from samba import credentials
>>> t = credentials.Credentials()
>>> t.parse_string('ad...@realm.test', credentials.SPECIFIED)
>>> t.get_username()
'ad...@realm.test'
The issue is that cli_credentials_set_username() does a talloc_strdup()
of the argument, so we need to change order of assignment to allow
talloc_strdup() to copy the right part of the string.
Signed-off-by: Alexand
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via e32846f0692 smb.conf.5: add clarification how configuration changes reflected by Samba from a6ff80cdc1b s3:ctdbd_conn: Fix the build on FreeBSD https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e32846f0692df44b4ee929c5ed6ba1de88ec4bd2 Author: Alexander Bokovoy Date: Sat Oct 17 10:58:12 2020 +0300 smb.conf.5: add clarification how configuration changes reflected by Samba Users of Linux distributions know to read smb.conf(5) manual page but apparently not many of them read smbd(8) and winbindd(8) to understand how changes to smb.conf file are reflected in the running processes. Add a small section that makes it clear where to find relevant information. Also correct the information in smbd, nmbd, and winbindd manual pages. The interval at which smbd does check for smb.conf changes was increased from 60 seconds to 180 seconds in 1999 with commit 3db52feb1f3b. Signed-off-by: Alexander Bokovoy Reviewed-by: Isaac Boukris Autobuild-User(master): Alexander Bokovoy Autobuild-Date(master): Tue Oct 20 08:50:13 UTC 2020 on sn-devel-184 --- Summary of changes: docs-xml/manpages/nmbd.8.xml | 10 +- docs-xml/manpages/smb.conf.5.xml | 30 ++ docs-xml/manpages/smbd.8.xml | 13 ++--- docs-xml/manpages/winbindd.8.xml | 7 ++- 4 files changed, 55 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml index c145e820770..4ece42f3ca6 100644 --- a/docs-xml/manpages/nmbd.8.xml +++ b/docs-xml/manpages/nmbd.8.xml @@ -244,7 +244,15 @@ directory (or the var/locks directory configured under wherever Samba was configured to install itself). This will also cause nmbd to dump out its server database in - the log.nmb file. + the log.nmb file. Additionally, the signal will + cause reloading nmbd configuration. + + +Instead of sending a SIGHUP signal, a request to dump namelists +into the file and reload a configuration file may be sent using +smbcontrol + 1 program. + The debug log level of nmbd may be raised or lowered using smbcontrol diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml index f72833c003f..c4387187ecc 100644 --- a/docs-xml/manpages/smb.conf.5.xml +++ b/docs-xml/manpages/smb.conf.5.xml @@ -27,6 +27,36 @@ + + HOW CONFIGURATION CHANGES ARE APPLIED + + + The Samba suite includes a number of different programs. Some of them operate in a client mode, others are + server daemons that provide various services to its clients. The smb.conf + file is processed in the following way: + + + + + The Samba suite's client applications read their configuration only once. Any changes made after start aren't + reflected in the context of already running client code. + + + + The Samba suite's server daemons reload their configuration when requested. However, already active connections + do not change their configuration. More detailed information can be found in + smbd8 and + winbindd8 manual pages. + + + + + To request Samba server daemons to refresh their configuration, please use + smbcontrol1 utility. + + + + FILE FORMAT diff --git a/docs-xml/manpages/smbd.8.xml b/docs-xml/manpages/smbd.8.xml index deba2cad9e2..73d808c70b7 100644 --- a/docs-xml/manpages/smbd.8.xml +++ b/docs-xml/manpages/smbd.8.xml @@ -68,11 +68,18 @@ the copy of the server for that client terminates. The configuration file, and any files that it includes, - are automatically reloaded every minute, if they change. You - can force a reload by sending a SIGHUP to the server. Reloading + are automatically reloaded every three minutes, if they change. + One can force a reload by sending a SIGHUP to the server. Reloading the configuration file will not affect connections to any service that is already established. Either the user will have to - disconnect from the service, or smbd killed and restarted. + disconnect from the service, or smbd killed and restarted. + + +Instead of sending a SIGHUP signal, a request to reload configuration + file may be sent using smbcontrol + 1 program. + + diff --git a/docs-xml/manpages/winbindd.8.xml b/docs-xml/manpages/winbindd.8.xml index 71fb248c204..99c00388c20 100644 --- a/docs-xml/manpages
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via bd9f64d19dc Fixed arrow keys typo to the computer move command
utility
from 12fbd5dcb1e build: avoid some unnecessary list.extend() calls
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit bd9f64d19dc9e7c2ddbfff6b956c2ec0ea5951b1
Author: Hezekiah
Date: Tue Sep 1 12:54:39 2020 +0300
Fixed arrow keys typo to the computer move command utility
Signed-off-by: Hezekiah
Reviewed-by: Alexander Bokovoy
Reviewed-by: David Disseldorp
Autobuild-User(master): Alexander Bokovoy
Autobuild-Date(master): Fri Sep 4 16:57:30 UTC 2020 on sn-devel-184
---
Summary of changes:
python/samba/netcmd/computer.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/netcmd/computer.py b/python/samba/netcmd/computer.py
index d48a3e732fd..5d1662b3508 100644
--- a/python/samba/netcmd/computer.py
+++ b/python/samba/netcmd/computer.py
@@ -666,7 +666,7 @@ attribute.
class cmd_computer_move(Command):
"""Move a computer to an organizational unit/container."""
-synopsis = "%prog computername [options]"
+synopsis = "%prog [options]"
takes_options = [
Option("-H", "--URL", help="LDB URL for database or target server",
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 3be17c891b6 s3 rpc server: set on-wire handle type explicitly
from 954d877a2ee smbd: remove unneeded parent_dir variable from
mkdir_internal()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3be17c891b61a7cbe3b529a2dc0d68753e81de35
Author: Alexander Bokovoy
Date: Wed Apr 29 11:54:07 2020 +0300
s3 rpc server: set on-wire handle type explicitly
Since wire_handle.handle_type is uint32_t, we can simply assign uint8_t
handle type to it without using SIVAL() macros. Further unify with s4
RPC server code flow.
Fixes CID 1462616
>>> CID 1462616:(CONSTANT_EXPRESSION_RESULT)
>>> "(uint32_t)handle_type >> 16" is 0 regardless of the values of its
operands. This occurs as a value.
284 SIVAL(_hnd->wire_handle.handle_type, 0 , handle_type);
Signed-off-by: Alexander Bokovoy
Reviewed-by: Andreas Schneider
Autobuild-User(master): Alexander Bokovoy
Autobuild-Date(master): Thu Apr 30 07:09:55 UTC 2020 on sn-devel-184
---
Summary of changes:
source3/rpc_server/rpc_handles.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/rpc_handles.c b/source3/rpc_server/rpc_handles.c
index d215a6a6d88..8ae9d970ced 100644
--- a/source3/rpc_server/rpc_handles.c
+++ b/source3/rpc_server/rpc_handles.c
@@ -281,7 +281,7 @@ static struct dcesrv_handle_old *create_rpc_handle_internal(
pol_hnd_high++;
}
- SIVAL(_hnd->wire_handle.handle_type, 0 , handle_type);
+ rpc_hnd->wire_handle.handle_type = handle_type;
/* second bit is incrementing */
SIVAL(_hnd->wire_handle.uuid.time_low, 0 , pol_hnd_low);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9b7825d2d38 auth:ntlmssp: Use generate_random_buffer() for session
keys
via 6fa3e4de7c1 s3:passdb: Use generate_secret_buffer() for generating
passwords
via a3e36dd8f43 s4:samdb: Use generate_nonce_buffer() for AEC GCM nonce
via 93196dd823e lib:util: Use generate_secret_buffer() for long term
passwords
via d73be972ea5 Revert "s4:rpc_server: Use generate_secret_buffer() to
create a session key"
via 38b0695ddac Revert "s4:rpc_server: Use generate_secret_buffer() for
backupkey wap_key"
via 1c68085404c Revert "s4:rpc_server: Use generate_secret_buffer() for
netlogon challange"
via 689760f2652 Revert "libcli:auth: Use generate_secret_buffer() for
netlogon challenge"
via 97c441d7c28 lib:util: Fix documentation for random number functions
from 4d276a93fc6 smbtorture: extend rpc.lsa to lookup machine over
forest-wide LookupNames
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9b7825d2d387bcb2515154418a990669ab96358d
Author: Andreas Schneider
Date: Mon Aug 12 19:07:15 2019 +0200
auth:ntlmssp: Use generate_random_buffer() for session keys
Signed-off-by: Andreas Schneider
Reviewed-by: Alexander Bokovoy
Autobuild-User(master): Alexander Bokovoy
Autobuild-Date(master): Wed Aug 14 16:26:47 UTC 2019 on sn-devel-184
commit 6fa3e4de7c168dc7c869ec9966729a36bda27f57
Author: Andreas Schneider
Date: Mon Aug 12 18:57:06 2019 +0200
s3:passdb: Use generate_secret_buffer() for generating passwords
Signed-off-by: Andreas Schneider
Reviewed-by: Alexander Bokovoy
commit a3e36dd8f43a5c06969ae158fa54fbc649f44d03
Author: Andreas Schneider
Date: Mon Aug 12 18:56:35 2019 +0200
s4:samdb: Use generate_nonce_buffer() for AEC GCM nonce
Signed-off-by: Andreas Schneider
Reviewed-by: Alexander Bokovoy
commit 93196dd823e114f260a68d28bb59eac3909c30d8
Author: Andreas Schneider
Date: Mon Aug 12 18:55:56 2019 +0200
lib:util: Use generate_secret_buffer() for long term passwords
Signed-off-by: Andreas Schneider
Reviewed-by: Alexander Bokovoy
commit d73be972ea58d564c770698bf6374a6074f111fe
Author: Andreas Schneider
Date: Mon Aug 12 18:50:02 2019 +0200
Revert "s4:rpc_server: Use generate_secret_buffer() to create a session key"
This reverts commit 4b2480518bd3887be3a6cfb713523ac084e09fd5.
Reviewed-by: Alexander Bokovoy
commit 38b0695ddac244c67b2a33eb927ad3e95d2e8bd6
Author: Andreas Schneider
Date: Mon Aug 12 18:49:52 2019 +0200
Revert "s4:rpc_server: Use generate_secret_buffer() for backupkey wap_key"
This reverts commit 5a62056b4530e4c509444be9164a1fca1dce193f.
Reviewed-by: Alexander Bokovoy
commit 1c68085404cd467c217640e3eabfc4b7f8b1ce9f
Author: Andreas Schneider
Date: Mon Aug 12 18:49:37 2019 +0200
Revert "s4:rpc_server: Use generate_secret_buffer() for netlogon challange"
This reverts commit a21770cfdffd2a21045a1bc87e489af0f4c6f130.
Reviewed-by: Alexander Bokovoy
commit 689760f26521fe5b4c8964a25ddd3ab1c9e9977c
Author: Andreas Schneider
Date: Mon Aug 12 18:49:31 2019 +0200
Revert "libcli:auth: Use generate_secret_buffer() for netlogon challenge"
This reverts commit c3ba556f52b15dd80efc26e4fb8f43ce2ee3a7f0.
Reviewed-by: Alexander Bokovoy
commit 97c441d7c28feb29168e81ebbc5c55b09a845087
Author: Andreas Schneider
Date: Mon Aug 12 16:10:20 2019 +0200
lib:util: Fix documentation for random number functions
Signed-off-by: Andreas Schneider
Reviewed-by: Alexander Bokovoy
---
Summary of changes:
auth/ntlmssp/ntlmssp_client.c | 2 +-
lib/util/genrand.c | 9 +++--
lib/util/genrand.h | 8 ++--
lib/util/genrand_util.c| 6 +++---
libcli/auth/netlogon_creds_cli.c | 3 +--
source3/passdb/pdb_nds.c | 3 ++-
source4/dsdb/samdb/ldb_modules/encrypted_secrets.c | 2 +-
source4/rpc_server/backupkey/dcesrv_backupkey.c| 3 +--
source4/rpc_server/netlogon/dcerpc_netlogon.c | 3 +--
source4/rpc_server/samr/samr_password.c| 5 ++---
10 files changed, 25 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/ntlmssp/ntlmssp_client.c b/auth/ntlmssp/ntlmssp_client.c
index b8d1190466b..2a80feb4fed 100644
--- a/auth/ntlmssp/ntlmssp_client.c
+++ b/auth/ntlmssp/ntlmssp_client.c
@@ -696,7 +696,7 @@ NTSTATUS ntlmssp_client_challenge(struct gensec_security
*gensec_security,
.size = session_key.length,
};
-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 4d276a93fc6 smbtorture: extend rpc.lsa to lookup machine over forest-wide LookupNames via 685bb03de6a lookup_name: allow own domain lookup when flags == 0 via 317bc6a7342 torture/rpc/lsa: allow testing different lookup levels from 2dd7ebe072a smbd: Fix CID 1452293 Incorrect expression (NO_EFFECT) https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 4d276a93fc624dc04d880f5b4157f272d3555be6 Author: Alexander Bokovoy Date: Sat Aug 10 11:53:12 2019 +0300 smbtorture: extend rpc.lsa to lookup machine over forest-wide LookupNames Add a simple test to resolve DOMAIN\MACHINE$ via LSA LookupNames3 using LSA_LOOKUP_NAMES_UPLEVEL_TRUSTS_ONLY2 level. This level would pass zero lookup flags to lookup_name(). Signed-off-by: Alexander Bokovoy Reviewed-by: Andreas Schneider Autobuild-User(master): Alexander Bokovoy Autobuild-Date(master): Wed Aug 14 13:07:42 UTC 2019 on sn-devel-184 commit 685bb03de6ab733590831d1df4f5fd60d2ac427d Author: Alexander Bokovoy Date: Thu Aug 1 15:48:58 2019 +0300 lookup_name: allow own domain lookup when flags == 0 In 2007, we've added support for multiple lookup levels for LSA LookupNames family of calls. However, forest-wide lookups, as described in MS-LSAT 2.2.16, never worked because flags passed to lookup_name() were always set to zero, expecting at least default lookup on a DC to apply. lookup_name() was instead treating zero flags as 'skip all checks'. Allow at least own domain lookup in case domain name is the same. This should allow FreeIPA DC to respond to LSA LookupNames3 calls from a trusted AD DC side. For the reference, below is a request Windows Server 2016 domain controller sends to FreeIPA domain controller when attempting to look up a user from a trusted forest root domain that attemps to login to the domain controller. Notice the level in the lsa_LookupNames3 call and resulting flags in lookup_name(). [2019/08/03 07:14:24.156065, 1, pid=23639, effective(967001000, 967001000), real(967001000, 0), class=rpc_parse] ../../librpc/ndr/ndr.c:471(ndr_print_function_debug) lsa_LookupNames3: struct lsa_LookupNames3 in: struct lsa_LookupNames3 handle : * handle: struct policy_handle handle_type : 0x (0) uuid : 004c---455d-3018575c num_names: 0x0001 (1) names: ARRAY(1) names: struct lsa_String length : 0x000a (10) size : 0x000c (12) string : * string : 'XS\ab' sids : * sids: struct lsa_TransSidArray3 count: 0x (0) sids : NULL level: LSA_LOOKUP_NAMES_UPLEVEL_TRUSTS_ONLY2 (6) count: * count: 0x (0) lookup_options : LSA_LOOKUP_OPTION_SEARCH_ISOLATED_NAMES (0) client_revision : LSA_CLIENT_REVISION_2 (2) [2019/08/03 07:14:24.156189, 6, pid=23639, effective(967001000, 967001000), real(967001000, 0), class=rpc_srv] ../../source3/rpc_server/rpc_handles.c:339(find_policy_by_hnd_internal) Found policy hnd[0] [] 00 00 00 00 4C 00 00 00 00 00 00 00 45 5D 30 18 L... E]0. [0010] 57 5C 00 00W\.. [2019/08/03 07:14:24.156228, 4, pid=23639, effective(967001000, 967001000), real(967001000, 0)] ../../source3/smbd/sec_ctx.c:215(push_sec_ctx) push_sec_ctx(967001000, 967001000) : sec_ctx_stack_ndx = 2 [2019/08/03 07:14:24.156246, 4, pid=23639, effective(967001000, 967001000), real(967001000, 0)] ../../source3/smbd/uid.c:552(push_conn_ctx) push_conn_ctx(0) : conn_ctx_stack_ndx = 0 [2019/08/03 07:14:24.156259, 4, pid=23639, effective(967001000, 967001000), real(967001000, 0)] ../../source3/smbd/sec_ctx.c:319(set_sec_ctx_internal) setting sec ctx (0, 0) - sec_ctx_stack_ndx = 2 [2019/08/03 07:14:24.156273, 5, pid=23639, effective(967001000, 967001000), real(967001000, 0)] ../../libcli/security/security_token.c:53(security_token_debug) Security token: (NULL) [2019/08/03 07:14:24.156285, 5, pid=23639, effective(967001000, 967001000), real(967001000, 0)] ../../source3/auth/token_util.c:865
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 63dc60767eb s3:auth_winbind: ignore a missing winbindd as NT4
PDC/BDC without trusts
via ec3adc1e5b3 s3:auth_winbind: return NT_STATUS_NO_LOGON_SERVERS if
winbindd is not available
via f3bac8c9112 s3:auth_winbind: remove fallback to optional backend
via 865538fabae s3:auth: ignore create_builtin_guests() failing without
a valid idmap configuration
from 1b263ed631c s3-vfs-streams_xattr: add close call
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 63dc60767eb13d8fc09ed4bc44faa538581b18f1
Author: Stefan Metzmacher
Date: Sat Dec 8 23:25:40 2018 +0100
s3:auth_winbind: ignore a missing winbindd as NT4 PDC/BDC without trusts
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13722
Signed-off-by: Stefan Metzmacher
Reviewed-by: Alexander Bokovoy
Autobuild-User(master): Alexander Bokovoy
Autobuild-Date(master): Thu Dec 20 12:15:09 CET 2018 on sn-devel-144
commit ec3adc1e5b3cc953576efa795dfb25af08a8ab79
Author: Stefan Metzmacher
Date: Sat Dec 8 22:53:21 2018 +0100
s3:auth_winbind: return NT_STATUS_NO_LOGON_SERVERS if winbindd is not
available
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13722
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13723
Signed-off-by: Stefan Metzmacher
Reviewed-by: Alexander Bokovoy
commit f3bac8c91121871bf8ce852bc3e3ea2e834d3f27
Author: Stefan Metzmacher
Date: Sat Dec 8 22:48:33 2018 +0100
s3:auth_winbind: remove fallback to optional backend
This is not possible anymore, as the trustdomain backend
was removed in commit 75c152c0d764165a4a9dd0a85390af063dd0192a.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13722
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13723
Signed-off-by: Stefan Metzmacher
Reviewed-by: Alexander Bokovoy
commit 865538fabaea33741f5fa542dbc3f2e08308c2c1
Author: Stefan Metzmacher
Date: Wed Dec 19 09:38:33 2018 +0100
s3:auth: ignore create_builtin_guests() failing without a valid idmap
configuration
This happens on standalone servers, where winbindd is automatically
started by init scripts if it's installed. But it's not really
used and may not have a valid idmap configuration (
"idmap config * : range" has no default!)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13697
Signed-off-by: Stefan Metzmacher
Reviewed-by: Alexander Bokovoy
---
Summary of changes:
source3/auth/auth.c | 2 +-
source3/auth/auth_winbind.c | 47 ++---
source3/auth/token_util.c | 18 -
3 files changed, 49 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index d13d0fe471c..0a96d591808 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -557,7 +557,7 @@ NTSTATUS make_auth3_context_for_netlogon(TALLOC_CTX
*mem_ctx,
switch (lp_server_role()) {
case ROLE_DOMAIN_BDC:
case ROLE_DOMAIN_PDC:
- methods = "sam_netlogon3 winbind:trustdomain";
+ methods = "sam_netlogon3 winbind";
break;
default:
diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c
index 6bf2118037d..93b832265cf 100644
--- a/source3/auth/auth_winbind.c
+++ b/source3/auth/auth_winbind.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "auth.h"
+#include "passdb.h"
#include "nsswitch/libwbclient/wbclient.h"
#undef DBGC_CLASS
@@ -110,13 +111,37 @@ static NTSTATUS check_winbind_security(const struct
auth_context *auth_context,
}
if (wbc_status == WBC_ERR_WINBIND_NOT_AVAILABLE) {
- struct auth_methods *auth_method =
- (struct auth_methods *)my_private_data;
+ struct pdb_trusted_domain **domains = NULL;
+ uint32_t num_domains = 0;
+ NTSTATUS status;
+
+ if (lp_server_role() == ROLE_DOMAIN_MEMBER) {
+ status = NT_STATUS_NO_LOGON_SERVERS;
+ DBG_ERR("winbindd not running - "
+ "but required as domain member: %s\n",
+ nt_errstr(status));
+ return status;
+ }
- if ( auth_method )
- return auth_method->auth(auth_context,
auth_method->private_data,
- mem_ctx, user_info, server_info);
- return NT_STATUS_LOGON_FAILURE;
+ status = pdb_enum_trusted_domains(talloc_tos(), _domains,
);
+ if (!NT_S
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via dfbfb7eb941 waf: Utils package not defined
from 5517d60653b traffic_replay: Add a max-members option to cap group
size
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit dfbfb7eb941b68ce75adc3ece25915b2eefaf886
Author: Swen Schillig
Date: Mon Nov 26 20:14:21 2018 +0100
waf: Utils package not defined
Fix the package name for the WafError routine.
Signed-off-by: Swen Schillig
Reviewed-by: Stefan Metzmacher
Reviewed-by: Alexander Bokovoy
Autobuild-User(master): Alexander Bokovoy
Autobuild-Date(master): Tue Dec 4 18:45:38 CET 2018 on sn-devel-144
---
Summary of changes:
third_party/aesni-intel/wscript | 8
third_party/wscript | 6 +++---
wscript | 8
3 files changed, 11 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/third_party/aesni-intel/wscript b/third_party/aesni-intel/wscript
index bb874454ca6..955b5162140 100644
--- a/third_party/aesni-intel/wscript
+++ b/third_party/aesni-intel/wscript
@@ -1,6 +1,6 @@
#!/usr/bin/env python
from waflib import Options
-from waflib import Utils
+from waflib import Errors
def configure(conf):
if Options.options.accel_aes.lower() == "intelaesni":
@@ -14,11 +14,11 @@ def configure(conf):
print("Compiling with Intel AES instructions")
conf.DEFINE('HAVE_AESNI_INTEL', 1)
else:
-raise Utils.WafError('--accel-aes=intelaesni selected and non
x86_64 CPU')
+raise Errors.WafError('--accel-aes=intelaesni selected and non
x86_64 CPU')
else:
-raise Utils.WafError('--aes-accel=intelaesni selected and compiler
rejects ' + str(asm_flags))
+raise Errors.WafError('--aes-accel=intelaesni selected and
compiler rejects ' + str(asm_flags))
if not conf.CHECK_LDFLAGS('-Wl,-z,noexecstack'):
-raise Utils.WafError('--accel-aes=intelaesni selected and linker
rejects -z noexecstack')
+raise Errors.WafError('--accel-aes=intelaesni selected and linker
rejects -z noexecstack')
def build(bld):
if not bld.CONFIG_SET('HAVE_AESNI_INTEL'):
diff --git a/third_party/wscript b/third_party/wscript
index c4744b7a589..f7a6daff0dd 100644
--- a/third_party/wscript
+++ b/third_party/wscript
@@ -3,7 +3,7 @@
import os
import sys
import samba_git
-from waflib import Options, Utils
+from waflib import Options, Errors
# work out what python external libraries we need to install
external_pkgs = {
@@ -29,12 +29,12 @@ def find_third_party_module(conf, module, package):
__import__(module)
except ImportError:
if samba_git.has_submodules(conf.srcnode.abspath()):
-raise Utils.WafError("""\
+raise Errors.WafError("""\
Unable to find Python module '%s'. Please install the system package or check \
out the relevant submodule by running 'git submodule update --init'.
""" % module)
else:
-raise Utils.WafError("""\
+raise Errors.WafError("""\
Unable to find Python module '%s'. Please install the system package or place
a copy in
%s.
""" % (module, package))
diff --git a/wscript b/wscript
index c06a2e38a87..da4254efde4 100644
--- a/wscript
+++ b/wscript
@@ -237,11 +237,11 @@ def configure(conf):
if Options.options.with_system_heimdalkrb5:
if Options.options.with_system_mitkrb5:
-raise Utils.WafError('--with-system-heimdalkrb5 conflicts with ' +
- '--with-system-mitkrb5')
+raise Errors.WafError('--with-system-heimdalkrb5 conflicts with ' +
+ '--with-system-mitkrb5')
if not Options.options.without_ad_dc:
-raise Utils.WafError('--with-system-heimdalkrb5 requires ' +
- '--without-ad-dc')
+raise Errors.WafError('--with-system-heimdalkrb5 requires ' +
+ '--without-ad-dc')
conf.env.SYSTEM_LIBS += ('heimdal', 'asn1', 'com_err', 'roken',
'hx509', 'wind', 'gssapi', 'hcrypto',
'krb5', 'heimbase', 'asn1_compile',
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 899d00e6be5 s4-auth-tests: Fix test_kerberos with MIT krb
from a979bb28b30 lib: Use dom_sid_str_buf
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 899d00e6be5af48b93c15beb43f7383eeb8508b1
Author: Justin Stephenson
Date: Thu Nov 8 10:57:48 2018 -0500
s4-auth-tests: Fix test_kerberos with MIT krb
When a keytab of type MEMORY is used, the MIT kerberos krb5_kt_add_entry()
library function adds a keytab entry to the beginning of the keytab table,
instead of the end.
This adds a MIT kerberos conditional to reverse iterate through
the keytable entries to address this.
Signed-off-by: Justin Stephenson
Reviewed-by: Andreas Schneider
Reviewed-by: Alexander Bokovoy
Autobuild-User(master): Alexander Bokovoy
Autobuild-Date(master): Sat Nov 10 12:48:02 CET 2018 on sn-devel-144
---
Summary of changes:
source4/auth/tests/kerberos.c | 17 +
1 file changed, 17 insertions(+)
Changeset truncated at 500 lines:
diff --git a/source4/auth/tests/kerberos.c b/source4/auth/tests/kerberos.c
index fcc8ac45f7e..7711eac2afa 100644
--- a/source4/auth/tests/kerberos.c
+++ b/source4/auth/tests/kerberos.c
@@ -51,6 +51,7 @@ static void internal_obsolete_keytab_test(int num_principals,
int num_kvnos,
code = krb5_kt_start_seq_get(krb5_ctx, keytab, );
assert_int_equal(code, 0);
+#ifdef SAMBA4_USES_HEIMDAL
for (i=0; i=0; i--) {
+ expect_princ_name[4] = (char)i+48;
+ for (j=num_kvnos; j>0; j--) {
+ char *unparsed_name;
+ code = krb5_kt_next_entry(krb5_ctx, keytab,
+ _entry, );
+ assert_int_equal(code, 0);
+ assert_int_equal(kt_entry.vno, j);
+#endif
krb5_unparse_name(krb5_ctx, kt_entry.principal,
_name);
assert_string_equal(expect_princ_name, unparsed_name);
@@ -72,7 +85,11 @@ static void internal_obsolete_keytab_test(int
num_principals, int num_kvnos,
code = krb5_kt_start_seq_get(krb5_ctx, keytab, );
assert_int_equal(code, 0);
+#ifdef SAMBA4_USES_HEIMDAL
for (i=0; i=0; i--) {
+#endif
char *unparsed_name;
expect_princ_name[4] = (char)i+48;
code = krb5_kt_next_entry(krb5_ctx, keytab, _entry, );
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 587bbd3 wafsamba: Drop unused, broken install_dir()
via b4fa3f9 wafsamba: Have INSTALL_DIR() log directory creation
via 26ea0f5 wafsamba: Make INSTALL_DIR() respect $DESTDIR
via a122428 ctdb-build: Use wafsamba's INSTALL_DIR()
from ad04275 wafsamba: remove tru64cc.py as it's not compatible with waf
2
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 587bbd3eb17d41c4c78a068d16c7f4182f196f47
Author: Martin Schwenke
Date: Tue Sep 11 14:35:38 2018 +1000
wafsamba: Drop unused, broken install_dir()
This is broken because it doesn't respect $DESTDIR.
Signed-off-by: Martin Schwenke
Reviewed-by: Alexander Bokovoy
Autobuild-User(master): Alexander Bokovoy
Autobuild-Date(master): Tue Sep 11 10:00:05 CEST 2018 on sn-devel-144
commit b4fa3f982a38bce10d471c5b309f4f0f631c300c
Author: Martin Schwenke
Date: Tue Sep 11 14:35:02 2018 +1000
wafsamba: Have INSTALL_DIR() log directory creation
Signed-off-by: Martin Schwenke
Reviewed-by: Alexander Bokovoy
commit 26ea0f58daace4adef7c5bb17f19476083bf3b7b
Author: Martin Schwenke
Date: Mon Sep 10 10:35:24 2018 +1000
wafsamba: Make INSTALL_DIR() respect $DESTDIR
INSTALL_DIR() currently ignores $DESTDIR and just installs directories
into the final destination.
Signed-off-by: Martin Schwenke
Reviewed-by: Alexander Bokovoy
commit a122428a585281ebaf0135f11bd9377af9f6ab97
Author: Martin Schwenke
Date: Sun Sep 9 20:34:31 2018 +1000
ctdb-build: Use wafsamba's INSTALL_DIR()
install_dir() doesn't work (doesn't respect $DESTDIR) and is only
available for backward compatibilty.
Signed-off-by: Martin Schwenke
Reviewed-by: Alexander Bokovoy
---
Summary of changes:
buildtools/wafsamba/samba_waf18.py | 17 -
buildtools/wafsamba/wafsamba.py| 4 +++-
ctdb/wscript | 8
3 files changed, 7 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_waf18.py
b/buildtools/wafsamba/samba_waf18.py
index 8a4558d..2644130 100644
--- a/buildtools/wafsamba/samba_waf18.py
+++ b/buildtools/wafsamba/samba_waf18.py
@@ -133,23 +133,6 @@ def undefine(self, key, from_env=True, comment=None):
if from_env:
self.env[key] = ()
-def install_dir(self, path):
-if not path:
-return []
-
-destpath = Utils.subst_vars(path, self.env)
-
-if self.is_install > 0:
-Logs.info('* creating %s', destpath)
-Utils.check_dir(destpath)
-elif self.is_install < 0:
-Logs.info('* removing %s', destpath)
-try:
-os.remove(destpath)
-except OSError:
-pass
-Build.BuildContext.install_dir = install_dir
-
class ConfigurationContext(Configure.ConfigurationContext):
def init_dirs(self):
self.setenv('default')
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index d6754e9..dbcfe12 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -897,11 +897,13 @@ def INSTALL_DIR(bld, path, chmod=0o755, env=None):
if not path:
return []
-destpath = bld.EXPAND_VARIABLES(path)
+destpath = os.path.join(Options.options.destdir,
+bld.EXPAND_VARIABLES(path).lstrip(os.sep))
if bld.is_install > 0:
if not os.path.isdir(destpath):
try:
+Logs.info('* create %s', destpath)
os.makedirs(destpath)
os.chmod(destpath, chmod)
except OSError as e:
diff --git a/ctdb/wscript b/ctdb/wscript
index 59deb8c..06cc154 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -861,12 +861,12 @@ def build(bld):
'config/notification.README',
destname='README')
-bld.install_dir(bld.env.CTDB_LOGDIR)
-bld.install_dir(bld.env.CTDB_RUNDIR)
-bld.install_dir(bld.env.CTDB_VARDIR)
+bld.INSTALL_DIR(bld.env.CTDB_LOGDIR)
+bld.INSTALL_DIR(bld.env.CTDB_RUNDIR)
+bld.INSTALL_DIR(bld.env.CTDB_VARDIR)
for d in ['volatile', 'persistent', 'state']:
-bld.install_dir(os.path.join(bld.env.CTDB_VARDIR, d))
+bld.INSTALL_DIR(os.path.join(bld.env.CTDB_VARDIR, d))
bld.SAMBA_BINARY('errcode',
source='tests/src/errcode.c',
--
Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch master updated
On pe, 07 syys 2018, Andrew Bartlett wrote: > The branch, master has been updated >via 4847daf wafsamba/samba_waf18: redefine flex function >via 364077d lib/replace/wscript: fix detection of a fallthrough > attribute for clang >via 311e1eb wafsamba/samba_autoconf: when setting undefined result, > use empty tuple >via 193fdbf s3/wscript: fix flex detection >via e761271 s3/wscript: fix bison detection > from 4a63ab9 s4/selftest/tests: Enabled samba.tests.samba_tool.computer > > https://git.samba.org/?p=samba.git;a=shortlog;h=master While Andrew pushed the current patch set, Metze pointed out that it didn't solve the issue with CONFIG_SET() still reporting undefined defines are set if they were stored in the cache as '0'. Attached patch should fix the issue. On FreeBSD 11.2 I now have: $ egrep '(HAVE_BSD_STRTOLL|INCOHERENT_MMAP|WORKING_STRPTIME)' bin/default/include/config.h bin/c4che/default_cache.py bin/default/include/config.h:#define HAVE_BSD_STRTOLL 1 bin/default/include/config.h:/* #undef HAVE_WORKING_STRPTIME */ bin/default/include/config.h:/* #undef HAVE_INCOHERENT_MMAP */ bin/c4che/default_cache.py:HAVE_BSD_STRTOLL = 1 bin/c4che/default_cache.py:HAVE_INCOHERENT_MMAP = () bin/c4che/default_cache.py:HAVE_WORKING_STRPTIME = () -- / Alexander Bokovoy >From 92f2b9b2bac513412169de959285c35a40ea9d07 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Fri, 7 Sep 2018 14:34:48 + Subject: [PATCH] buildtools/wafsamba: undefine a define for a failed test unless asked to keep it If conf.CHECK_CODE() is called without `always=True` and the test has failed, undefine the define already set to '0' by conf.check_code(). This restores expectations that undefined symbols are not considered to be set by CONFIG_SET() method. Signed-off-by: Alexander Bokovoy --- buildtools/wafsamba/samba_autoconf.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index 6b940e53c00..ced824d593d 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -447,6 +447,8 @@ def CHECK_CODE(conf, code, define, except Exception: if always: conf.DEFINE(define, 0) +else: +conf.undefine(define) conf.COMPOUND_END(False) if mandatory: raise -- 2.18.0
Re: [SCM] Samba Shared Repository - branch master updated
On ke, 05 syys 2018, Amitay Isaacs wrote:
> > Thank you, Andrew, for the reviews and persistent push to complete this!
> >
> > We are using WAF 2.x now which should allow us to concentrate on
> > switching to Python 3 for the build process as well for all our
> > libraries and components.
> >
> > If you see any build issues related to the WAF, please report them.
> > Autobuild succeeded but we might still have pieces of Python code that
> > aren't excercised through the autobuild targets.
>
> Great job updating to the latest waf.
>
> Now fixing all the corner cases... ;-)
:)
>
> On freebsd-11, waf does not want to use clang and complains that it
> cannot find a C compiler.
Thanks, I'll do a FreeBSD v11 VM later this week if nobody else gets it
fixed earlier. The python exception you see is due to this one:
def CHECK_STANDARD_LIBPATH(conf):
# at least gcc and clang support this:
try:
cmd = conf.env.CC + ['-print-search-dirs']
out = Utils.cmd_output(cmd).split('\n')
except ValueError:
# option not supported by compiler - use a standard list of directories
dirlist = [ '/usr/lib', '/usr/lib64' ]
except:
raise Errors.WafError('Unexpected error running "%s"' % (cmd))
.
we don't even have conf.env.CC set and get an exception while
defining 'cmd' value, thus it is not defined when the latter except:
statement runs.
I'll look at it.
--
/ Alexander Bokovoy
Re: [SCM] Samba Shared Repository - branch master updated
ate to handle waf 2.0.4 >via 7f6ce8f pidl/wscript: update to handle waf 2.0.4 >via e1e5b57 packaging/wscript: update to handle waf 2.0.4 >via 8a74116 nsswitch/wscript_build: update to handle waf 2.0.4 >via e676183 lib/util/wscript_configure: update to handle waf 2.0.4 >via 5f57714 lib/util/wscript: update to handle waf 2.0.4 >via d4cef3b lib/tevent/wscript: update to handle waf 2.0.4 >via 15288c3 lib/tdb/wscript: update to handle waf 2.0.4 >via 62bb573 lib/talloc/wscript: update to handle waf 2.0.4 >via ea57883 lib/replace/wscript: update to handle waf 2.0.4 >via 0c703f1 lib/ldb/wscript: update to handle waf 2.0.4 >via b0a12c8 lib/crypto/wscript_configure: update to handle waf 2.0.4 >via b999fd3 lib/crypto/wscript: update to handle waf 2.0.4 >via 18c3598 dynconfig/wscript: update to handle waf 2.0.4 >via efa94eb docs-xml/wscript_build: update to handle waf 2.0.4 >via 65074d8 ctdb/wscript: update to handle waf 2.0.4 >via 4e65b33 third_party:waf: update to upstream 2.0.4 release >via faef275 build:wafsamba: Remove unnecessary parameters to > cmd_and_log >via 247d12c build:wafsamba: Ignore cfg_file absolute paths differences >via cbc6534 thirdparty:waf: New files for waf 1.9.10 >via 48cf9cc selftest/tests.py: Update path to waflib >via 5967335 script/autobuild: use --out instead of -b when calling > configure >via 9aa8f2b build:wafsamba: detail where we are processing the > autobuild >via 5d99786 build:wafsamba: Update dist/distcheck commands >via 8077f46 build:wafsamba: Build on waf 1.9 > from f3e349b krb5-samba: interdomain trust uses different salt > principal > > https://git.samba.org/?p=samba.git;a=shortlog;h=master Thank you, Andrew, for the reviews and persistent push to complete this! We are using WAF 2.x now which should allow us to concentrate on switching to Python 3 for the build process as well for all our libraries and components. If you see any build issues related to the WAF, please report them. Autobuild succeeded but we might still have pieces of Python code that aren't excercised through the autobuild targets. -- / Alexander Bokovoy
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c390728 samba-tool trust: support discovery via netr_GetDcName
via 6800077 s3:selftest: run rpc.lsa.lookupsids also with explicit
[smb1] and [smb2]
via 4422f73 s4:librpc: autonegotiate SMB1/2/3
via 802e43b python/tests: use explicit "client ipc max protocol = NT1"
for samba.tests.net_join_no_spnego
via 70a9cf9 tests/auth_log: Permit SMB2 service description if empty
binding is used for kerberos authentication
via e4910f3 s4:libcli: add smb_connect_nego_{send,recv}()
via 5188454 s4:libcli: allow a fallback to NTLMSSP if SPNEGO is not
supported locally
via ca000d8 s4:libcli: add fallback_to_anonymous to smb2_connect_send()
via f20e607 s4:libcli: allow passing an already negotiated connection
to smb2_connect_send()
via 5ad5b81 s4:libcli: split out smb2_connect_session_start()
via ce2248c s4:libcli: add smb2_transport_raw_init()
via 2b68f9b s4:libcli: allow passing an already negotiated connection
to smb_composite_connect()
via 87d7339 s4:libcli: use talloc_zero() for struct
smb_composite_connect in fetchfile.c
via b7e99c2 s4:libcli: add smbcli_transport_raw_init()
via 17b12a9 s4:libcli: split out smb_raw_negotiate_fill_transport()
via 062b518 librpc: add binding handle support for [smb1]
from 6de9d87 python/samba/tests: make sure samba.tests can be imported
without SamDB
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c390728819e73cefbf02e0d52d22805930f4c45b
Author: Alexander Bokovoy
Date: Sat Feb 24 14:34:44 2018 +0200
samba-tool trust: support discovery via netr_GetDcName
In case a remote DC does not support netr_DsRGetDCNameEx2(),
use netr_GetDcName() instead.
This should help with FreeIPA where embedded smbd runs as a domain
controller but does not implement full Active Directory compatibility.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13538
Signed-off-by: Alexander Bokovoy
Reviewed-by: Stefan Metzmacher
Autobuild-User(master): Alexander Bokovoy
Autobuild-Date(master): Tue Jul 24 09:55:23 CEST 2018 on sn-devel-144
commit 6800077c5c57c257326573537d1f2bb7a8066149
Author: Stefan Metzmacher
Date: Thu Jul 19 07:34:11 2018 +0200
s3:selftest: run rpc.lsa.lookupsids also with explicit [smb1] and [smb2]
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13308
Signed-off-by: Stefan Metzmacher
Reviewed-by: Alexander Bokovoy
commit 4422f7382aad3090cb959ade030a02bf4fef81ac
Author: Stefan Metzmacher
Date: Wed Jul 18 16:55:33 2018 +0200
s4:librpc: autonegotiate SMB1/2/3
Windows Server 1709 defaults to SMB2 and does not have SMB1 enabled.
When establishing trust, samba-tool does not specify SMB protocol
version and fail by default.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13308
Signed-off-by: Stefan Metzmacher
Reviewed-by: Alexander Bokovoy
commit 802e43bf742e756896fa73fcd139feca9ae293dd
Author: Stefan Metzmacher
Date: Mon Jul 23 00:17:35 2018 +0200
python/tests: use explicit "client ipc max protocol = NT1" for
samba.tests.net_join_no_spnego
The tests rely on SMB1.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13308
Signed-off-by: Stefan Metzmacher
Reviewed-by: Alexander Bokovoy
commit 70a9cf9ccfc4075cc08209191db1bce2c9b432fc
Author: Alexander Bokovoy
Date: Thu Jul 19 14:07:39 2018 +0300
tests/auth_log: Permit SMB2 service description if empty binding is used
for kerberos authentication
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13308
Pair-Programmed-With: Stefan Metzmacher
Signed-off-by: Alexander Bokovoy
Signed-off-by: Stefan Metzmacher
commit e4910f35eab008a41cfcac3d97b3647c721ac679
Author: Stefan Metzmacher
Date: Wed Jul 18 14:52:43 2018 +0200
s4:libcli: add smb_connect_nego_{send,recv}()
This can be used to create a connection up to a negotiated
smbXcli_conn.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13308
Signed-off-by: Stefan Metzmacher
Reviewed-by: Alexander Bokovoy
commit 5188454bdce80f6e2bfc45deca18bd1b7289a7a6
Author: Stefan Metzmacher
Date: Thu Jul 19 23:04:33 2018 +0200
s4:libcli: allow a fallback to NTLMSSP if SPNEGO is not supported locally
Signed-off-by: Stefan Metzmacher
Reviewed-by: Alexander Bokovoy
commit ca000d8901e6acb8a7c59d26d4f75c9d92bafece
Author: Stefan Metzmacher
Date: Wed Jul 18 23:52:30 2018 +0200
s4:libcli: add fallback_to_anonymous to smb2_connect_send()
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13308
Signed-off-by: Stefan Metzmacher
Reviewed-by: Alexander Bokovoy
commit f20e607c15b4c8ae56ade5d7e68d832542a2cd5e
Author: Stefan Metzmac
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a753ccf s3:smbspool: Fix cmdline argument handling
via 47713d6 vfs_virusfilter_fsav: Initialize stack pointers per
README.Coding
via ca387c2 samdb: fix wrong computer container dn for newcomputer
from 8a0c7f3 ldb: Prepare to allow tests to operate on ldb_mdb (by using
the GUID index)
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a753ccfd946aaad320977ae8c5f483f73077c3f8
Author: Andreas Schneider <a...@samba.org>
Date: Thu May 3 10:17:12 2018 +0200
s3:smbspool: Fix cmdline argument handling
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13417
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
Autobuild-User(master): Alexander Bokovoy <a...@samba.org>
Autobuild-Date(master): Thu May 3 16:33:54 CEST 2018 on sn-devel-144
commit 47713d648740cf2d11436ac6bd768c23cf89ca7f
Author: Andrew Bartlett <abart...@samba.org>
Date: Thu May 3 14:28:02 2018 +1200
vfs_virusfilter_fsav: Initialize stack pointers per README.Coding
This allows a build with --address-sanitizer
Signed-off-by: Andrew Bartlett <abart...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
commit ca387c221f97421604346c141a857aba729493e7
Author: Joe Guo <j...@catalyst.net.nz>
Date: Wed May 2 04:41:04 2018 +
samdb: fix wrong computer container dn for newcomputer
CN=Users --> CN=Computers
Signed-off-by: Joe Guo <j...@catalyst.net.nz>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
Reviewed-by: Rowland Penny <rpe...@samba.org>
---
Summary of changes:
python/samba/samdb.py | 2 +-
source3/client/smbspool.c | 61 +++---
source3/modules/vfs_virusfilter_fsav.c | 2 +-
source3/script/tests/test_smbspool.sh | 30 +
4 files changed, 74 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/samdb.py b/python/samba/samdb.py
index b66afb7..424a648 100644
--- a/python/samba/samdb.py
+++ b/python/samba/samdb.py
@@ -508,7 +508,7 @@ member: %s
raise Exception('Illegal computername "%s"' % computername)
samaccountname = "%s$" % cn
-computercontainer_dn = "CN=Users,%s" % self.domain_dn()
+computercontainer_dn = "CN=Computers,%s" % self.domain_dn()
if computerou:
computercontainer_dn = self.normalize_dn_in_domain(computerou)
diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index 3660319..389e4ea 100644
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -100,6 +100,9 @@ main(int argc, /* I - Number of
command-line arguments */
const char *dev_uri;
const char *config_file = NULL;
TALLOC_CTX *frame = talloc_stackframe();
+ bool device_uri_cmdline = false;
+ const char *print_file = NULL;
+ const char *print_copies = NULL;
int cmp;
int len;
@@ -117,7 +120,12 @@ main(int argc, /* I - Number of
command-line arguments */
goto done;
}
- if (argc < 7 || argc > 8) {
+ /*
+* We need at least 5 options if the DEVICE_URI is passed via an env
+* variable and printing data comes via stdin.
+* We don't accept more than 7 options in total, including optional.
+*/
+ if (argc < 5 || argc > 8) {
fprintf(stderr,
"Usage: %s [DEVICE_URI] job-id user title copies options [file]\n"
" The DEVICE_URI environment variable can also contain the\n"
@@ -129,37 +137,52 @@ main(int argc,/* I - Number of
command-line arguments */
}
/*
- * If we have 7 arguments, print the file named on the command-line.
- * Otherwise, print data from stdin...
- */
-
+* If we have 6 arguments find out if we have the device_uri from the
+* command line or the print data
+*/
if (argc == 7) {
- /*
-* Print from Copy stdin to a temporary file...
-*/
+ cmp = strncmp(argv[1], "smb://", 6);
+ if (cmp == 0) {
+ device_uri_cmdline = true;
+ } else {
+ print_copies = argv[4];
+ print_file = argv[6];
+ }
+ } else if (argc == 8) {
+ device_uri_cmdline = true;
+ print_copies = argv[5];
+ print_file = argv[7];
+ }
- fp = stdin;
- copi
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a18b510 s3/security.c undefined value
via c67a2f8 ldb_wrap.c missing header
from 9985947 s3:passdb: Do not return OK if we don't have pinfo set up
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a18b51000ef2ab5c9c111490394ce0e2425edee2
Author: William Brown <will...@blackhats.net.au>
Date: Thu Apr 19 09:39:33 2018 +1000
s3/security.c undefined value
s3/security.c had an NTSTATUS status that was undefined and with the
configure
option --address-sanitizer this caused uninitialised value error.
Signed-off-by: William Brown <will...@blackhats.net.au>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
Reviewed-by: Simo Sorce <i...@samba.org>
Autobuild-User(master): Alexander Bokovoy <a...@samba.org>
Autobuild-Date(master): Fri Apr 20 18:18:25 CEST 2018 on sn-devel-144
commit c67a2f85a7b9331feaef1489cbaaba11de4f9748
Author: William Brown <will...@blackhats.net.au>
Date: Thu Apr 19 09:39:17 2018 +1000
ldb_wrap.c missing header
ldb_wrap.c was missing unistd.h causing implicit symbol declaration and
error
during compilation.
Signed-off-by: William Brown <will...@blackhats.net.au>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
Reviewed-by: Simo Sorce <i...@samba.org>
---
Summary of changes:
lib/ldb-samba/ldb_wrap.c| 1 +
source3/libgpo/gpext/security.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb-samba/ldb_wrap.c b/lib/ldb-samba/ldb_wrap.c
index 143e128..3d3eb8b 100644
--- a/lib/ldb-samba/ldb_wrap.c
+++ b/lib/ldb-samba/ldb_wrap.c
@@ -37,6 +37,7 @@
#include "../lib/util/dlinklist.h"
#include "lib/util/util_paths.h"
#include
+#include
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_LDB
diff --git a/source3/libgpo/gpext/security.c b/source3/libgpo/gpext/security.c
index 29e7bb7..b6b7ca0 100644
--- a/source3/libgpo/gpext/security.c
+++ b/source3/libgpo/gpext/security.c
@@ -150,7 +150,7 @@ static NTSTATUS security_process_group_policy(TALLOC_CTX
*mem_ctx,
const struct GROUP_POLICY_OBJECT
*deleted_gpo_list,
const struct GROUP_POLICY_OBJECT
*changed_gpo_list)
{
- NTSTATUS status;
+ NTSTATUS status = NT_STATUS_OK;
char *unix_path = NULL;
struct gp_inifile_context *ini_ctx = NULL;
const struct GROUP_POLICY_OBJECT *gpo;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0ed918e Build py3 versions of other rpc modules
via 303a52d py3: Make sure to specify METH_VARARGS together with
METH_KEYWORDS
from a4c3ee6 s3:smbclient: Allow last dos attribute to be cleared
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0ed918ef5276c459d46c9e77c9e9d84bc41d4b14
Author: Alexander Bokovoy <a...@samba.org>
Date: Thu Jul 13 14:49:12 2017 +0300
Build py3 versions of other rpc modules
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12905
Signed-off-by: Alexander Bokovoy <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Autobuild-User(master): Alexander Bokovoy <a...@samba.org>
Autobuild-Date(master): Fri Jul 14 11:36:53 CEST 2017 on sn-devel-144
commit 303a52d8d48e4f5754448a876fedc98d7829e2bb
Author: Alexander Bokovoy <a...@samba.org>
Date: Thu Jul 13 15:37:47 2017 +0300
py3: Make sure to specify METH_VARARGS together with METH_KEYWORDS
A Python 3 bug https://bugs.python.org/issue15657 explains that one should
always use METH_VARARGS|METH_KEYWORDS when defining a function rather
than a lonely METH_KEYWORDS. We had only one definition like this in
Samba and it was the one that affects FreeIPA when running in Python 3
mode.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12905
Signed-off-by: Alexander Bokovoy <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
---
Summary of changes:
source4/libnet/py_net.c | 2 +-
source4/librpc/wscript_build | 242 +--
2 files changed, 122 insertions(+), 122 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c
index 78e60f6..7ddee2d 100644
--- a/source4/libnet/py_net.c
+++ b/source4/libnet/py_net.c
@@ -745,7 +745,7 @@ static PyMethodDef net_obj_methods[] = {
{"replicate_init", (PyCFunction)py_net_replicate_init,
METH_VARARGS|METH_KEYWORDS, py_net_replicate_init_doc},
{"replicate_chunk", (PyCFunction)py_net_replicate_chunk,
METH_VARARGS|METH_KEYWORDS, py_net_replicate_chunk_doc},
{"replicate_decrypt", (PyCFunction)py_net_replicate_decrypt,
METH_VARARGS|METH_KEYWORDS, py_net_replicate_decrypt_doc},
- {"finddc", (PyCFunction)py_net_finddc, METH_KEYWORDS,
py_net_finddc_doc},
+ {"finddc", (PyCFunction)py_net_finddc, METH_VARARGS|METH_KEYWORDS,
py_net_finddc_doc},
{ NULL }
};
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index a14215b..e341432 100644
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -252,159 +252,159 @@ for env in bld.gen_python_environments():
realname='samba/dcerpc/ntlmssp.so'
)
-bld.SAMBA_PYTHON('python_srvsvc',
-source='../../librpc/gen_ndr/py_srvsvc.c',
-deps='RPC_NDR_SRVSVC pytalloc-util pyrpc_util',
-realname='samba/dcerpc/srvsvc.so'
-)
-
-bld.SAMBA_PYTHON('python_echo',
- source='../../librpc/gen_ndr/py_echo.c',
- deps='RPC_NDR_ECHO pytalloc-util pyrpc_util',
- realname='samba/dcerpc/echo.so'
- )
+ bld.SAMBA_PYTHON('python_srvsvc',
+ source='../../librpc/gen_ndr/py_srvsvc.c',
+ deps='RPC_NDR_SRVSVC pytalloc-util pyrpc_util',
+ realname='samba/dcerpc/srvsvc.so'
+ )
+
+ bld.SAMBA_PYTHON('python_echo',
+ source='../../librpc/gen_ndr/py_echo.c',
+ deps='RPC_NDR_ECHO pytalloc-util pyrpc_util',
+ realname='samba/dcerpc/echo.so'
+ )
-bld.SAMBA_PYTHON('python_dns',
- source='../../librpc/gen_ndr/py_dns.c',
- deps='NDR_DNS pytalloc-util pyrpc_util',
- realname='samba/dcerpc/dns.so'
- )
+ bld.SAMBA_PYTHON('python_dns',
+ source='../../librpc/gen_ndr/py_dns.c',
+ deps='NDR_DNS pytalloc-util pyrpc_util',
+ realname='samba/dcerpc/dns.so'
+ )
-bld.SAMBA_PYTHON('python_winreg',
- source='../../librpc/gen_ndr/py_winreg.c',
- deps='RPC_NDR_WINREG pytalloc-util pyrpc_util',
- realname='samba/dcerpc/winreg.so'
- )
+ bld.SAMBA_PYTHON('python_winreg',
+ source='../../librpc/gen_ndr/py_winreg.c',
+ deps='RPC_NDR_WINREG pytalloc-util pyrpc_util',
+ realname='samba/dcerpc/winreg.so'
+ )
-bld.SAMBA_PYTHON('python_initshutdown',
- source='../../librpc/gen_ndr/py_initshutdown.c',
- deps='RPC_NDR_INITSHUTDOWN pytalloc-util pyrpc_util',
- realname='samba/dcerpc/initshutdown.so'
- )
+ bld.SAMBA_PYTHON('python_initshutdown',
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e3707c1 Add code to run the tests for 'samba-tool user edit'
via 3c03ac7 Add test for 'samba-tool user edit'
via 2ab239b Easily edit a users object in AD, as if using ldbedit.
from 79faf30 auth/spnego: pass spnego_in to
gensec_spnego_parse_negTokenInit()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e3707c1b19a27d431722e1b355dc39a39f7f8f1c
Author: Rowland Penny <rpe...@samba.org>
Date: Tue Jul 4 15:07:53 2017 +0100
Add code to run the tests for 'samba-tool user edit'
Signed-off-by: Rowland Penny <rpe...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
Autobuild-User(master): Alexander Bokovoy <a...@samba.org>
Autobuild-Date(master): Wed Jul 5 17:53:24 CEST 2017 on sn-devel-144
commit 3c03ac750f4dea00da21f21302beeaf5b12a35b8
Author: Rowland Penny <rpe...@samba.org>
Date: Tue Jul 4 15:04:36 2017 +0100
Add test for 'samba-tool user edit'
Signed-off-by: Rowland Penny <rpe...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
commit 2ab239be0d69389b451816ec72d548d1156e495b
Author: Rowland Penny <rpe...@samba.org>
Date: Tue Jul 4 15:00:58 2017 +0100
Easily edit a users object in AD, as if using ldbedit.
Signed-off-by: Rowland Penny <rpe...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
---
Summary of changes:
python/samba/netcmd/user.py | 139 +-
python/samba/tests/samba_tool/edit.sh | 72 ++
source4/selftest/tests.py | 4 +
3 files changed, 214 insertions(+), 1 deletion(-)
create mode 100755 python/samba/tests/samba_tool/edit.sh
Changeset truncated at 500 lines:
diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py
index 53ac39f..3b744a3 100644
--- a/python/samba/netcmd/user.py
+++ b/python/samba/netcmd/user.py
@@ -21,6 +21,9 @@ import samba.getopt as options
import ldb
import pwd
import os
+import re
+import tempfile
+import difflib
import sys
import fcntl
import signal
@@ -28,7 +31,7 @@ import errno
import time
import base64
import binascii
-from subprocess import Popen, PIPE, STDOUT
+from subprocess import Popen, PIPE, STDOUT, check_call, CalledProcessError
from getpass import getpass
from samba.auth import system_session
from samba.samdb import SamDB
@@ -2283,6 +2286,139 @@ samba-tool user syncpasswords --terminate \\
update_pid(None)
return
+class cmd_user_edit(Command):
+"""Modify User AD object.
+
+This command will allow editing of a user account in the Active Directory
+domain. You will then be able to add or change attributes and their values.
+
+The username specified on the command is the sAMAccountName.
+
+The command may be run from the root userid or another authorized userid.
+
+The -H or --URL= option can be used to execute the command against a remote
+server.
+
+Example1:
+samba-tool user edit User1 -H ldap://samba.samdom.example.com \
+-U administrator --password=passw1rd
+
+Example1 shows how to edit a users attributes in the domain against a remote
+LDAP server.
+
+The -H parameter is used to specify the remote target server.
+
+Example2:
+samba-tool user edit User2
+
+Example2 shows how to edit a users attributes in the domain against a local
+LDAP server.
+
+Example3:
+samba-tool user edit User3 --editor=nano
+
+Example3 shows how to edit a users attributes in the domain against a local
+LDAP server using the 'nano' editor.
+
+"""
+synopsis = "%prog [options]"
+
+takes_options = [
+Option("-H", "--URL", help="LDB URL for database or target server",
+ type=str, metavar="URL", dest="H"),
+Option("--editor", help="Editor to use instead of the system default,"
+ " or 'vi' if no system default is set.", type=str),
+]
+
+takes_args = ["username"]
+takes_optiongroups = {
+"sambaopts": options.SambaOptions,
+"credopts": options.CredentialsOptions,
+"versionopts": options.VersionOptions,
+}
+
+def run(self, username, credopts=None, sambaopts=None, versionopts=None,
+H=None, editor=None):
+
+lp = sambaopts.get_loadparm()
+creds = credopts.get_credentials(lp, fallback_machine=True)
+samdb = SamDB(url=H, session_info=system_session(),
+ credentials=creds, lp=lp)
+
+filter = ("(&(sAMAccountType=%d)(sAMAccountName=%s))" %
+ (dsdb.ATYPE_NORMAL_ACCOUNT, ldb.binary_encode(username)))
+
+domaindn = samdb.domain_d
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b64f0b5 samba-tool: You cannot add members to a group if the member
exists as a sAMAccountName and a CN.
from f180b1c s4:rpc_server: Do some checks of LogonSamLogon flags
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b64f0b5da640524c5f11b0e7eb2777a39fa04b95
Author: Rowland Penny <rpe...@samba.org>
Date: Wed Jun 7 15:57:53 2017 +0100
samba-tool: You cannot add members to a group if the member exists as a
sAMAccountName and a CN.
Signed-off-by: Rowland Penny <rpe...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
Autobuild-User(master): Alexander Bokovoy <a...@samba.org>
Autobuild-Date(master): Fri Jun 9 23:24:47 CEST 2017 on sn-devel-144
---
Summary of changes:
python/samba/netcmd/group.py | 2 ++
python/samba/samdb.py| 9 ++---
2 files changed, 8 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/netcmd/group.py b/python/samba/netcmd/group.py
index 11f8773..b9d6add 100644
--- a/python/samba/netcmd/group.py
+++ b/python/samba/netcmd/group.py
@@ -199,6 +199,8 @@ This command adds one or more members to an existing Active
Directory group. The
When a member is added to a group the member may inherit permissions and
rights from the group. Likewise, when permission or rights of a group are
changed, the changes may reflect in the members through inheritance.
+The member names specified on the command must be the sAMaccountName.
+
Example1:
samba-tool group addmembers supergroup Group1,Group2,User1 -H
ldap://samba.samdom.example.com -Uadministrator%passw0rd
diff --git a/python/samba/samdb.py b/python/samba/samdb.py
index 19dd8e9..719bb8b 100644
--- a/python/samba/samdb.py
+++ b/python/samba/samdb.py
@@ -266,9 +266,12 @@ changetype: modify
""" % (str(targetgroup[0].dn))
for member in members:
-targetmember = self.search(base=self.domain_dn(),
scope=ldb.SCOPE_SUBTREE,
-expression="(|(sAMAccountName=%s)(CN=%s))"
% (
-ldb.binary_encode(member), ldb.binary_encode(member)),
attrs=[])
+filter = ('(&(sAMAccountName=%s)(|(objectclass=user)'
+ '(objectclass=group)))' % ldb.binary_encode(member))
+targetmember = self.search(base=self.domain_dn(),
+ scope=ldb.SCOPE_SUBTREE,
+ expression="%s" % filter,
+ attrs=[])
if len(targetmember) != 1:
raise Exception('Unable to find "%s". Operation
cancelled.' % member)
--
Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch master updated
On ti, 02 touko 2017, Andreas Schneider wrote: > The branch, master has been updated >via 09bc5b5 systemd: fix detection of libsystemd > from 2951c59 torture3: Make sure dbwrap_parse_record returns NOT_FOUND > for invalid watchers data > > https://git.samba.org/?p=samba.git;a=shortlog;h=master > > > - Log - > commit 09bc5b5374227a555f580c3d7c1d82f15bb818bc > Author: Alexander Bokovoy <a...@samba.org> > Date: Thu Sep 29 00:09:12 2016 +0300 > > systemd: fix detection of libsystemd > > On Fedora 25 detection of libsystemd actually fails due to wrong > assumptions in the configure test. conf.CHECK_LIB returns a list > so 'not conf.CHECK_LIB(...)' is always False and we never get to check > libsystemd. > > Instead, remember result of checking pkg-config for separate > libsystemd-daemon and libsystemd-journal libraries. If they miss, > attempt to use libsystemd library instead. > > Signed-off-by: Alexander Bokovoy <a...@samba.org> > Reviewed-by: Andreas Schneider <a...@samba.org> > > Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> > Autobuild-Date(master): Tue May 2 13:05:43 CEST 2017 on sn-devel-144 > > ----------- I created https://bugzilla.samba.org/show_bug.cgi?id=12764 for 4.6 backport. -- / Alexander Bokovoy
Re: [SCM] Samba Shared Repository - branch master updated
On pe, 10 maalis 2017, Andrew Bartlett wrote: > The branch, master has been updated >via 7142a88 waf: disable-python - don't include python.h in > test_headers.c >via 4455547 autobuild: Add nopython environment to test > --disable-python builds (but without tests) >via 7000fa0 waf: disable-python - don't build torture bits >via dbf97e8 waf: disable-python - don't build samba-policy >via fa82998 waf: disable-python - don't build samba-net >via 7eeda99 waf: disable-python - don't build pyrpc_util, dcerpc.py >via 696d2f7 waf: disable-python - don't build PROVISION, pyparam_util >via 676e80b waf: disable-python - don't build python/ >via 81ff0f3 waf: disable-python - align tdb's wscript >via b45ff0b waf: disable-python - align tevent wscript >via ce956be waf: disable-python - align ldb's wscript >via dcba0b1 waf: disable-python - align talloc's wscript >via 7d5db90 waf: disable-python - configuration adjustments >via 5bbcd09 waf: disable-python - add option globally to build system >via 9a9e342 waf: disable-python - fix ctdb configuration >via 8ba2fe5 python: Port the samba.net module to Python 3 >via 0d83cec python: Remove unused import PY3 >via 4ebd877 python: selftest: Add possibility to run old Python test > suites with Python 3 >via 64bc64c python: samba.gensec: Port module to Python 3 compatible > form >via 0672fc1 python: samba.gensec: Fix error handling in > set_credentials() function >via d0914e2 python: selftests: Enable samba.getopt tests execution > with Python 3 >via 9ada914 python: samba.getopt: Port module to Python 3 compatible > form >via da71c39 python: samba.tests.core: Port and enable core tests in > Python 3 >via afe1e83 python: samba.tests: Move import of ported modules out of > PY3 condition >via e9a4649 python: samba._ldb: Port of samba._ldb to Python 3 > compatible form >via 9d8bcea python: samba.tests.auth: Add tests for samba.auth module >via 1ac5bf2 python: samba.auth: Port samba.auth to Python 3 > compatible form >via 47b0148 python: wscript_build: Build some DCE/RPC modules with > Python 3 >via a40d7f1 python: samba.dcerpc: Port security module to Python 3 > comp. form >via e481aed dcerpc/misc tests: asset GUID ordering in python 2 and 3 >via 9843cce python: samba.tests.dcerpc.misc: Port and enable tests >via 3b1c0ba python: samba.dcerpc: Port RPC related stuff to Python 3 >via 2de5fa4 python: pidl: Port Python interface generator >via 5edb0b4 python: samba.tests: Enable Python 3 tests for ported > modules >via b7a5308 buildtools: Work around a . being in the target name when > building python3 helpers >via fe8bba5 python: wscript_build: Build some modules for Python 3 >via 6fa125e python: Make top-level samba modules Python 3 compatible >via 211df4a python: samba.tests.dcerpc: Move Class RawDCERPCTest to > separated file. >via 9c55bb9 python: samba.tests.glue: Add new tests for samba._glue. >via b454b09 python: samba._glue: Port samba._glue module to Python 3. >via 5123f15 python: samba.tests.param: Add missing tests >via 31cef92 python: samba.param: Port param module to Python 3 >via 035e6dc python: samba.tests.credentials: Python 3 compatible tests >via 1dab2b4 python: samba.credentials: Port pycredentials.c to > Python3-compatible form. >via 583ff0a lib/ldb: Enable use of a python3 pyldb-util system library >via f5cafee talloc: use the system pytalloc-util for python3 as well >via 132cbad scripts/traffic_summary: documentation typo >via 4485ba5 ./examples/scripts/SambaConfig.py: fix typo in "continue" >via d424c7d python/examples/winreg: two variable name typos on a > single line >via b7cd0f2 python sites/subnets: correctly spell variable name >via cedb991 python provision: FDSBackend takes forced uri >via b9c5614 python/remove_dc: avoid using non-existent variable >via 732233f samba-tool domain: correctly spell variable name >via 495383c python/join: correct spelling of "ctx.del_noerror" >via 0779d66 selftest: remove unused broken client.py >via 765275c gitignore: add some hidden files >via 17dce5d perftests/ad_dc_search: do less work in expensive member > searches >via bb4ad8d pyldb: p3k readiness: allow single unicode string in msg > element > from 2772fa4 talloc: fix doxygen of talloc_move > Thanks to everyone for this gigantic work on making Python use in Samba modern and more supportable going forward. -- / Alexander Bokovoy
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 57286d5 s3-gse: move krb5 fallback to smb_gss_krb5_import_cred
wrapper
via 3d733d5 s3-gse: convert to use smb_gss_krb5_import_cred
via 5201679 libads: convert to use smb_gss_krb5_import_cred
via ca8fd79 credentials_krb5: convert to use smb_gss_krb5_import_cred
via 0e6e8dd lib/krb5_wrap: add smb_gss_krb5_import_cred wrapper
via d630a36 gssapi: check for gss_acquire_cred_from
from 980eae0 s3-libads: Do not leak the msg on error
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 57286d57732d49fdb8b8e21f584787cdbc917c32
Author: Alexander Bokovoy <a...@samba.org>
Date: Wed Mar 8 12:38:49 2017 +0200
s3-gse: move krb5 fallback to smb_gss_krb5_import_cred wrapper
MIT krb5 1.9 version of gss_krb5_import_cred() may fail when importing
credentials from a keytab without specifying actual principal.
This was fixed in MIT krb5 1.9.2 (see commit
71c3be093db577aa52f6b9a9a3a9f442ca0d8f20 in MIT krb5-1.9 branch, git
master's version is bd18687a705a8a6cdcb7c140764d1a7c6a3381b5).
Move fallback code to the smb_gss_krb5_import_cred wrapper. We only
expect this fallback to happen with krb5 GSSAPI mechanism, thus hard
code use of krb5 mech when calling to gss_acquire_cred.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12611
Signed-off-by: Alexander Bokovoy <a...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
Autobuild-User(master): Alexander Bokovoy <a...@samba.org>
Autobuild-Date(master): Wed Mar 8 22:00:24 CET 2017 on sn-devel-144
commit 3d733d5791a6d82edda13ac39790bd8ba893f3d7
Author: Alexander Bokovoy <a...@samba.org>
Date: Fri Mar 3 16:58:14 2017 +0200
s3-gse: convert to use smb_gss_krb5_import_cred
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12611
Signed-off-by: Alexander Bokovoy <a...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 520167992bd2477bc11920d2dc9ec87f2cb339c9
Author: Alexander Bokovoy <a...@samba.org>
Date: Fri Mar 3 16:57:50 2017 +0200
libads: convert to use smb_gss_krb5_import_cred
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12611
Signed-off-by: Alexander Bokovoy <a...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit ca8fd793930173b4e625d3f286739de214155bc1
Author: Alexander Bokovoy <a...@samba.org>
Date: Fri Mar 3 16:57:13 2017 +0200
credentials_krb5: convert to use smb_gss_krb5_import_cred
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12611
Signed-off-by: Alexander Bokovoy <a...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 0e6e8dd2600c699a7a02e3d11fed21b5bc49858d
Author: Alexander Bokovoy <a...@samba.org>
Date: Fri Mar 3 16:14:57 2017 +0200
lib/krb5_wrap: add smb_gss_krb5_import_cred wrapper
Wrap gss_krb5_import_cred() to allow re-implementing it with
gss_acquire_cred_from() for newer MIT versions. gss_acquire_cred_from()
works fine with GSSAPI interposer (GSS-proxy) while
gss_krb5_import_cred() is not interposed yet.
The wrapper has additional parameter, krb5_context handle, to facilitate
with credentials cache name discovery. All our callers to
gss_krb5_import_cred() already have krb5 context handy.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12611
Signed-off-by: Alexander Bokovoy <a...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit d630a364f9d74443e482934f76cd7107c331e108
Author: Alexander Bokovoy <a...@samba.org>
Date: Fri Mar 3 17:08:09 2017 +0200
gssapi: check for gss_acquire_cred_from
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12611
Signed-off-by: Alexander Bokovoy <a...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
---
Summary of changes:
auth/credentials/credentials_krb5.c | 22 +++--
lib/krb5_wrap/gss_samba.c | 161
lib/krb5_wrap/gss_samba.h | 13 +++
source3/libads/sasl.c | 2 +-
source3/librpc/crypto/gse.c | 69 +++-
wscript_configure_system_mitkrb5| 1 +
6 files changed, 201 insertions(+), 67 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/credentials/credentials_krb5.c
b/auth/credentials/credentials_krb5.c
index d2a655e..6544e42 100644
--- a/auth/credentials/credentials_krb5.c
+++ b/auth/credentials/credentials_krb5.c
@@ -717,8 +717,9 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct
cli_credentials *cred,
return ENOMEM;
}
- maj_stat = gss_krb5_import_cred(_stat, ccache->cc
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 780a80c bug 12293: stop group.py throwing errors if group is unknown
via 22da088 bug 12292: stop user.py throwing errors if user is unknown
from 1f9501c winbind: Fix passing idmap failure from wb_sids2xids back
to callers
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 780a80c28d491a1b9c76bda1b43ff8eb7aa346b1
Author: Rowland Penny <rpe...@samba.org>
Date: Wed Sep 28 19:28:23 2016 +0100
bug 12293: stop group.py throwing errors if group is unknown
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12293
Signed-off-by: Rowland Penny <rpe...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
Autobuild-User(master): Alexander Bokovoy <a...@samba.org>
Autobuild-Date(master): Fri Sep 30 05:53:17 CEST 2016 on sn-devel-144
commit 22da0887b26f090dd39e864c139908ea33738a7b
Author: Rowland Penny <rpe...@samba.org>
Date: Wed Sep 28 15:39:52 2016 +0100
bug 12292: stop user.py throwing errors if user is unknown
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12292
Signed-off-by: Rowland Penny <rpe...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
---
Summary of changes:
python/samba/netcmd/group.py | 18 +++---
python/samba/netcmd/user.py | 19 ---
2 files changed, 31 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/netcmd/group.py b/python/samba/netcmd/group.py
index 722bcc4..11f8773 100644
--- a/python/samba/netcmd/group.py
+++ b/python/samba/netcmd/group.py
@@ -169,11 +169,23 @@ Example2 deletes group Group2 from the local server. The
command is run under r
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp, fallback_machine=True)
+samdb = SamDB(url=H, session_info=system_session(),
+ credentials=creds, lp=lp)
+
+filter = ("(&(sAMAccountName=%s)(objectClass=group))" %
+ groupname)
try:
-samdb = SamDB(url=H, session_info=system_session(),
- credentials=creds, lp=lp)
-samdb.deletegroup(groupname)
+res = samdb.search(base=samdb.domain_dn(),
+ scope=ldb.SCOPE_SUBTREE,
+ expression=filter,
+ attrs=["dn"])
+group_dn = res[0].dn
+except IndexError:
+raise CommandError('Unable to find group "%s"' % (groupname))
+
+try:
+samdb.delete(group_dn)
except Exception, e:
# FIXME: catch more specific exception
raise CommandError('Failed to remove group "%s"' % groupname, e)
diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py
index 5adc287..4358170 100644
--- a/python/samba/netcmd/user.py
+++ b/python/samba/netcmd/user.py
@@ -406,10 +406,23 @@ Example2 shows how to delete a user in the domain against
the local server. su
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp, fallback_machine=True)
+samdb = SamDB(url=H, session_info=system_session(),
+ credentials=creds, lp=lp)
+
+filter = ("(&(sAMAccountName=%s)(sAMAccountType=805306368))" %
+ username)
+
try:
-samdb = SamDB(url=H, session_info=system_session(),
- credentials=creds, lp=lp)
-samdb.deleteuser(username)
+res = samdb.search(base=samdb.domain_dn(),
+ scope=ldb.SCOPE_SUBTREE,
+ expression=filter,
+ attrs=["dn"])
+user_dn = res[0].dn
+except IndexError:
+raise CommandError('Unable to find user "%s"' % (username))
+
+try:
+samdb.delete(user_dn)
except Exception, e:
raise CommandError('Failed to remove user "%s"' % username, e)
self.outf.write("Deleted user %s\n" % username)
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 747de99 s4: torture: Added raw readX test to ensure 'reserved'
fields are zero.
via e57f9e1 s3: smbd: In reply_read_and_X() SMB1 server is overwriting
part of the 'reserved' zero fields with reply data length.
via 6507336 s3: smbd: Use common function setup_readX_header() in aio
read code.
via 2ff3171 s3: smbd: Make setup_readX_header() externally accessible
via 1e29a1c s3: smbd: Remove unused 'req' argument from
setup_readX_header()
via 4db1c7d s3: torture: Add test that proves Win2k12 correctly returns
pidlow and pidhigh in SMB1 requests.
via 4206741 s3: smbd: Correctly reflect back SMB_PIDHIGH to a client.
via b4f9ac6 s3: libsmb: Widen the internal client smb1.pid to 32-bits
as is used on the wire and in libcli/smb/smb1*.c
via e639cf1 s4: libcli: Internal SMB1 pid is already stored as and uses
32-bits. Correct getpid() cast.
from fa5292a selftest: Remove nbt wait time
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 747de99fcd70f400ec0ca6b2ca020664f7464454
Author: Jeremy Allison <j...@samba.org>
Date: Fri Jun 10 09:32:32 2016 -0700
s4: torture: Added raw readX test to ensure 'reserved' fields are zero.
Passes against Win2k12+, and smbd with the previous patch.
https://bugzilla.samba.org/show_bug.cgi?id=11845
Signed-off-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
Autobuild-User(master): Alexander Bokovoy <a...@samba.org>
Autobuild-Date(master): Sat Jun 18 19:32:22 CEST 2016 on sn-devel-144
commit e57f9e15d08ed46b2fac2562d1027c6a2ba80dac
Author: Jeremy Allison <j...@samba.org>
Date: Mon Jun 13 09:30:25 2016 -0700
s3: smbd: In reply_read_and_X() SMB1 server is overwriting part of the
'reserved' zero fields with reply data length.
This occurred due to old code that used to do:
SSVAL(smb_buf(req->outbuf),-2,nread);
to set the reply length. This code was not needed,
as srv_set_message() was already correctly setting
the bcc length and was probably left from much
earlier legacy code.
However, in commit ddaa65ef6e049a185281c4d5deca4045e3b085e2
this was converted to do:
SSVAL(req->outbuf,smb_vwv11,smb_maxcnt);
This code actually overwrites the last 'reserved'
field in the SMB_COM_READ_ANDX packet reply, but we
never noticed as no client (or server code) looks at or
checks vwv11 in a SMB_COM_READ_ANDX reply.
[MS-SMB] shows for SMB_COM_READ_ANDX reply:
SMB_Parameters
{
UCHAR WordCount;
Words
{
UCHAR AndXCommand;
UCHAR AndXReserved;
USHORT AndXOffset;
USHORT Available;
USHORT DataCompactionMode;
USHORT Reserved1;
USHORT DataLength;
USHORT DataOffset;
USHORT DataLengthHigh;
USHORT Reserved2[4];
}
}
SMB_Data
{
USHORT ByteCount;
Bytes
{
UCHAR Pad[] (optional);
UCHAR Data[variable];
}
and indeed checking wireshark from Win2012R2
we find that smbd is writing the returned
read length into smb_vwv11 and Windows leaves
it as zeros (reserved).
Also fix the same problem in the named pipes code.
Torture test to ensure Reserved2[4] replies
are zero to follow.
https://bugzilla.samba.org/show_bug.cgi?id=11845
Signed-off-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
commit 6507336d6646b7709768c19a03eac61ea30cce31
Author: Jeremy Allison <j...@samba.org>
Date: Mon Jun 13 09:25:02 2016 -0700
s3: smbd: Use common function setup_readX_header() in aio read code.
https://bugzilla.samba.org/show_bug.cgi?id=11845
Signed-off-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
commit 2ff3171fba931e621581336c975bae146a2ea3a9
Author: Jeremy Allison <j...@samba.org>
Date: Mon Jun 13 09:22:56 2016 -0700
s3: smbd: Make setup_readX_header() externally accessible
https://bugzilla.samba.org/show_bug.cgi?id=11845
Signed-off-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
commit 1e29a1ce067e5f5b5159bcd20d37c6945bcc3900
Author: Jeremy Allison <j...@samba.org>
Date: Mon Jun 13 09:20:43 2016 -0700
s3: smbd: Remove unused 'req' argument from setup_readX_header()
https://bugzilla.samba.org/show_bug.cgi?id=11845
Signed-off-by: J
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4aab5ba mit_samba: Allow to use SPNs for AS-REQ
via 8267b2e mit_samba: Fix flags that we get a referral tickets
via 7019103 mit_samba: Return 0 in case of a wrong realm
via 7a1fd66 sdb: Do not create kmod information if we return early
via 00267c9 sdb: Fix NULL pointer deference if we return early
via 3d6e18f kdb: Do not allocate memory with size 0
via 84c4b91 sdb: Do not set disallow if we do not have ticket info in
the DB
via db23c0f torture: Add a dummy test for MIT Kerberos case
via 38faafe torture: Fix trailing whitespaces in krb5 tests
from 0b79ec2 s3/client/clitar.c: always close fd
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4aab5ba2cee63dd021939a41e3ad23c49ed2f270
Author: Andreas Schneider <a...@samba.org>
Date: Tue Apr 26 16:37:29 2016 +0200
mit_samba: Allow to use SPNs for AS-REQ
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
Autobuild-User(master): Alexander Bokovoy <a...@samba.org>
Autobuild-Date(master): Thu Jun 2 16:35:35 CEST 2016 on sn-devel-144
commit 8267b2e1867d114c1377437f201897242a219aab
Author: Andreas Schneider <a...@samba.org>
Date: Wed Feb 17 09:32:11 2016 +0100
mit_samba: Fix flags that we get a referral tickets
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
commit 7019103bab82b4e8fb80b38712ca24064b8d09a5
Author: Andreas Schneider <a...@samba.org>
Date: Mon Feb 15 08:31:16 2016 +0100
mit_samba: Return 0 in case of a wrong realm
The MIT KDC will deal with this correctly for us.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
commit 7a1fd661b0e6282c4e97d7baba399d5ebee2f9f2
Author: Andreas Schneider <a...@samba.org>
Date: Mon Feb 15 08:29:27 2016 +0100
sdb: Do not create kmod information if we return early
In case of a wrong realm in a cross forest trust we return early with
just the realm corrected. We need to parse a kdb entry but do not have
all information available. So skip creating the kmod.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
commit 00267c9565fc82b930f6292a51234580eba4ae89
Author: Andreas Schneider <a...@samba.org>
Date: Mon Feb 15 08:27:54 2016 +0100
sdb: Fix NULL pointer deference if we return early
If we return because of a wrong realm in a cross forest trust case, we
do not have a skdc_entry allocated.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
commit 3d6e18f2101f75fec2377914c71e3887049bf7e5
Author: Andreas Schneider <a...@samba.org>
Date: Mon Feb 15 08:24:45 2016 +0100
kdb: Do not allocate memory with size 0
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
commit 84c4b91fc669353379a6ec3d81617693c9aff538
Author: Andreas Schneider <a...@samba.org>
Date: Fri Feb 12 10:01:54 2016 +0100
sdb: Do not set disallow if we do not have ticket info in the DB
These things are applied by the incoming ticket by the KDC.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
commit db23c0fa97386062eea9c9982243fdecbf4133b9
Author: Andreas Schneider <a...@samba.org>
Date: Fri May 13 09:42:44 2016 +0200
torture: Add a dummy test for MIT Kerberos case
This is a preperatory test to add tests for the MIT KDC.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
commit 38faafef23cab51140f13e125ef80c704057ea01
Author: Andreas Schneider <a...@samba.org>
Date: Thu Jun 2 10:14:25 2016 +0200
torture: Fix trailing whitespaces in krb5 tests
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
---
Summary of changes:
source4/kdc/mit_samba.c| 14 +++-
source4/kdc/sdb_to_kdb.c | 83 +-
.../krb5/{kdc-canon.c => kdc-canon-heimdal.c} | 58 +++
source4/torture/krb5/{kdc.c => kdc-heimdal.c} | 46 ++--
source4/torture/krb5/kdc-mit.c | 56 +++
source4/torture/krb5/wscript_build | 12 +++-
6 files changed, 179 insertions(+), 90 deletions(-)
rename source4/torture/krb5/{kdc-canon.c => kdc-canon-heimdal.c} (
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2285519 s3,s4 torture/denytest: fix possible infinite loop
via a6593cf s4/torture/libnetapi/libnetapi_user.c: fix typo
from f5b6a5b ctdb-common: For AF_PACKET socket types, protocol is in
network order
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 22855190437d142c38b2d09539c63b474132a556
Author: Aurelien Aptel <aap...@suse.com>
Date: Fri Mar 4 10:05:22 2016 +0100
s3,s4 torture/denytest: fix possible infinite loop
Signed-off-by: Aurelien Aptel <aap...@suse.com>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
Reviewed-by: David Disseldorf <d...@suse.de>
Autobuild-User(master): Alexander Bokovoy <a...@samba.org>
Autobuild-Date(master): Fri Mar 4 21:23:45 CET 2016 on sn-devel-144
commit a6593cfb674cdb818c3487e984516d8f2fea1d88
Author: Aurelien Aptel <aap...@suse.com>
Date: Fri Mar 4 09:29:48 2016 +0100
s4/torture/libnetapi/libnetapi_user.c: fix typo
fixed misplaced parenthesis and wrong sizeof().
Signed-off-by: Aurelien Aptel <aap...@suse.com>
Reviewed-by: Alexander Bokovoy <a...@samba.org>
Reviewed-by: David Disseldorf <d...@suse.de>
---
Summary of changes:
source3/torture/denytest.c | 2 +-
source4/torture/basic/denytest.c | 2 +-
source4/torture/libnetapi/libnetapi_user.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c
index 5b0eeec..87f0661 100644
--- a/source3/torture/denytest.c
+++ b/source3/torture/denytest.c
@@ -76,7 +76,7 @@ static const char *resultstr(enum deny_result res)
{A_W, "W"},
{A_RW,"RW"}};
int i;
- for (i=0;ARRAY_SIZE(results);i++) {
+ for (i=0;i<ARRAY_SIZE(results);i++) {
if (results[i].res == res) return results[i].name;
}
return "*";
diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c
index feeea32e..1c946b8 100644
--- a/source4/torture/basic/denytest.c
+++ b/source4/torture/basic/denytest.c
@@ -80,7 +80,7 @@ static const char *resultstr(enum deny_result res)
{A_W, "W"},
{A_RW,"RW"}};
int i;
- for (i=0;ARRAY_SIZE(results);i++) {
+ for (i=0;i<ARRAY_SIZE(results);i++) {
if (results[i].res == res) return results[i].name;
}
return "*";
diff --git a/source4/torture/libnetapi/libnetapi_user.c
b/source4/torture/libnetapi/libnetapi_user.c
index 2afc1e5..e925725 100644
--- a/source4/torture/libnetapi/libnetapi_user.c
+++ b/source4/torture/libnetapi/libnetapi_user.c
@@ -249,7 +249,7 @@ static NET_API_STATUS test_netusermodals(struct
torture_context *tctx,
return status;
}
- if (memcmp(u0, _u0, sizeof(u0) != 0)) {
+ if (memcmp(u0, _u0, sizeof(*u0)) != 0) {
torture_comment(tctx, "USER_MODALS_INFO_0 struct has
changed\n");
return -1;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a0d2dd0 auth/credentials: if credentials have principal set, they
are not anonymous anymore
from dd8a085 CID 1311772: Fix null pointer check
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a0d2dd0e01618346b4ad8ea9da3f7ce4eb0364b0
Author: Alexander Bokovoy a...@samba.org
Date: Thu May 7 14:12:03 2015 +
auth/credentials: if credentials have principal set, they are not anonymous
anymore
When dealing with Kerberos, we cannot consider credentials anonymous
if credentials were obtained properly.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11265
Signed-off-by: Alexander Bokovoy a...@samba.org
Reviewed-by: Stefan (metze) Metzmacher me...@samba.org
Reviewed-by: Guenther Deschner g...@samba.org
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Wed Jul 15 16:32:55 CEST 2015 on sn-devel-104
---
Summary of changes:
auth/credentials/credentials.c | 5 +
1 file changed, 5 insertions(+)
Changeset truncated at 500 lines:
diff --git a/auth/credentials/credentials.c b/auth/credentials/credentials.c
index df188b0..3b7d42a 100644
--- a/auth/credentials/credentials.c
+++ b/auth/credentials/credentials.c
@@ -967,6 +967,11 @@ _PUBLIC_ bool cli_credentials_is_anonymous(struct
cli_credentials *cred)
cred-machine_account_pending_lp_ctx);
}
+ /* if principal is set, it's not anonymous */
+ if ((cred-principal != NULL) cred-principal_obtained =
cred-username_obtained) {
+ return false;
+ }
+
username = cli_credentials_get_username(cred);
/* Yes, it is deliberate that we die if we have a NULL pointer
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a99a5a3 Fix the developer O3 build
via b72cc32 heimdal: Fix the developer O3 build
from f6b929e s3-pam_smbpass: Add a deprecation warning.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a99a5a34a54082162f920fcccbe5561320a5d40a
Author: Volker Lendecke v...@samba.org
Date: Wed Feb 25 12:19:44 2015 +
Fix the developer O3 build
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Alexander Bokovoy a...@samba.org
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Wed Feb 25 16:32:29 CET 2015 on sn-devel-104
commit b72cc326f67d2b19f247e14424adc46275b2db25
Author: Volker Lendecke v...@samba.org
Date: Wed Feb 25 12:19:40 2015 +
heimdal: Fix the developer O3 build
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Alexander Bokovoy a...@samba.org
---
Summary of changes:
examples/libsmbclient/testacl.c | 2 +-
source3/utils/regedit.c | 2 +-
source3/utils/regedit_list.c| 2 +-
source3/utils/smbfilter.c | 3 ++-
source4/auth/gensec/gensec_gssapi.c | 4 ++--
source4/dsdb/dns/dns_update.c | 3 ++-
source4/dsdb/kcc/kcc_drs_replica_info.c | 2 +-
source4/dsdb/repl/drepl_out_helpers.c | 2 +-
source4/dsdb/samdb/ldb_modules/operational.c| 2 +-
source4/dsdb/samdb/ldb_modules/samldb.c | 3 ++-
source4/dsdb/samdb/ldb_modules/schema_util.c| 2 +-
source4/heimdal/lib/krb5/store.c| 2 +-
source4/lib/registry/patchfile_dotreg.c | 4 ++--
source4/lib/registry/regf.c | 4 ++--
source4/ntvfs/ipc/ipc_rap.c | 8
source4/rpc_server/backupkey/dcesrv_backupkey.c | 2 +-
source4/rpc_server/drsuapi/getncchanges.c | 3 ++-
source4/rpc_server/lsa/dcesrv_lsa.c | 8
source4/torture/rpc/backupkey.c | 4 ++--
source4/torture/rpc/lsa.c | 4 ++--
source4/torture/rpc/schannel.c | 2 +-
source4/torture/rpc/svcctl.c| 2 +-
source4/torture/winbind/struct_based.c | 2 +-
source4/winbind/wb_server.c | 2 +-
24 files changed, 39 insertions(+), 35 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/libsmbclient/testacl.c b/examples/libsmbclient/testacl.c
index b602c5b..99a6d13 100644
--- a/examples/libsmbclient/testacl.c
+++ b/examples/libsmbclient/testacl.c
@@ -21,7 +21,7 @@ enum acl_mode
int main(int argc, const char *argv[])
{
int opt;
-int flags;
+int flags = 0;
int debug = 0;
int numeric = 0;
int stat_and_retry = 0;
diff --git a/source3/utils/regedit.c b/source3/utils/regedit.c
index bff23ec..21437f4 100644
--- a/source3/utils/regedit.c
+++ b/source3/utils/regedit.c
@@ -161,7 +161,7 @@ static void add_reg_key(struct regedit *regedit, struct
tree_node *node,
if (name) {
WERROR rv;
struct registry_key *new_key;
- struct tree_node *new_node;
+ struct tree_node *new_node = NULL;
struct tree_node *list;
struct tree_node *parent;
diff --git a/source3/utils/regedit_list.c b/source3/utils/regedit_list.c
index c2b3705..8ee2d5e 100644
--- a/source3/utils/regedit_list.c
+++ b/source3/utils/regedit_list.c
@@ -491,7 +491,7 @@ void multilist_refresh(struct multilist *list)
void multilist_driver(struct multilist *list, int c)
{
unsigned page;
- const void *tmp;
+ const void *tmp = NULL;
if (list-nrows == 0) {
return;
diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c
index ff966a8..1f55ec8 100644
--- a/source3/utils/smbfilter.c
+++ b/source3/utils/smbfilter.c
@@ -85,7 +85,8 @@ static void filter_request(char *buf, size_t buf_len)
int type = CVAL(buf,smb_com);
unsigned x;
fstring name1,name2;
- int name_len1, name_len2;
+ int name_len1 = 0;
+ int name_len2;
int name_type1, name_type2;
if (msg_type) {
diff --git a/source4/auth/gensec/gensec_gssapi.c
b/source4/auth/gensec/gensec_gssapi.c
index 2bc6422..c168d8a 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -557,7 +557,7 @@ static NTSTATUS gensec_gssapi_update(struct gensec_security
*gensec_security,
return NT_STATUS_MORE_PROCESSING_REQUIRED;
} else if (maj_stat == GSS_S_CONTEXT_EXPIRED) {
- gss_cred_id_t creds;
+ gss_cred_id_t creds = NULL;
gss_name_t name;
gss_buffer_desc
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 5976791 lsa.idl: define lsa.ForestTrustCollisionInfo and
ForestTrustCollisionRecord as public structs
from 20c7196 ctdb/daemon: Optimise deletion of IPs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 59767911bded48388c27d5f9cd2ff1346a1c01a6
Author: Alexander Bokovoy a...@samba.org
Date: Tue Mar 18 19:41:38 2014 +0200
lsa.idl: define lsa.ForestTrustCollisionInfo and ForestTrustCollisionRecord
as public structs
For Python bindings PIDL wants the struct to be defined as public if we
want to use __ndr_print/pack/unpack.
Define the [public] attribute to ForestTrustCollisionInfo/Record to
allow easier debugging when there is collision in establishing a trust.
This change does not affect C code as NDR functions are always
generated, only not exposed in Python bindings.
https://bugzilla.samba.org/show_bug.cgi?id=10504
Signed-off-by: Alexander Bokovoy a...@samba.org
Reviewed-by: Jelmer Vernooij jel...@samba.org
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Mon Mar 24 12:44:50 CET 2014 on sn-devel-104
---
Summary of changes:
librpc/idl/lsa.idl |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/lsa.idl b/librpc/idl/lsa.idl
index d8f2649..80efbd5 100644
--- a/librpc/idl/lsa.idl
+++ b/librpc/idl/lsa.idl
@@ -1328,14 +1328,14 @@ import misc.idl, security.idl;
[default] uint32 flags;
} lsa_ForestTrustCollisionFlags;
- typedef struct {
+ typedef [public] struct {
uint32 index;
lsa_ForestTrustCollisionRecordType type;
[switch_is(type)] lsa_ForestTrustCollisionFlags flags;
lsa_String name;
} lsa_ForestTrustCollisionRecord;
- typedef struct {
+ typedef [public] struct {
uint32 count;
[size_is(count)] lsa_ForestTrustCollisionRecord **entries;
} lsa_ForestTrustCollisionInfo;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 886f062 s4-torture: Always compile backupkey ndr testsuite.
via b48ceef waf: build PIEs if supported by the compiler
from d86fda9 autobuild: remove remnants of removed samba3 targets
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 886f062e72f8ad9cddfe5fab4b2b1a36be0ea30b
Author: Günther Deschner g...@samba.org
Date: Mon May 27 14:15:08 2013 +0200
s4-torture: Always compile backupkey ndr testsuite.
This removes another incorrect AD_DC_BUILD_IS_ENABLED check ifdef check.
The ndr
test is not at all heimdal specific.
Guenther
Signed-off-by: Günther Deschner g...@samba.org
Reviewed-by: Alexander Bokovoy a...@samba.org
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Wed May 29 11:29:51 CEST 2013 on sn-devel-104
commit b48ceef1d3031ec72018dc9bad1cf0dcb9864a56
Author: David Disseldorp dd...@samba.org
Date: Tue May 28 15:11:45 2013 +0200
waf: build PIEs if supported by the compiler
Currently waf performs a mandatory check for compiler PIE support,
unless --without-pie is specified.
This change makes Waf only perform the mandatory check if --with-pie is
specified. If neither --with-pie nor --without-pie are specified, then
PIEs are only built if compiler support is available.
Signed-off-by: David Disseldorp dd...@samba.org
Reviewed-by: Alexander Bokovoy a...@samba.org
---
Summary of changes:
source4/torture/ndr/ndr.c |2 --
source4/torture/wscript_build |3 +--
wscript | 18 --
3 files changed, 13 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/ndr/ndr.c b/source4/torture/ndr/ndr.c
index 9e63ff7..1b0f968 100644
--- a/source4/torture/ndr/ndr.c
+++ b/source4/torture/ndr/ndr.c
@@ -398,9 +398,7 @@ struct torture_suite *torture_local_ndr(TALLOC_CTX *mem_ctx)
torture_suite_add_suite(suite, ndr_drsblobs_suite(suite));
torture_suite_add_suite(suite, ndr_nbt_suite(suite));
torture_suite_add_suite(suite, ndr_ntlmssp_suite(suite));
-#ifdef AD_DC_BUILD_IS_ENABLED /* Add Heimdal-specific KDC test */
torture_suite_add_suite(suite, ndr_backupkey_suite(suite));
-#endif
torture_suite_add_suite(suite, ndr_string_suite(suite));
torture_suite_add_simple_test(suite, string terminator,
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index be82610..c3c997a 100755
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -36,12 +36,11 @@ heimdal_specific = dict()
heimdal_specific['ndr'] = ('','')
heimdal_specific['rpc'] = ('','')
if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
- heimdal_specific['ndr'] = (' ndr/backupkey.c','')
heimdal_specific['rpc'] = (' rpc/backupkey.c rpc/spoolss_notify.c',
' RPC_NDR_BACKUPKEY SMB_SERVER
dcerpc_server ntvfs')
bld.SAMBA_SUBSYSTEM('TORTURE_NDR',
- source='ndr/ndr.c ndr/winreg.c ndr/atsvc.c ndr/lsa.c ndr/epmap.c
ndr/dfs.c ndr/netlogon.c ndr/drsuapi.c ndr/spoolss.c ndr/ntprinting.c
ndr/samr.c ndr/dfsblob.c ndr/drsblobs.c ndr/nbt.c ndr/ntlmssp.c
ndr/string.c'+heimdal_specific['ndr'][0],
+ source='ndr/ndr.c ndr/winreg.c ndr/atsvc.c ndr/lsa.c ndr/epmap.c
ndr/dfs.c ndr/netlogon.c ndr/drsuapi.c ndr/spoolss.c ndr/ntprinting.c
ndr/samr.c ndr/dfsblob.c ndr/drsblobs.c ndr/nbt.c ndr/ntlmssp.c ndr/string.c
ndr/backupkey.c',
autoproto='ndr/proto.h',
deps='torture'
)
diff --git a/wscript b/wscript
index efebfc4..83c82e3 100644
--- a/wscript
+++ b/wscript
@@ -57,8 +57,9 @@ def set_options(opt):
action='store_true', dest='without_ad_dc', default=False)
opt.add_option('--with-pie',
- help=(Build Position Independent Executables (default)),
- action=store_true, dest='enable_pie', default=True)
+ help=(Build Position Independent Executables +
+(default if supported by compiler)),
+ action=store_true, dest='enable_pie')
opt.add_option('--without-pie',
help=(Disable Position Independent Executable builds),
action=store_false, dest='enable_pie')
@@ -167,10 +168,15 @@ def configure(conf):
conf.SAMBA_CONFIG_H('include/config.h')
-if Options.options.enable_pie == True:
-conf.check_cc(cflags='-fPIE', ldflags='-pie', mandatory=True,
- msg=Checking compiler for PIE support)
-conf.env['ENABLE_PIE'] = True
+if Options.options.enable_pie != False:
+if Options.options.enable_pie == True:
+need_pie = True
+else:
+# not specified, only
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ca0d385 getpass: Don't fail if stdin is not a tty
from 7f366d7 tevent: Only set poll_ev-delete=false if it was true
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ca0d38596d711e70a1d58657024aabd8c131512b
Author: Stef Walter st...@gnome.org
Date: Thu Apr 4 15:55:10 2013 +0200
getpass: Don't fail if stdin is not a tty
We don't need to manipulate the tty state (such as turning off
echo) when prompting for passwords if we're not reading from a tty.
Reviewed-by: Jeremy Allison j...@samba.org
Reviewed-by: Alexander Bokovoy a...@samba.org
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Fri Apr 5 07:34:37 CEST 2013 on sn-devel-104
---
Summary of changes:
lib/util/getpass.c | 52 +---
1 files changed, 29 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/getpass.c b/lib/util/getpass.c
index 480bd56..0cbc7dd 100644
--- a/lib/util/getpass.c
+++ b/lib/util/getpass.c
@@ -170,31 +170,34 @@ int samba_getpass(const char *prompt,
return -1;
}
- ZERO_STRUCT(attr);
- ZERO_STRUCT(old_attr);
+ if (isatty (STDIN_FILENO)) {
- /* get local terminal attributes */
- if (tcgetattr(STDIN_FILENO, attr) 0) {
- perror(tcgetattr);
- return -1;
- }
+ ZERO_STRUCT(attr);
+ ZERO_STRUCT(old_attr);
- /* save terminal attributes */
- memcpy(old_attr, attr, sizeof(attr));
- if((fd = fcntl(0, F_GETFL, 0)) 0) {
- perror(fcntl);
- return -1;
- }
+ /* get local terminal attributes */
+ if (tcgetattr(STDIN_FILENO, attr) 0) {
+ perror(tcgetattr);
+ return -1;
+ }
- /* disable echo */
- if (!echo) {
- attr.c_lflag = ~(ECHO);
- }
+ /* save terminal attributes */
+ memcpy(old_attr, attr, sizeof(attr));
+ if((fd = fcntl(0, F_GETFL, 0)) 0) {
+ perror(fcntl);
+ return -1;
+ }
- /* write attributes to terminal */
- if (tcsetattr(STDIN_FILENO, TCSAFLUSH, attr) 0) {
- perror(tcsetattr);
- return -1;
+ /* disable echo */
+ if (!echo) {
+ attr.c_lflag = ~(ECHO);
+ }
+
+ /* write attributes to terminal */
+ if (tcsetattr(STDIN_FILENO, TCSAFLUSH, attr) 0) {
+ perror(tcsetattr);
+ return -1;
+ }
}
/* disable nonblocking I/O */
@@ -204,8 +207,11 @@ int samba_getpass(const char *prompt,
ok = samba_gets(prompt, buf, len, verify);
- /* reset terminal */
- tcsetattr(STDIN_FILENO, TCSANOW, old_attr);
+ if (isatty (STDIN_FILENO)) {
+
+ /* reset terminal */
+ tcsetattr(STDIN_FILENO, TCSANOW, old_attr);
+ }
/* close fd */
if (fd O_NDELAY) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 36da56e Make systemctl reference indirect in packaging/NetworkManager/30-winbind-systemd via 92b0871 s3-rpc_server: Make sure that fd is really closed on error. Reviewed-by: Alexander Bokovoy a...@samba.org via 3ca727b lib-util: Don't leak file descriptor on error. Reviewed-by: Alexander Bokovoy a...@samba.org via c647169 s3-vfs: Don't leak file descriptor on error. Reviewed-by: Alexander Bokovoy a...@samba.org via 6213606 s4-lib: Don't leak plugin handle on error. Reviewed-by: Alexander Bokovoy a...@samba.org via 6e8a975 s3-libsmb: Don't leak memory on error. Reviewed-by: Alexander Bokovoy a...@samba.org via 32a107c ndrdump: Don't leak plugin handle on error. Reviewed-by: Alexander Bokovoy a...@samba.org via 312355a smbpasswd: Don't leak memory. Reviewed-by: Alexander Bokovoy a...@samba.org via 3a3baa4 smbget: Fix file descriptor leak. Reviewed-by: Alexander Bokovoy a...@samba.org via aa6cc31 s4-policy: Fix memory leaks in push_recursive(). Reviewed-by: Alexander Bokovoy a...@samba.org via 82e9ff8 s4-cifsdd: Don't leak memory. Reviewed-by: Alexander Bokovoy a...@samba.org via f4d1e8c s4-registry: Don't leak file descriptor. Reviewed-by: Alexander Bokovoy a...@samba.org via 66ee744 s4-registry: Don't leak memory on error. Reviewed-by: Alexander Bokovoy a...@samba.org via b055798 winbind: Don't leak centry memory. Reviewed-by: Alexander Bokovoy a...@samba.org via cf8be08 s4-client: Don't leak memory. Reviewed-by: Alexander Bokovoy a...@samba.org via d5a210a s3-torture: Don't leak memory. Reviewed-by: Alexander Bokovoy a...@samba.org via 301a3cb wbinfo: Fix several memory leaks. Reviewed-by: Alexander Bokovoy a...@samba.org via d555f6d winbind: Don't leak memory on return. Reviewed-by: Alexander Bokovoy a...@samba.org via b229d1d s3-smbd: Don't leak subcntarr array. Reviewed-by: Alexander Bokovoy a...@samba.org via 6ac1435 torture: Don't leak file resource handle in spoolss test. Reviewed-by: Alexander Bokovoy a...@samba.org via aab2e17 s3-vfs: Don't leak file descriptor. Reviewed-by: Alexander Bokovoy a...@samba.org via 6b2b125 s3-param: Don't leak file descriptor. Reviewed-by: Alexander Bokovoy a...@samba.org via f573826 s3-lsasd: Don't leak file descriptors. Reviewed-by: Alexander Bokovoy a...@samba.org via c013df3 s3-spoolss: Don't leak memory. Reviewed-by: Alexander Bokovoy a...@samba.org via b70d116 s3-net: Don't leak username. Reviewed-by: Alexander Bokovoy a...@samba.org via b91a20f s4-client: Don't leak file descriptor. Reviewed-by: Alexander Bokovoy a...@samba.org via 34ad975 s4-client: Don't leak resource handle. Reviewed-by: Alexander Bokovoy a...@samba.org via e762858 torture: Make sure we don't overrun the buffer. Reviewed-by: Alexander Bokovoy a...@samba.org via 1d24fa6 torture: Fix memcmp of short buffer. Reviewed-by: Alexander Bokovoy a...@samba.org via aff301d torture: Fix array access in spoolss test. Reviewed-by: Alexander Bokovoy a...@samba.org via b510e5e pdb: Fix array overrun by one. Reviewed-by: Alexander Bokovoy a...@samba.org via 5207d45 s4-libcli: Check return value of smbcli_request_setup(). Reviewed-by: Alexander Bokovoy a...@samba.org via 9e6e9c7 pyauth: Check return value of lpcfg_from_py_object(). Reviewed-by: Alexander Bokovoy a...@samba.org via a9e6240 ndrdump: Check return value of ndr_pull_init_blob(). Reviewed-by: Alexander Bokovoy a...@samba.org via 318ecbc s4-libcli: Check return code of smbcli_request_setup(). Reviewed-by: Alexander Bokovoy a...@samba.org via e508746 librpc: Add NULL check for ndr functions for epm bindings. Reviewed-by: Alexander Bokovoy a...@samba.org via f4761c9 s3-tldap: Make sure we don't deref a null pointer. Reviewed-by: Alexander Bokovoy a...@samba.org via a3ac48d s4-libcli: Add null check for ndr functions in rap. Reviewed-by: Alexander Bokovoy a...@samba.org via 52530f5 nmbd: Fix request data data processing. via 742296d torture: Fix samsync domain_name checks. Reviewed-by: Alexander Bokovoy a...@samba.org via 48a4539 libsmb: Fix possible null pointer dereference. Reviewed-by: Alexander Bokovoy a...@samba.org via 8bfbb81 ndr: Comparing an array to null is always true. Reviewed-by: Alexander Bokovoy a...@samba.org via 03cf4be winbind: Correctly cast name to messaging_send_buf(). Reviewed-by: Alexander Bokovoy a...@samba.org via de14fd9 winbind: Use uint8_t type and use const where needed. Reviewed-by: Alexander Bokovoy a...@samba.org via 2b89067 messages: Use uint8_t type. Reviewed-by: Alexander Bokovoy a...@samba.org via 4567174 winbind: Make domain_name const in wcache_ndr_key(). Reviewed
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ff496ef autoconf: rename pdb_ldap module to pdb_ldapsam
via e721e71 source3/wscript: support 'pdb_ldap' module in configure
via 1b582c4 Rename pdb_ldap to pdb_ldapsam
via 6ba7ab5 PIDL: fix parsing linemarkers in preprocessor output
from 1aa1d65 docs: Add missing ).
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ff496ef29fe0eb8db929ba014abf5f8eeed86b33
Author: Alexander Bokovoy a...@samba.org
Date: Wed Feb 6 12:22:12 2013 +0200
autoconf: rename pdb_ldap module to pdb_ldapsam
Reviewed-by: Andreas Schneider a...@samba.org
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Wed Feb 6 13:32:53 CET 2013 on sn-devel-104
commit e721e7132e7bb32850ff8b2af654b8f3ebf955fe
Author: Alexander Bokovoy a...@samba.org
Date: Wed Feb 6 10:43:16 2013 +0200
source3/wscript: support 'pdb_ldap' module in configure
While PASSDB module ldapsam is called pdb_ldapsam internally,
support specifying 'pdb_ldap' during configure step.
This should make transition to pdb_ldapsam transparent to distributions.
Reviewed-by: Andreas Schneider a...@samba.org
commit 1b582c4bf8ad46034eb30c758b085dc210e8096a
Author: Andreas Schneider a...@samba.org
Date: Mon Jan 28 16:16:42 2013 +0100
Rename pdb_ldap to pdb_ldapsam
This patch moves pdb_ldap to pdb_ldapsam unconditionally
and makes possible to load ldapsam.so dynamically
Reviewed-by: Alexander Bokovoy a...@samba.org
commit 6ba7ab5c14801aecae96373d5a9db7ab82957526
Author: Alexander Bokovoy a...@samba.org
Date: Wed Feb 6 10:17:57 2013 +0200
PIDL: fix parsing linemarkers in preprocessor output
When PIDL calls out to C preprocessor to expand IDL files
and parse the output, it filters out linemarkers and line control
information as described in
http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
and http://gcc.gnu.org/onlinedocs/cpp/Line-Control.html#Line-Control
With gcc 4.8 stdc-predef.h is included automatically and linemarker for the
file has extended flags that PIDL couldn't parse ('system header that needs
to
be extern C protected for C++')
Thanks to Jakub Jelinek ja...@redhat.com for explanation of the
linemarker format.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=906517
Reviewed-by: Andreas Schneider a...@samba.org
---
Summary of changes:
pidl/idl.yp |4 +++-
pidl/lib/Parse/Pidl/IDL.pm |4 +++-
source3/configure.in |9 +++--
source3/passdb/pdb_ipa.c |2 +-
source3/passdb/pdb_ldap.c| 12 +---
source3/passdb/pdb_ldap.h|4 ++--
source3/passdb/pdb_nds.c |2 +-
source3/passdb/wscript_build |8 +++-
source3/wscript | 15 ++-
9 files changed, 43 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/idl.yp b/pidl/idl.yp
index b5c5185..c8a65f6 100644
--- a/pidl/idl.yp
+++ b/pidl/idl.yp
@@ -610,7 +610,9 @@ again:
for ($parser-YYData-{INPUT}) {
if (/^\#/) {
- if (s/^\# (\d+) \(.*?)\( \d+|)//) {
+ # Linemarker format is described at
+ #
http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
+ if (s/^\# (\d+) \(.*?)\(( \d+){1,4}|)//) {
$parser-YYData-{LINE} = $1-1;
$parser-YYData-{FILE} = $2;
goto again;
diff --git a/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm
index d4820ff..6927c89 100644
--- a/pidl/lib/Parse/Pidl/IDL.pm
+++ b/pidl/lib/Parse/Pidl/IDL.pm
@@ -2576,7 +2576,9 @@ again:
for ($parser-YYData-{INPUT}) {
if (/^\#/) {
- if (s/^\# (\d+) \(.*?)\( \d+|)//) {
+ # Linemarker format is described at
+ #
http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html
+ if (s/^\# (\d+) \(.*?)\(( \d+){1,4}|)//) {
$parser-YYData-{LINE} = $1-1;
$parser-YYData-{FILE} = $2;
goto again;
diff --git a/source3/configure.in b/source3/configure.in
index b17a37e..031a33d 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3276,7 +3276,7 @@ if test x$with_ldap_support != xno; then
if test x$ac_cv_lib_ext_ldap_ldap_init = xyes; then
AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available])
CPPFLAGS=$CPPFLAGS -DLDAP_DEPRECATED
-default_static_modules=$default_static_modules pdb_ldap idmap_ldap;
+default_static_modules=$default_static_modules pdb_ldapsam idmap_ldap
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9ba44cc build(waf): fix the abi_match for the pdb library
from 46b6afc s4-torture: add ndr64 spoolss openprinterex to ndr test.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9ba44cc610426fb558b49aa9680b5bdf55c29082
Author: Michael Adam ob...@samba.org
Date: Tue Jan 15 15:35:09 2013 +0100
build(waf): fix the abi_match for the pdb library
The global wildcard match is automatically added by the parsing code
if the global match list is empty. Specifying an explicit '*' as the only
global match lets the parsing code add a second '*' to the local list,
which is an error tolerated on my linux by ld (the GNU linker), but
not by the stricter GNU ELF linker gold.
Pair-Programmed-With: Gregor Beck gb...@sernet.de
Signed-off-by: Gregor Beck gb...@sernet.de
Signed-off-by: Michael Adam ob...@samba.org
Signed-off-by: Alexander Bokovoy a...@samba.org
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Wed Jan 16 21:31:00 CET 2013 on sn-devel-104
---
Summary of changes:
source3/wscript_build |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript_build b/source3/wscript_build
index 107587d..2e530f5 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -731,7 +731,7 @@ bld.SAMBA3_LIBRARY('pdb',
include/passdb.h
passdb/machine_sid.h
passdb/lookup_sid.h''',
- abi_match=private_pdb_match + ['*'],
+ abi_match=private_pdb_match,
abi_directory='passdb/ABI',
vnum='0',
vars=locals())
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b6e2be8 wafsamba: replace try:except: case with explicit comment
about FIPS mode
from 56d9c8c wafsamba: Make sure md5 is really work before using it or
overriding the hash function
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b6e2be8e147b4d34a0424a8851b03b24f180048c
Author: Alexander Bokovoy a...@samba.org
Date: Sat Dec 8 17:57:20 2012 +0200
wafsamba: replace try:except: case with explicit comment about FIPS mode
Since exceptions will be caught be outer try:except: pair anyway, mark
the test of MD5 code by the comment that explains why we need to really
test it.
Do it for both hashlib.md5 and md5 modules.
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Sat Dec 8 18:41:07 CET 2012 on sn-devel-104
---
Summary of changes:
buildtools/wafsamba/samba_utils.py | 15 +++
1 files changed, 7 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_utils.py
b/buildtools/wafsamba/samba_utils.py
index cab87a4..c1ac7e2 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -388,17 +388,16 @@ def RUN_COMMAND(cmd,
# make sure we have md5. some systems don't have it
try:
from hashlib import md5
-try:
-foo = md5.md5('abcd')
-except ValueError:
-raise
+# Even if hashlib.md5 exists, it may be unusable.
+# Try to use MD5 function. In FIPS mode this will cause an exception
+# and we'll get to the replacement code
+foo = md5.md5('abcd')
except:
try:
import md5
-try:
-foo = md5.md5('abcd')
-except ValueError:
-raise
+# repeat the same check here, mere success of import is not enough.
+# Try to use MD5 function. In FIPS mode this will cause an exception
+foo = md5.md5('abcd')
except:
import Constants
Constants.SIG_NIL = hash('abcd')
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4a21d2e Fix release script to build full set of documentation
from dce8a8e librelease.sh: Move the GPG data to the library section.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4a21d2e7790f1c76cf0d0fcfb2f4a8ef13721532
Author: Alexander Bokovoy a...@samba.org
Date: Tue Oct 2 14:53:38 2012 +0300
Fix release script to build full set of documentation
build-docs script was not setting XML catalog properly.
In addition, some time ago pdf versions of images were introduced as
generated dependencies in our books but svg - pdf rule was not added,
so building books never finished properly.
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Tue Oct 2 16:21:23 CEST 2012 on sn-devel-104
---
Summary of changes:
docs-xml/Makefile |3 +++
release-scripts/build-docs |3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 0b4e880..b322bed 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -191,6 +191,9 @@ $(PSDIR)/%.ps: %/index.xml $(PSDIR) xslt/latex.xsl
%-images-latex-eps
%.eps: %.png
$(PNGTOPNM) $ | $(PNMTOPS) $@
+%.pdf: %.svg
+ $(INKSCAPE) -z -f $(abspath $) --export-pdf=$(abspath $@)
+
$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml %-images-htmlhelp
$(XSLTPROC) --stringparam htmlhelp.chm $*.chm \
--stringparam manifest.in.base.dir $@/ \
diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index 5da641a..e909e6e 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -11,6 +11,7 @@ DOCSRCDIR=`dirname $0`/../docs-xml
pushd $DOCSRCDIR || exit 1
git clean -d -x -f
+export XML_CATALOG_FILES=file:///etc/xml/catalog
file://$(pwd)/build/catalog.xml
autoconf \
./configure --with-papersize=letter \
make smbdotconf/parameters.all.xml \
@@ -28,8 +29,6 @@ rsync -Ca --exclude=.svn archives/ ../docs/
cd ../docs || _exit Error changing dir to ${DOCSDIR}/../docs/
/bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
-mv manpages-3 manpages
-mv htmldocs/manpages-3 htmldocs/manpages
cd ../docs-xml || _exit Error changing dir to ${DOCSDIR}/../docs-xml/
make distclean
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 73ed153 docs-xml: convert smb.conf.5 build to waf
from 57990cb s3:libsmb fix a potential crash
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 73ed1533105ac3f90813e5a0e7888a095eff4b75
Author: Alexander Bokovoy a...@samba.org
Date: Mon Sep 17 13:07:26 2012 +0300
docs-xml: convert smb.conf.5 build to waf
smb.conf(5) is different from other manpages because before it is
built, it gets merged together from a number of smaller files, one
per parameter. So we first create a parameters.all.xml file that
references all these files and then include it into master smb.conf.5.xml
One small issue is how to handle generated files in WAF build
from xi:include perspective as the files are generated in
bin/default/docs-xml
rather than in docs-xml. We solve this by further expanding use of XML
catalogs
and rewriting virtual path http://www.samba.org/samba/smbdotconf/ to proper
location.
Both docs-xml autoconf and waf builds work correctly now.
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Mon Sep 17 14:18:31 CEST 2012 on sn-devel-104
---
Summary of changes:
buildtools/wafsamba/wafsamba.py |6 --
docs-xml/build/catalog.xml.in|7 +--
docs-xml/manpages/smb.conf.5.xml |5 -
docs-xml/wscript_build | 25 +++--
wscript_build|6 --
5 files changed, 40 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 1f71bd3..50bd4fa 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -789,14 +789,16 @@ def SAMBAMANPAGES(bld, manpages):
'''build and install manual pages'''
bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() +
'/docs-xml/xslt/expand-sambadoc.xsl'
bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
-os.environ[XML_CATALOG_FILES] = 'file:///etc/xml/catalog file://' +
bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
+bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file://' +
bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
for m in manpages.split():
source = m + '.xml'
bld.SAMBA_GENERATOR(m,
source=source,
target=m,
group='final',
-rule='${XSLTPROC} --xinclude --stringparam
noreference 0 -o ${TGT}.xml --nonet ${SAMBA_EXPAND_XSL} ${SRC} ${XSLTPROC}
--nonet -o ${TGT} ${SAMBA_MAN_XSL} ${TGT}.xml'
+rule='''export
XML_CATALOG_FILES=${SAMBA_CATALOGS}
+${XSLTPROC} --xinclude --stringparam
noreference 0 -o ${TGT}.xml --nonet ${SAMBA_EXPAND_XSL} ${SRC}
+${XSLTPROC} --nonet -o ${TGT}
${SAMBA_MAN_XSL} ${TGT}.xml'''
)
bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True)
Build.BuildContext.SAMBAMANPAGES = SAMBAMANPAGES
diff --git a/docs-xml/build/catalog.xml.in b/docs-xml/build/catalog.xml.in
index 4b99cf5..56d13a6 100644
--- a/docs-xml/build/catalog.xml.in
+++ b/docs-xml/build/catalog.xml.in
@@ -6,9 +6,12 @@
rewriteURI
uriStartString=http://www.samba.org/samba/DTD/;
- rewritePrefix=file://@abs_top_builddir@/build/DTD//
+ rewritePrefix=file://@abs_top_srcdir@/build/DTD//
rewriteURI
uriStartString=http://www.gnu.org/licenses/;
-
rewritePrefix=file://@abs_top_builddir@/Samba3-ByExample//
+
rewritePrefix=file://@abs_top_srcdir@/Samba3-ByExample//
+rewriteURI
+ uriStartString=http://www.samba.org/samba/smbdotconf/;
+ rewritePrefix=file://@abs_top_builddir@/smbdotconf//
/catalog
diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index e09eee0..a73382f 100644
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -757,7 +757,10 @@ chmod 1770 /usr/local/samba/lib/usershares
titleEXPLANATION OF EACH PARAMETER/title
samba:parameterlist
- xi:include href=../smbdotconf/parameters.all.xml
parse=xml/
+ !-- The URI below is resolved to local generated version of
parameters.all.xml //--
+ !-- WAF build places it in
bin/default/docs-xml/smbdotconf/parameters.all.xml //--
+ !-- and we redirect there via use of XML_CATALOG_FILES, see
docs-xml/build/catalog.xml.in //--
+ xi:include
href=http://www.samba.org
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e7a58bc docs-xml: fix build of winbindd- and krb5 locator-related
manpages
from 73ed153 docs-xml: convert smb.conf.5 build to waf
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e7a58bc251bd74c3c7c64ee4f5cb85ec76852a8d
Author: Alexander Bokovoy a...@samba.org
Date: Mon Sep 17 19:09:35 2012 +0300
docs-xml: fix build of winbindd- and krb5 locator-related manpages
These manpages depend on docs-xml infrastructure (samba DTDs)
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Mon Sep 17 19:52:53 CEST 2012 on sn-devel-104
---
Summary of changes:
docs-xml/wscript_build |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index c5d5839..32cf9be 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -113,7 +113,7 @@ if ('XSLTPROC_MANPAGES' in bld.env and
bld.env['XSLTPROC_MANPAGES']):
bld.SAMBAMANPAGES(manpages)
if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
-bld.MANPAGES(pam_winbind_manpages)
+bld.SAMBAMANPAGES(pam_winbind_manpages)
if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
-bld.MANPAGES(krb5_locator_manpages)
+bld.SAMBAMANPAGES(krb5_locator_manpages)
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via be7a856 s3: make ldapsam-related functions a smbldaphelper subsystem
from 9158423 VERSION: Bump version up to 4.1.0pre1
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit be7a856f5bd251dc84a72eb56cf011facd10988f
Author: Alexander Bokovoy a...@samba.org
Date: Thu Sep 13 15:40:31 2012 +0300
s3: make ldapsam-related functions a smbldaphelper subsystem
Since these functions are used in pdb_ldap and idmap_ldap, and
pdb_ldap might be statically linked to libpdb (default), it is
better to keep them as separate subsystem to avoid polluting libpdb
namespace.
This is first step in refactoring libpdb. Right now I cannot move
these functions into proper libsmbldaphelper as it uses more of
libpdb-included functions and linking pdb_ldap against libsmbldaphelper
library would have created a loop if pdb_ldap is included into libpdb.
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Thu Sep 13 17:36:07 CEST 2012 on sn-devel-104
---
Summary of changes:
source3/passdb/wscript_build |4 ++--
source3/winbindd/wscript_build |2 +-
source3/wscript_build |5 -
3 files changed, 7 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index 1dfdfd0..d26afc2 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -1,7 +1,7 @@
#!/usr/bin/env python
PDB_TDBSAM_SRC ='pdb_tdb.c'
-PDB_LDAP_SRC = 'pdb_ldap.c pdb_nds.c pdb_ipa.c pdb_ldap_util.c'
+PDB_LDAP_SRC = 'pdb_ldap.c pdb_nds.c pdb_ipa.c'
PDB_SMBPASSWD_SRC = 'pdb_smbpasswd.c'
PDB_WBC_SAM_SRC = 'pdb_wbc_sam.c'
@@ -15,7 +15,7 @@ bld.SAMBA3_MODULE('pdb_tdbsam',
bld.SAMBA3_MODULE('pdb_ldap',
subsystem='pdb',
- deps='smbldap',
+ deps='smbldap smbldaphelper',
source=PDB_LDAP_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ldap'),
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index 9f11aff..af3741b 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -62,7 +62,7 @@ bld.SAMBA3_MODULE('idmap_passdb',
bld.SAMBA3_MODULE('idmap_ldap',
subsystem='idmap',
source=IDMAP_LDAP_SRC,
- deps='smbldap',
+ deps='smbldap smbldaphelper',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ldap'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ldap') and
bld.env.HAVE_LDAP)
diff --git a/source3/wscript_build b/source3/wscript_build
index c7395e7..c534ae6 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -215,7 +215,6 @@ PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
passdb/account_pol.c ${PRIVILEGES_SRC}
lib/util_nscd.c lib/winbind_util.c
passdb/pdb_util.c passdb/pdb_interface.c
-passdb/pdb_ldap_schema.c
passdb/pdb_secrets.c
passdb/pdb_unixid.c'''
#FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
@@ -733,6 +732,10 @@ bld.SAMBA3_LIBRARY('pdb',
vnum='0',
vars=locals())
+bld.SAMBA3_SUBSYSTEM('smbldaphelper',
+ source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c',
+ deps='smbldap secrets3 pdb')
+
bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
source=SERVER_MUTEX_SRC,
deps='talloc')
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 86a4ca2 s3: make smbldaphelper subsystem an internal library
from 56b7525 Sigh :-(. Removing optimization prematurely is the root of
all evil :-(.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 86a4ca28649141f77556208b833db2e076c0125d
Author: Alexander Bokovoy a...@samba.org
Date: Thu Sep 13 20:29:25 2012 +0300
s3: make smbldaphelper subsystem an internal library
Break pdb_ldap - smbldaphelper - pdb - pdb_ldap loop by
making smbldaphelp intentionally underlinked internal library.
It means that libsmbldaphelp is not usable unless its user is
also linked to libpdb (that is the case for both its users,
idmap_ldap and pdb_ldap, already) but gives us a break of
the circular dependency in case pdb_ldap statically linked
into pdb (default).
This should solve case when idmap_ldap and pdb_ldap are dynamically
loaded modules
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Fri Sep 14 01:02:21 CEST 2012 on sn-devel-104
---
Summary of changes:
source3/passdb/ABI/pdb-0.sigs |7 ---
source3/winbindd/wscript_build |2 +-
source3/wscript_build | 12 +---
3 files changed, 10 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/passdb/ABI/pdb-0.sigs b/source3/passdb/ABI/pdb-0.sigs
index 2b57301..bc82ff3 100644
--- a/source3/passdb/ABI/pdb-0.sigs
+++ b/source3/passdb/ABI/pdb-0.sigs
@@ -16,19 +16,14 @@ algorithmic_pdb_rid_is_user: bool (uint32_t)
algorithmic_pdb_uid_to_user_rid: uint32_t (uid_t)
algorithmic_pdb_user_rid_to_uid: uid_t (uint32_t)
algorithmic_rid_base: int (void)
-attrib_map_to_delete_v30: {attrib = 5, name = 0x sambaPwdLastSet},
{attrib = 6, name = 0x sambaPwdCanChange}, {attrib = 7, name = 0x
sambaPwdMustChange}, {attrib = 8, name = 0x sambaLogonTime}, {attrib =
9, name = 0x sambaLogoffTime}, {attrib = 10, name = 0x
sambaKickoffTime}, {attrib = 12, name = 0x displayName}, {attrib = 29,
name = 0x sambaHomeDrive}, {attrib = 13, name = 0x sambaHomePath},
{attrib = 14, name = 0x sambaLogonScript}, {attrib = 15, name = 0x
sambaProfilePath}, {attrib = 17, name = 0x sambaUserWorkstations},
{attrib = 18, name = 0x sambaSID}, {attrib = 19, name = 0x
sambaPrimaryGroupSID}, {attrib = 21, name = 0x sambaLMPassword},
{attrib = 22, name = 0x sambaNTPassword}, {attrib = 23, name = 0x
sambaDomainName}, {attrib = 25, name = 0x sambaAcctFlags}, {attrib =
37, name = 0x sambaMungedDial}, {attrib = 35, name = 0x
sambaBadPasswordCount},
{attrib = 38, name = 0x sambaBadPasswordTime}, {attrib = 39, name =
0x sambaPasswordHistory}, {attrib = 42, name = 0x sambaLogonHours},
{attrib = 0, name = 0x}
-attrib_map_v30: {attrib = 1, name = 0x uid}, {attrib = 2, name = 0x
uidNumber}, {attrib = 3, name = 0x gidNumber}, {attrib = 4, name =
0x homeDirectory}, {attrib = 5, name = 0x sambaPwdLastSet}, {attrib
= 6, name = 0x sambaPwdCanChange}, {attrib = 7, name = 0x
sambaPwdMustChange}, {attrib = 8, name = 0x sambaLogonTime}, {attrib =
9, name = 0x sambaLogoffTime}, {attrib = 10, name = 0x
sambaKickoffTime}, {attrib = 11, name = 0x cn}, {attrib = 44, name =
0x sn}, {attrib = 12, name = 0x displayName}, {attrib = 29, name =
0x sambaHomeDrive}, {attrib = 13, name = 0x sambaHomePath}, {attrib
= 14, name = 0x sambaLogonScript}, {attrib = 15, name = 0x
sambaProfilePath}, {attrib = 16, name = 0x description}, {attrib = 17,
name = 0x sambaUserWorkstations}, {attrib = 18, name = 0x
sambaSID}, {attrib = 19, name = 0x sambaPrimaryGroupSID}, {attrib = 21,
name = 0xXXX
X sambaLMPassword}, {attrib = 22, name = 0x sambaNTPassword}, {attrib
= 23, name = 0x sambaDomainName}, {attrib = 24, name = 0x
objectClass}, {attrib = 25, name = 0x sambaAcctFlags}, {attrib = 37,
name = 0x sambaMungedDial}, {attrib = 35, name = 0x
sambaBadPasswordCount}, {attrib = 38, name = 0x sambaBadPasswordTime},
{attrib = 39, name = 0x sambaPasswordHistory}, {attrib = 41, name =
0x modifyTimestamp}, {attrib = 42, name = 0x sambaLogonHours},
{attrib = 0, name = 0x}
builtin_domain_name: const char *(void)
cache_account_policy_get: bool (enum pdb_policy_type, uint32_t *)
cache_account_policy_set: bool (enum pdb_policy_type, uint32_t)
create_builtin_administrators: NTSTATUS (const struct dom_sid *)
create_builtin_users: NTSTATUS (const struct dom_sid *)
decode_account_policy_name: const char *(enum pdb_policy_type)
-dominfo_attr_list: {attrib = 23, name = 0x sambaDomainName}, {attrib =
34, name = 0x sambaNextRid}, {attrib = 26, name
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 45f8f97 lib/krb5_wrap: when deleting default realm, pass char*, not
char**
via d55980c s3-pdb: filter out more symbols only used in ldapsam
internals
from 34bd3cb WHATSNEW: provision and updateprovision have new names
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 45f8f979378c521c0b9e6df606cfe3558f6ee7b1
Author: Alexander Bokovoy a...@samba.org
Date: Tue Sep 11 20:12:42 2012 +0300
lib/krb5_wrap: when deleting default realm, pass char*, not char**
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Wed Sep 12 10:33:37 CEST 2012 on sn-devel-104
commit d55980ccad2fec5d88fceb5eef9df8df647f4e9f
Author: Alexander Bokovoy a...@samba.org
Date: Tue Sep 11 12:29:49 2012 +0300
s3-pdb: filter out more symbols only used in ldapsam internals
---
Summary of changes:
lib/krb5_wrap/krb5_samba.c|2 +-
source3/passdb/ABI/pdb-0.sigs |1 -
source3/wscript_build |2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 2d237ff..1a5a710 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -2001,7 +2001,7 @@ krb5_error_code smb_krb5_make_principal(krb5_context
context,
va_end(ap);
if (free_realm) {
- krb5_free_default_realm(context, realm);
+ krb5_free_default_realm(context, realm);
}
return code;
diff --git a/source3/passdb/ABI/pdb-0.sigs b/source3/passdb/ABI/pdb-0.sigs
index 2bccc08..2b57301 100644
--- a/source3/passdb/ABI/pdb-0.sigs
+++ b/source3/passdb/ABI/pdb-0.sigs
@@ -35,7 +35,6 @@ get_privileges_for_sid_as_set: NTSTATUS (TALLOC_CTX *,
PRIVILEGE_SET **, struct
get_privileges_for_sids: bool (uint64_t *, struct dom_sid *, int)
get_trust_pw_clear: bool (const char *, char **, const char **, enum
netr_SchannelType *)
get_trust_pw_hash: bool (const char *, uint8_t *, const char **, enum
netr_SchannelType *)
-get_userattr_list: const char **(TALLOC_CTX *, int)
gid_to_sid: void (struct dom_sid *, gid_t)
gid_to_unix_groups_sid: void (gid_t, struct dom_sid *)
grab_named_mutex: struct named_mutex *(TALLOC_CTX *, const char *, int)
diff --git a/source3/wscript_build b/source3/wscript_build
index 2903594..c7395e7 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -711,7 +711,7 @@ private_pdb_match.append('!idmap_xids_to_sids')
# ldap module is actually three modules merged together: ldapsam, ipa, and nds
static_pdb_match = static_pdb_match + ['ldap', 'ipa', 'nds']
-ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_domain_info', '!ldapsam_*',
'!groupmap_attr_list*']
+ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_domain_info', '!ldapsam_*',
'!groupmap_attr_list*', '!get_userattr_list']
private_pdb_match.append('!pdb_nds_*')
private_pdb_match.append('!pdb_init_ldapsam')
private_pdb_match = private_pdb_match + ldapsam_pdb_match
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 893b213 Avoid overriding default ccache for ads operations.
from a11e45f selftest: let provision_plugin_s4_dc use SMB3
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 893b21387665a7b644355d60f6fbccaf48ffaedb
Author: Simo Sorce i...@samba.org
Date: Fri Sep 7 14:14:08 2012 -0400
Avoid overriding default ccache for ads operations.
Avoid overriding default ccache for ads operations.
Nowadays various samba components may need to use GSSAPI and a default cred
cache to perform their tasks.
This code was completely overriding the whole process default ccache name,
thus
altering the current credentials and sometimes hijacking them (or getting
preemptively hijaked).
By using gss_krb5_import_cred we can instead use a private ccache (necessary
sometimes to use a different set of credentials fromt he default
cifs/fqdn@realm one, for example when contacting foreign DCs using trust
credentials) that does not affect the rest of the process.
For the kerberos versions which don't have gss_krb5_import_cred
we fallback to temp override of KRB5CCNAME and gss_acquire_cred.
Signed-off-by: Alexander Bokovoy a...@samba.org
Signed-off-by: Günther Deschner g...@samba.org
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Wed Sep 12 21:18:09 CEST 2012 on sn-devel-104
---
Summary of changes:
source3/include/ads.h |1 +
source3/include/proto.h |2 +-
source3/libads/ads_struct.c |1 +
source3/libads/kerberos_util.c |8 ++-
source3/libads/sasl.c | 92 +--
source3/libsmb/cliconnect.c |2 +-
source3/libsmb/clispnego.c |4 +-
source3/winbindd/winbindd_ads.c |6 +-
8 files changed, 102 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/ads.h b/source3/include/ads.h
index 91a0f81..3de1d8b 100644
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -45,6 +45,7 @@ typedef struct ads_struct {
char *kdc_server;
unsigned flags;
int time_offset;
+ char *ccache_name;
time_t tgt_expire;
time_t tgs_expire;
time_t renewable;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 6dbdf4e..b3fa55a 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -768,7 +768,7 @@ int spnego_gen_krb5_negTokenInit(TALLOC_CTX *ctx,
const char *principal, int time_offset,
DATA_BLOB *targ,
DATA_BLOB *session_key_krb5, uint32 extra_ap_opts,
- time_t *expire_time);
+ const char *ccname, time_t *expire_time);
bool spnego_parse_challenge(TALLOC_CTX *ctx, const DATA_BLOB blob,
DATA_BLOB *chal1, DATA_BLOB *chal2);
DATA_BLOB spnego_gen_auth(TALLOC_CTX *ctx, DATA_BLOB blob);
diff --git a/source3/libads/ads_struct.c b/source3/libads/ads_struct.c
index 45d00a3..fd7e417 100644
--- a/source3/libads/ads_struct.c
+++ b/source3/libads/ads_struct.c
@@ -201,6 +201,7 @@ void ads_destroy(ADS_STRUCT **ads)
SAFE_FREE((*ads)-auth.password);
SAFE_FREE((*ads)-auth.user_name);
SAFE_FREE((*ads)-auth.kdc_server);
+ SAFE_FREE((*ads)-auth.ccache_name);
SAFE_FREE((*ads)-config.realm);
SAFE_FREE((*ads)-config.bind_path);
diff --git a/source3/libads/kerberos_util.c b/source3/libads/kerberos_util.c
index 7d49c02..645b058 100644
--- a/source3/libads/kerberos_util.c
+++ b/source3/libads/kerberos_util.c
@@ -63,9 +63,11 @@ int ads_kinit_password(ADS_STRUCT *ads)
return KRB5_LIBOS_CANTREADPWD;
}
- ret = kerberos_kinit_password_ext(s, ads-auth.password,
ads-auth.time_offset,
- ads-auth.tgt_expire, NULL, NULL, False, False,
ads-auth.renewable,
- NULL);
+ ret = kerberos_kinit_password_ext(s, ads-auth.password,
+ ads-auth.time_offset,
+ ads-auth.tgt_expire, NULL,
+ ads-auth.ccache_name, false, false,
+ ads-auth.renewable, NULL);
if (ret) {
DEBUG(0,(kerberos_kinit_password %s failed: %s\n,
diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c
index 438db05..33f4e24 100644
--- a/source3/libads/sasl.c
+++ b/source3/libads/sasl.c
@@ -271,6 +271,74 @@ static ADS_STATUS ads_sasl_spnego_ntlmssp_bind(ADS_STRUCT
*ads)
}
#ifdef HAVE_KRB5
+static
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d709748 s3-passdb: update abi_match and ignore more statically
linked functions
from 54f1ce4 docs: Rename htmlman3 - htmlman.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d709748070e361b14d4e09042e05cb396174631b
Author: Alexander Bokovoy a...@samba.org
Date: Mon Sep 10 14:34:09 2012 +0300
s3-passdb: update abi_match and ignore more statically linked functions
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Mon Sep 10 16:14:50 CEST 2012 on sn-devel-104
---
Summary of changes:
source3/passdb/ABI/pdb-0.sigs | 10 --
source3/wscript_build | 28 +---
2 files changed, 21 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/passdb/ABI/pdb-0.sigs b/source3/passdb/ABI/pdb-0.sigs
index d4a6b6a..2bccc08 100644
--- a/source3/passdb/ABI/pdb-0.sigs
+++ b/source3/passdb/ABI/pdb-0.sigs
@@ -43,8 +43,6 @@ grant_all_privileges: bool (const struct dom_sid *)
grant_privilege_by_name: bool (const struct dom_sid *, const char *)
grant_privilege_set: bool (const struct dom_sid *, struct lsa_PrivilegeSet *)
groupdb_tdb_init: const struct mapping_backend *(void)
-groupmap_attr_list: 0x
-groupmap_attr_list_to_delete: 0x
idpool_attr_list: {attrib = 2, name = 0x uidNumber}, {attrib = 3, name =
0x gidNumber}, {attrib = 24, name = 0x objectClass}, {attrib = 0,
name = 0x}
init_account_policy: bool (void)
init_buffer_from_samu: uint32_t (uint8_t **, struct samu *, bool)
@@ -52,7 +50,6 @@ init_samu_from_buffer: bool (struct samu *, uint32_t, uint8_t
*, uint32_t)
initialize_password_db: bool (bool, struct tevent_context *)
is_dc_trusted_domain_situation: bool (const char *)
is_privileged_sid: bool (const struct dom_sid *)
-ldapsam_search_suffix_by_name: int (struct ldapsam_privates *, const char *,
LDAPMessage **, const char **)
local_password_change: NTSTATUS (const char *, int, const char *, char **,
char **)
login_cache_delentry: bool (const struct samu *)
login_cache_init: bool (void)
@@ -183,13 +180,8 @@ pdb_getsampwsid: bool (struct samu *, const struct dom_sid
*)
pdb_gid_to_sid: bool (gid_t, struct dom_sid *)
pdb_group_rid_to_gid: gid_t (uint32_t)
pdb_increment_bad_password_count: bool (struct samu *)
-pdb_init_ldapsam: NTSTATUS (struct pdb_methods **, const char *)
-pdb_ipa_init: NTSTATUS (void)
pdb_is_password_change_time_max: bool (time_t)
pdb_lookup_rids: NTSTATUS (const struct dom_sid *, int, uint32_t *, const char
**, enum lsa_SidType *)
-pdb_nds_get_password: int (struct smbldap_state *, char *, size_t *, char *)
-pdb_nds_init: NTSTATUS (void)
-pdb_nds_set_password: int (struct smbldap_state *, char *, const char *)
pdb_new_rid: bool (uint32_t *)
pdb_nop_add_group_mapping_entry: NTSTATUS (struct pdb_methods *, GROUP_MAP *)
pdb_nop_delete_group_mapping_entry: NTSTATUS (struct pdb_methods *, struct
dom_sid)
@@ -259,7 +251,6 @@ pdb_update_bad_password_count: bool (struct samu *, bool *)
pdb_update_group_mapping_entry: NTSTATUS (GROUP_MAP *)
pdb_update_login_attempts: NTSTATUS (struct samu *, bool)
pdb_update_sam_account: NTSTATUS (struct samu *)
-priv2ld: LDAP *(struct ldapsam_privates *)
privilege_create_account: NTSTATUS (const struct dom_sid *)
privilege_delete_account: NTSTATUS (const struct dom_sid *)
privilege_enum_sids: NTSTATUS (enum sec_privilege, TALLOC_CTX *, struct
dom_sid **, int *)
@@ -292,7 +283,6 @@ smb_nscd_flush_group_cache: void (void)
smb_nscd_flush_user_cache: void (void)
smb_register_passdb: NTSTATUS (int, const char *, pdb_init_function)
smb_set_primary_group: int (const char *, const char *)
-smbldap_search_domain_info: NTSTATUS (struct smbldap_state *, LDAPMessage **,
const char *, bool)
uid_to_sid: void (struct dom_sid *, uid_t)
uid_to_unix_users_sid: void (uid_t, struct dom_sid *)
unix_groups_domain_name: const char *(void)
diff --git a/source3/wscript_build b/source3/wscript_build
index 048875d..2903594 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -693,14 +693,28 @@ bld.SAMBA3_SUBSYSTEM('TLDAP',
source=TLDAP_SRC,
deps='asn1util LIBTSOCKET')
-static_pdb_modules = ['tdbsam', 'ldap', 'smbpasswd', 'wbc_sam']
-static_pdb_match = filter(lambda x: bld.SAMBA3_IS_STATIC_MODULE('pdb_%s' % x),
static_pdb_modules)
+# libpdb.so should not expose internal symbols that are only usable
+# to the statically linked modules that are merged into libpdb.
+# Note that we always filter these symbols out in libpdb, even
+# when modules are not linked statically. In the latter case
+# symbols will not be present in the libpdb anyway so no hurt is
+# done to the version script.
+static_pdb_match = ['tdbsam', 'smbpasswd', 'wbc_sam']
private_pdb_match
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via b317f75 s3-smbldap: make smbldap public library and maintain its ABI via 140bb28 s3-smbldap: use smbldap_ prefixed functions via edfe0c0 s3-smbldap: use smbldap_ prefix for all functions via a43774a s3-waf: avoid exporting init symbols from statically linked modules via dd2ab2e s4-torture: dns torture test depends on AD DC build via d08242c s3-passdb: convert pdb_ipa to use secrets wrappers via 57ce825 s3-passdb: convert pdb_ldap to use secrets wrappers via c2e2857 s3-passdb: wrap secrets.tdb accessors used by PDB modules via 9c3e294 wafsamba/samba_abi: allow negative matches in abi_match via c63dcc9 gen_abi.sh: filter out symbols not needed for ABI via 6b2e7aa wafsamba/samba_abi: fix signature parsing for structures from b86c8fd waf: Fix bug #8801 - build s3fs manpages. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b317f75ea69d99c34a2b4ecde9e6634653100dea Author: Alexander Bokovoy a...@samba.org Date: Thu Sep 6 17:43:42 2012 +0300 s3-smbldap: make smbldap public library and maintain its ABI Autobuild-User(master): Alexander Bokovoy a...@samba.org Autobuild-Date(master): Fri Sep 7 14:14:30 CEST 2012 on sn-devel-104 commit 140bb288be426bf57fb46a3e4b012a07b6b60fc8 Author: Alexander Bokovoy a...@samba.org Date: Thu Sep 6 18:53:00 2012 +0300 s3-smbldap: use smbldap_ prefixed functions commit edfe0c0d139a69f3463ad0c59b7c1c6df907079a Author: Alexander Bokovoy a...@samba.org Date: Thu Sep 6 18:52:03 2012 +0300 s3-smbldap: use smbldap_ prefix for all functions commit a43774a2577cd85f4df16eb5a95aa4f11f5e Author: Alexander Bokovoy a...@samba.org Date: Thu Aug 30 19:09:14 2012 +0300 s3-waf: avoid exporting init symbols from statically linked modules WAF builds with and without AD DC affect list of statically linked modules that are added into libpdb. This makes impossible to have ABI for libpdb that does not depend on configured features. By making init functions from statically linked modules to have local scope in shared libraries, we avoid unwarranted ABI changes. Additionally, pdb_samba_dsdb imports IDMAP subsystem of source4/ as it is not a shared library. Making its symbols private as well. Finally, in order to have the filtering of symbols work, libpdb has to be public library. commit dd2ab2e6793891f5a879b8f15250eb43373f015b Author: Alexander Bokovoy a...@samba.org Date: Thu Sep 6 15:29:13 2012 +0300 s4-torture: dns torture test depends on AD DC build commit d08242c84036f118c1dfc3b0889d64d98b207e39 Author: Alexander Bokovoy a...@samba.org Date: Wed Sep 5 18:50:08 2012 +0300 s3-passdb: convert pdb_ipa to use secrets wrappers commit 57ce825c8b441f09393fdd8b3b713d7e3e751624 Author: Alexander Bokovoy a...@samba.org Date: Wed Sep 5 18:49:39 2012 +0300 s3-passdb: convert pdb_ldap to use secrets wrappers commit c2e2857db41ac96dbd6eca69b09a8e4b659997eb Author: Alexander Bokovoy a...@samba.org Date: Wed Sep 5 15:56:37 2012 +0300 s3-passdb: wrap secrets.tdb accessors used by PDB modules PDB modules store domain sid and guid in secrets.tdb to cooperate with other parts of smbd. If PDB module is built outside Samba source code it has to be linked against internal libsecrets. Wrap required secrets_* calls to avoid direct linking. libpdb is linked against libsecrets by itself and this is enough. commit 9c3e294400234ebdf9b98031bae583524fd0b0ac Author: Alexander Bokovoy a...@samba.org Date: Thu Aug 30 18:46:23 2012 +0300 wafsamba/samba_abi: allow negative matches in abi_match abi_match keyword for samba libraries allows to selectively apply ABI versions. samba_abi.py implied !sym to be used to say 'all symbols but this one' but the actual demotion of !sym to the local scope was not implemented. Now abi_match='!sym' properly moves symbol to a local scope. commit c63dcc97b695ceab2bbd8f421f56b623b0d867a2 Author: Alexander Bokovoy a...@samba.org Date: Thu Aug 23 18:45:54 2012 +0300 gen_abi.sh: filter out symbols not needed for ABI gdb does not allow to print definitions of certain section names and special symbols used for dynamic loading machinery: __bss_start _edata _init _fini _end Please note the space before the pattern, it is needed to avoid hungry matches of valid symbols with these as substrings (foo_init, for example). Without this patch gdb on Fedora 18 breaks when attempting to print function and struct signature. commit 6b2e7aabb79f7825568985a9138394dee06b76de Author: Alexander Bokovoy a...@samba.org Date: Thu Aug 23 18:44:01 2012 +0300 wafsamba/samba_abi: fix signature parsing for structures
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9e116e8 s3-rpcclient: support all known netr_LogonControl2 variants
properly
from 9089d48 s4:torture/smb2: add smb2.durable-open.delete_on_close1
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9e116e8a5e2c9ae834b7b500cb0833201bfd148b
Author: Alexander Bokovoy a...@samba.org
Date: Wed Jun 13 17:02:18 2012 +0300
s3-rpcclient: support all known netr_LogonControl2 variants properly
logonctrl2 function in rpcclient did not allow to specify arguments
to most of netr_LogonControl2 function code points.
In addition, make descriptive help to show what is expected at each
function code point.
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Thu Jun 21 12:11:19 CEST 2012 on sn-devel-104
---
Summary of changes:
source3/rpcclient/cmd_netlogon.c | 38 +++---
1 files changed, 35 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index baf2f4f..01d6da4 100644
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -40,10 +40,34 @@ static WERROR cmd_netlogon_logon_ctrl2(struct
rpc_pipe_client *cli,
union netr_CONTROL_QUERY_INFORMATION query;
const char *domain = lp_workgroup();
struct dcerpc_binding_handle *b = cli-binding_handle;
-
- if (argc 5) {
+ int i;
+#define fn_code_level(x, item) { x, #x, #item }
+ struct {
+ enum netr_LogonControlCode code;
+ const char *name;
+ const char *argument;
+ } supported_levels[] = {
+ fn_code_level(NETLOGON_CONTROL_REDISCOVER, domain),
+ fn_code_level(NETLOGON_CONTROL_TC_QUERY, domain),
+ fn_code_level(NETLOGON_CONTROL_TRANSPORT_NOTIFY, domain),
+ fn_code_level(NETLOGON_CONTROL_FIND_USER, user),
+ fn_code_level(NETLOGON_CONTROL_CHANGE_PASSWORD, domain),
+ fn_code_level(NETLOGON_CONTROL_TC_VERIFY, domain),
+ fn_code_level(NETLOGON_CONTROL_SET_DBFLAG, debug_level),
+ {0, 0, 0}
+ };
+#undef fn_code_level
+ if ((argc 5) || (argc 2)) {
fprintf(stderr, Usage: %s logon_server function_code
- level domain\n, argv[0]);
+ level:1..4 argument\n, argv[0]);
+ fprintf(stderr, Supported combinations:\n);
+ fprintf(stderr, function_code\targument\n);
+ for(i=0; supported_levels[i].code; i++) {
+ fprintf(stderr, %7d\t\t%s\t(%s)\n,
+ supported_levels[i].code,
+ supported_levels[i].argument,
+ supported_levels[i].name);
+ }
return WERR_OK;
}
@@ -66,8 +90,16 @@ static WERROR cmd_netlogon_logon_ctrl2(struct
rpc_pipe_client *cli,
switch (function_code) {
case NETLOGON_CONTROL_REDISCOVER:
case NETLOGON_CONTROL_TC_QUERY:
+ case NETLOGON_CONTROL_CHANGE_PASSWORD:
+ case NETLOGON_CONTROL_TRANSPORT_NOTIFY:
+ case NETLOGON_CONTROL_TC_VERIFY:
data.domain = domain;
break;
+ case NETLOGON_CONTROL_FIND_USER:
+ data.user = domain;
+ break;
+ case NETLOGON_CONTROL_SET_DBFLAG:
+ data.debug_level = atoi(domain);
default:
break;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e102350 waf: fix parsing krb5-config --version for MIT krb5
via 23aac20 waf: support --without-ad-dc for Heimdal (embedded and
system) as well
from 8778e41 build: fix typo that breaks the HP-UX build
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e1023501d92dea532736d86c6efecb8cde92327d
Author: Alexander Bokovoy a...@samba.org
Date: Thu Jun 7 14:22:33 2012 +0300
waf: fix parsing krb5-config --version for MIT krb5
krb5-config --version may return a string that ends with a suffix after
version number (1.X-prerelease or 1.X-beta1, for example). Detect and
ignore the suffix.
Autobuild-User(master): Alexander Bokovoy a...@samba.org
Autobuild-Date(master): Thu Jun 7 17:03:01 CEST 2012 on sn-devel-104
commit 23aac2039d921abdde1a2b6e2bdb4a3d0bcab8ee
Author: Alexander Bokovoy a...@samba.org
Date: Thu Jun 7 13:38:20 2012 +0300
waf: support --without-ad-dc for Heimdal (embedded and system) as well
--without-ad-dc was hardwired to mean --with-system-mitkrb5. With this
change
it also possible to build source3/ code and source4/ client side without
building AD DC functionality using Heimdal (embedded or system).
---
Summary of changes:
source4/torture/ndr/ndr.c|2 +-
source4/torture/rpc/rpc.c|2 +-
source4/torture/wscript_build|2 +-
wscript |6 +++---
wscript_configure_system_mitkrb5 | 10 --
5 files changed, 14 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/ndr/ndr.c b/source4/torture/ndr/ndr.c
index b446242..1fb3bdb 100644
--- a/source4/torture/ndr/ndr.c
+++ b/source4/torture/ndr/ndr.c
@@ -372,7 +372,7 @@ struct torture_suite *torture_local_ndr(TALLOC_CTX *mem_ctx)
torture_suite_add_suite(suite, ndr_drsblobs_suite(suite));
torture_suite_add_suite(suite, ndr_nbt_suite(suite));
torture_suite_add_suite(suite, ndr_ntlmssp_suite(suite));
-#ifdef SAMBA4_USES_HEIMDAL /* Add Heimdal-specific KDC test */
+#ifdef AD_DC_BUILD_IS_ENABLED /* Add Heimdal-specific KDC test */
torture_suite_add_suite(suite, ndr_backupkey_suite(suite));
#endif
torture_suite_add_suite(suite, ndr_string_suite(suite));
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index 37ff085..7250eb5 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -528,7 +528,7 @@ NTSTATUS torture_rpc_init(void)
torture_suite_add_simple_test(suite, asyncbind, torture_async_bind);
torture_suite_add_suite(suite, torture_rpc_ntsvcs(suite));
torture_suite_add_suite(suite, torture_rpc_bind(suite));
-#ifdef SAMBA4_USES_HEIMDAL /* Add Heimdal-specific KDC test */
+#ifdef AD_DC_BUILD_IS_ENABLED /* Add Heimdal-specific KDC test */
torture_suite_add_suite(suite, torture_rpc_backupkey(suite));
#endif
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 70829f5..5b445bd 100755
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -35,7 +35,7 @@ bld.RECURSE('libsmbclient')
heimdal_specific = dict()
heimdal_specific['ndr'] = ('','')
heimdal_specific['rpc'] = ('','')
-if bld.CONFIG_SET('SAMBA4_USES_HEIMDAL'):
+if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
heimdal_specific['ndr'] = (' ndr/backupkey.c','')
heimdal_specific['rpc'] = (' rpc/backupkey.c rpc/spoolss_notify.c
rpc/spoolss_win.c',
' RPC_NDR_BACKUPKEY SMB_SERVER
dcerpc_server ntvfs')
diff --git a/wscript b/wscript
index 168e17d..cccd193 100755
--- a/wscript
+++ b/wscript
@@ -52,8 +52,8 @@ def set_options(opt):
action='callback', callback=system_mitkrb5_callback,
dest='with_system_mitkrb5', default=False)
opt.add_option('--without-ad-dc',
- help='disable AD DC functionality (enables Samba 4 client
and Samba 3 code base). Requires system MIT krb5',
- action='store_true', dest='with_system_mitkrb5',
default=False)
+ help='disable AD DC functionality (enables Samba 4 client
and Samba 3 code base).',
+ action='store_true', dest='without_ad_dc', default=False)
gr = opt.option_group('developer options')
gr.add_option('--enable-build-farm',
@@ -110,7 +110,7 @@ def configure(conf):
if Options.options.with_system_mitkrb5:
conf.PROCESS_SEPARATE_RULE('system_mitkrb5')
-else:
+if not (Options.options.without_ad_dc or
Options.options.with_system_mitkrb5):
conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1)
# Only process heimdal_build for non-MIT KRB5 builds
# When MIT KRB5 checks are done as above, conf.env.KRB5_VENDOR will be set
diff --git a/wscript_configure_system_mitkrb5 b
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 238d24a auth-kerberos: avoid crash with MIT krb5 1.10.0 in
gss_get_name_attribute()
from f3df298 s4 dns: Correctly handle A questions for CNAMEs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 238d24af4ed1457b684b6e497d1ca134f9ea567d
Author: Alexander Bokovoy a...@samba.org
Date: Wed Jun 6 16:52:18 2012 +0300
auth-kerberos: avoid crash with MIT krb5 1.10.0 in gss_get_name_attribute()
gss_get_name_attribute() can return unintialized pac_display_buffer
and later gss_release_buffer() will crash on attempting to release it.
The fix on MIT krb5 side is in 1.10.1, reported in both Debian and MIT
upstream:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=658514
http://krbdev.mit.edu/rt/Ticket/Display.html?user=guestpass=guestid=7087
We need to initialize variables before using gss_get_name_attribute()
Autobuild-User: Alexander Bokovoy a...@samba.org
Autobuild-Date: Wed Jun 6 18:22:51 CEST 2012 on sn-devel-104
---
Summary of changes:
auth/kerberos/gssapi_pac.c | 20 ++--
1 files changed, 18 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/kerberos/gssapi_pac.c b/auth/kerberos/gssapi_pac.c
index dadae1a..a174052 100644
--- a/auth/kerberos/gssapi_pac.c
+++ b/auth/kerberos/gssapi_pac.c
@@ -80,8 +80,24 @@ NTSTATUS gssapi_obtain_pac_blob(TALLOC_CTX *mem_ctx,
NTSTATUS status;
OM_uint32 gss_maj, gss_min;
#ifdef HAVE_GSS_GET_NAME_ATTRIBUTE
- gss_buffer_desc pac_buffer;
- gss_buffer_desc pac_display_buffer;
+/*
+ * gss_get_name_attribute() in MIT krb5 1.10.0 can return unintialized
pac_display_buffer
+ * and later gss_release_buffer() will crash on attempting to release it.
+ *
+ * So always initialize the buffer descriptors.
+ *
+ * See following links for more details:
+ * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=658514
+ * http://krbdev.mit.edu/rt/Ticket/Display.html?user=guestpass=guestid=7087
+ */
+ gss_buffer_desc pac_buffer = {
+ .value = NULL,
+ .length = 0
+ };
+ gss_buffer_desc pac_display_buffer = {
+ .value = NULL,
+ .length = 0
+ };
gss_buffer_desc pac_name = {
.value = discard_const(urn:mspac:),
.length = sizeof(urn:mspac:)-1
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via eaf9b86 Revert waf-mitkrb5: enable dcerpc_server library to
support OpenChange client code
from 6e9aca7 waf: check for krb5_create_checksum and krb5_creds.flags
for some Heimdal versions
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit eaf9b86d601d7564199bdc037dc5024e6a4e5908
Author: Alexander Bokovoy a...@samba.org
Date: Fri Jun 1 15:38:56 2012 +0300
Revert waf-mitkrb5: enable dcerpc_server library to support OpenChange
client code
This reverts commit f8c447b1a48eaf12dcf70b92fd7525c4ad26c246.
After discussing with Julien (Openchange) and Metze, I decided to revert
this code.
Instead I made a patch to Openchange which allows to build client side only.
Openchange server code requires working s4 member DC and --without-ad-dc
build
does not provide working provisioning even if we enable dcerpc_server and
end point mapper.
Autobuild-User: Alexander Bokovoy a...@samba.org
Autobuild-Date: Fri Jun 1 16:46:08 CEST 2012 on sn-devel-104
---
Summary of changes:
source4/rpc_server/wscript_build | 57 ---
source4/smbd/wscript_build |4 +-
source4/wrepl_server/wscript_build |3 +-
3 files changed, 23 insertions(+), 41 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 84df78b..e3a863a 100755
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -11,26 +11,25 @@ bld.SAMBA_SUBSYSTEM('DCERPC_COMMON',
source='common/forward.c common/reply.c dcesrv_auth.c
common/loadparm.c',
autoproto='common/proto.h',
deps='ldb DCERPC_SHARE samba_server_gensec',
- enabled=True
+ enabled=bld.AD_DC_BUILD_IS_ENABLED()
)
bld.SAMBA_LIBRARY('dcerpc_server',
source='dcerpc_server.c dcesrv_mgmt.c handles.c',
pc_files='dcerpc_server.pc',
- deps='LIBCLI_AUTH DCERPC_COMMON ndr samba_server_gensec dcerpc_remote
service',
+ deps='LIBCLI_AUTH ndr samba_server_gensec dcerpc_remote service',
public_deps='dcerpc',
autoproto='dcerpc_server_proto.h',
public_headers='dcerpc_server.h',
vnum='0.0.1',
- enabled=True
+ enabled=bld.AD_DC_BUILD_IS_ENABLED()
)
bld.SAMBA_MODULE('dcerpc_rpcecho',
source='echo/rpc_echo.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_rpcecho_init',
- deps='ndr-standard events',
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ deps='ndr-standard events'
)
@@ -38,8 +37,7 @@ bld.SAMBA_MODULE('dcerpc_epmapper',
source='epmapper/rpc_epmapper.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_epmapper_init',
- deps='NDR_EPMAPPER',
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ deps='NDR_EPMAPPER'
)
@@ -47,8 +45,7 @@ bld.SAMBA_MODULE('dcerpc_remote',
source='remote/dcesrv_remote.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_remote_init',
- deps='LIBCLI_SMB ndr-table',
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ deps='LIBCLI_SMB ndr-table'
)
@@ -57,8 +54,7 @@ bld.SAMBA_MODULE('dcerpc_srvsvc',
autoproto='srvsvc/proto.h',
subsystem='dcerpc_server',
init_function='dcerpc_server_srvsvc_init',
- deps='DCERPC_COMMON NDR_SRVSVC share ntvfs',
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ deps='DCERPC_COMMON NDR_SRVSVC share ntvfs'
)
@@ -66,8 +62,7 @@ bld.SAMBA_MODULE('dcerpc_wkssvc',
source='wkssvc/dcesrv_wkssvc.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_wkssvc_init',
- deps='DCERPC_COMMON ndr-standard',
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ deps='DCERPC_COMMON ndr-standard'
)
@@ -75,8 +70,7 @@ bld.SAMBA_MODULE('dcerpc_unixinfo',
source='unixinfo/dcesrv_unixinfo.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_unixinfo_init',
- deps='DCERPC_COMMON samdb NDR_UNIXINFO LIBWBCLIENT_OLD',
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ deps='DCERPC_COMMON samdb NDR_UNIXINFO LIBWBCLIENT_OLD'
)
@@ -85,8 +79,7 @@ bld.SAMBA_MODULE('dcesrv_samr',
autoproto='samr/proto.h',
subsystem='dcerpc_server',
init_function='dcerpc_server_samr_init',
- deps='samdb DCERPC_COMMON ndr-standard',
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ deps='samdb DCERPC_COMMON ndr-standard'
)
@@ -95,8 +88,7 @@ bld.SAMBA_MODULE('dcerpc_winreg',
subsystem='dcerpc_server',
init_function='dcerpc_server_winreg_init',
deps='registry ndr-standard',
- internal_module=True,
- enabled
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 27503ce freebsd9: support both WAF MIT krb5 build and autoconf
build against MIT krb5
from e4c59a6 s4:ntvfs/ipc: fix protocol specific processing of pipe names
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 27503cea09f207be23679162e9570ef40ee7fe61
Author: Alexander Bokovoy a...@samba.org
Date: Mon May 28 19:03:00 2012 +0300
freebsd9: support both WAF MIT krb5 build and autoconf build against MIT
krb5
System-provided Heimdal Kerberos in FreeBSD 9 lacks proper support for
parsing MS PAC.
This leaves us with MIT krb5 package from ports or embedded Heimdal in
source4.
MIT krb5 from ports is 1.9.2, it supports all needed features for AD
support in smbd,
as well as WAF MIT krb5 build. In order to use it, one needs to install
'krb5' package.
Autoconf build:
--with-krb5=/usr/local
WAF build:
--with-system-mitkrb5 /usr/local
or otherwise krb5-config from system Heimdal will overtake and break the
detection, leaving
you with a mixture of Kerberos libraries from different locations.
WAF build accepts multiple paths as sub-arguments of the
--with-system-mitkrb5 and searches
through them for krb5-config, i.e. /usr/local /usr/kerberos ...
Autobuild-User: Alexander Bokovoy a...@samba.org
Autobuild-Date: Mon May 28 23:40:30 CEST 2012 on sn-devel-104
---
Summary of changes:
source3/m4/aclocal.m4|1 +
wscript | 19 +--
wscript_configure_system_mitkrb5 | 27 +++
3 files changed, 37 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index a4db42e..5d9ce30 100644
--- a/source3/m4/aclocal.m4
+++ b/source3/m4/aclocal.m4
@@ -412,6 +412,7 @@ AC_DEFUN(LIB_REMOVE_USR_LIB,[
-Wl,-rpath-Wl,/usr/lib/) l=;;
-Wl,-rpath-Wl,/usr/lib64) l=;;
-Wl,-rpath-Wl,/usr/lib64/) l=;;
+-rpath=/usr/lib:*) l=-rpath=${i#-rpath=*:};;
*)
s=
if test x[$]ac_new_flags = x; then
diff --git a/wscript b/wscript
index 56dee2e..168e17d 100755
--- a/wscript
+++ b/wscript
@@ -17,6 +17,20 @@ samba_dist.DIST_BLACKLIST('.gitignore .bzrignore')
# install in /usr/local/samba by default
Options.default_prefix = '/usr/local/samba'
+# This callback optionally takes a list of paths as arguments:
+# --with-system_mitkrb5 /path/to/krb5 /another/path
+def system_mitkrb5_callback(option, opt, value, parser):
+setattr(parser.values, option.dest, True)
+value = []
+for arg in parser.rargs:
+# stop on --foo like options
+if arg[:2] == -- and len(arg) 2:
+break
+value.append(arg)
+if len(value)0:
+del parser.rargs[:len(value)]
+setattr(parser.values, option.dest, value)
+
def set_options(opt):
opt.BUILTIN_DEFAULT('NONE')
opt.PRIVATE_EXTENSION_DEFAULT('samba4')
@@ -33,8 +47,9 @@ def set_options(opt):
opt.RECURSE('lib/util')
opt.add_option('--with-system-mitkrb5',
- help='enable system MIT krb5 build (includes Samba 4 client
and Samba 3 code base)',
- action='store_true', dest='with_system_mitkrb5',
default=False)
+ help='enable system MIT krb5 build (includes Samba 4 client
and Samba 3 code base).'+
+'You may specify list of paths where Kerberos is
installed (e.g. /usr/local /usr/kerberos) to search krb5-config',
+ action='callback', callback=system_mitkrb5_callback,
dest='with_system_mitkrb5', default=False)
opt.add_option('--without-ad-dc',
help='disable AD DC functionality (enables Samba 4 client
and Samba 3 code base). Requires system MIT krb5',
diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
index 805c452..0f7e404 100644
--- a/wscript_configure_system_mitkrb5
+++ b/wscript_configure_system_mitkrb5
@@ -13,17 +13,23 @@ def krb5_define_syslib(conf, lib, deps):
Logs.info(Looking for kerberos features)
conf.find_program('krb5-config.heimdal', var='HEIMDAL_KRB5_CONFIG')
-conf.find_program('krb5-config', var='KRB5_CONFIG')
+
+if isinstance(Options.options.with_system_mitkrb5, list):
+path_krb5_config = [x+'/bin' for x in Options.options.with_system_mitkrb5]
+else:
+path_krb5_config = None
+
+conf.find_program('krb5-config', path_list=path_krb5_config, var='KRB5_CONFIG')
if conf.env.KRB5_CONFIG:
-conf.check_cfg(path=krb5-config, args=--cflags --libs,
+conf.check_cfg(path=conf.env.KRB5_CONFIG, args=--cflags --libs,
package=, uselib_store=KRB5)
krb5_define_syslib(conf, krb5, conf.env['LIB_KRB5'])
-for lib in conf.env['LIB_KRB5']:
-krb5_define_syslib(conf, lib, lib
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 518484a dns_hosts_file: move to a separate subsystem
via 337353b s3-configure.in: when ADS support is disabled, unset
HAVE_GSSAPI
from 0bf6ec8 s3:selftest: run smbtorture3 CLEANUP3 in the s3dc:local
environment
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 518484af8d4960b483e40fbb244e284532efd267
Author: Alexander Bokovoy a...@samba.org
Date: Fri May 25 18:45:17 2012 +0300
dns_hosts_file: move to a separate subsystem
After discussion with Kai move dns_hosts_file to a separate subsystem
and merge it into libaddns private library for s3/s4 client use.
Also remove dependency in libcli/nbt, the code from libcli/dns subsystems
is not used there at all.
Autobuild-User: Alexander Bokovoy a...@samba.org
Autobuild-Date: Fri May 25 22:22:44 CEST 2012 on sn-devel-104
commit 337353bd3c752a41b49381486b07fe91634e6c22
Author: Alexander Bokovoy a...@samba.org
Date: Fri May 25 13:25:12 2012 +0300
s3-configure.in: when ADS support is disabled, unset HAVE_GSSAPI
---
Summary of changes:
lib/addns/wscript_build |2 +-
libcli/dns/wscript_build | 12 +++-
libcli/nbt/wscript_build |2 +-
source3/configure.in |1 +
4 files changed, 10 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/addns/wscript_build b/lib/addns/wscript_build
index 15fb620..513060d 100755
--- a/lib/addns/wscript_build
+++ b/lib/addns/wscript_build
@@ -2,6 +2,6 @@
bld.SAMBA_LIBRARY('addns',
source='dnsquery.c dnsrecord.c dnsutils.c dnssock.c
dnsgss.c dnsmarshall.c error.c',
- public_deps='clidns samba-util gssapi uuid resolv',
+ public_deps='dnshostsfile samba-util gssapi uuid resolv',
private_library=True,
vars=locals())
diff --git a/libcli/dns/wscript_build b/libcli/dns/wscript_build
index 03025ad..421dd6d 100755
--- a/libcli/dns/wscript_build
+++ b/libcli/dns/wscript_build
@@ -1,7 +1,9 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('clidns',
-source='dns.c dns_hosts_file.c',
-public_deps='LIBTSOCKET tevent-util',
-private_library=True,
-vars=locals())
+bld.SAMBA_SUBSYSTEM('clidns',
+source='dns.c',
+public_deps='LIBTSOCKET tevent-util')
+
+bld.SAMBA_SUBSYSTEM('dnshostsfile',
+source='dns_hosts_file.c',
+public_deps='samba-util errors')
diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index a8c239c..faf818e 100755
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -8,7 +8,7 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
bld.SAMBA_SUBSYSTEM('lmhosts',
source='lmhosts.c',
-deps='clidns replace talloc'
+deps='replace talloc'
)
bld.SAMBA_LIBRARY('cli-nbt',
diff --git a/source3/configure.in b/source3/configure.in
index 3e35d8f..f0a76a1 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -4131,6 +4131,7 @@ if test x$with_ads_support != xno; then
AC_REMOVE_DEFINE(HAVE_GSSAPI_H)
AC_REMOVE_DEFINE(HAVE_GSSAPI_GSSAPI_GENERIC_H)
AC_REMOVE_DEFINE(HAVE_GSSAPI_GSSAPI_H)
+AC_REMOVE_DEFINE(HAVE_GSSAPI)
KRB5_LIBS=
with_ads_support=no
fi
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via b452fb3 waf: for MIT krb5 build require kerberos version above 1.9 via 72029d5 s3-smbldap: Add API for external callback to perform LDAP bind in smbldap via 838435ab3 s4/scripting: in MIT build do not install samba-tool, it is not usable yet via ca2b625 s4-selftest: Demonstrate the correct behaviour between specified usernames and kerberos ccache via dc3f74a auth/credentials: 'workgroup' set via command line will not drop existing ccache from a95b2ba s3:smbd/msdfs: pass allow_broken_path to resolve_dfspath_wcard() http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b452fb30f79c5effa508b891bcb453de8f452286 Author: Alexander Bokovoy a...@samba.org Date: Thu May 24 16:28:31 2012 +0300 waf: for MIT krb5 build require kerberos version above 1.9 MIT krb5 implementation provides sufficient support for features used in Samba 4 starting with 1.9. Require version above when using system MIT krb5 build. Autobuild-User: Alexander Bokovoy a...@samba.org Autobuild-Date: Thu May 24 18:15:36 CEST 2012 on sn-devel-104 commit 72029d5547766787afb0a76c3959d1820388e28e Author: Alexander Bokovoy a...@samba.org Date: Thu May 24 15:38:41 2012 +0300 s3-smbldap: Add API for external callback to perform LDAP bind in smbldap In order to support other bind methods, introduce a generic bind callback. When smbldap_state.bind_callback is set, it means there is an alternative way to perform LDAP bind to ldap_simple_bind_s() so call it instead. The call is wrapped in become_root()/unbecome_root() to allow proper permissions in smbd to access needed resources in the callback, for example, credential caches. When run outside smbd, become_root()/unbecome_root() are no-op. The API expectation is similar to ldap_simple_bind_s(). A caller of smbldap API can pass additional information to the callback by setting smbldap_state.bind_callback_data pointer. Both callback and the data pointer elements of smbldap_state structure get cleaned up if someone sets proper credentials on smbldap_state with smbldap_set_creds() so if you are interested in using smbldap_state.bind_dn with the callback, make sure to set callback after credentials are set. commit 838435ab30c03e5db7eb1e80f486528231dffdfc Author: Alexander Bokovoy a...@samba.org Date: Thu May 24 15:24:12 2012 +0300 s4/scripting: in MIT build do not install samba-tool, it is not usable yet commit ca2b6259b7f0787eb372b56076e63413f530ec12 Author: Andrew Bartlett abart...@samba.org Date: Thu May 24 13:36:20 2012 +1000 s4-selftest: Demonstrate the correct behaviour between specified usernames and kerberos ccache This shows that a username/password on the command line must always override any credentials cache in the environment. Andrew Bartlett commit dc3f74a953de0fcf9b3f693efe2ba8dea7b93da9 Author: Alexander Bokovoy a...@samba.org Date: Thu May 24 15:17:40 2012 +0300 auth/credentials: 'workgroup' set via command line will not drop existing ccache The root cause for existing ccache being invalidated was use of global loadparm with 'workgroup' value set as if from command line. However, we don't really need to take 'workgroup' parameter value's nature into account when invalidating existing ccache. When -U is used on the command line, one can specify a password to force ccache invalidation. The commit also reverts previous fix now that root cause is clear. --- Summary of changes: auth/credentials/credentials.c |6 +- auth/credentials/credentials_krb5.c | 14 ++ source3/include/smbldap.h|2 ++ source3/lib/smbldap.c| 20 +++- source4/scripting/bin/wscript_build |4 +--- source4/scripting/wscript_build |7 +++ testprogs/blackbox/test_kinit.sh |1 - testprogs/blackbox/test_passwords.sh |8 wscript_configure_system_mitkrb5 |9 - 9 files changed, 48 insertions(+), 23 deletions(-) Changeset truncated at 500 lines: diff --git a/auth/credentials/credentials.c b/auth/credentials/credentials.c index 3eaccde..05f0a62 100644 --- a/auth/credentials/credentials.c +++ b/auth/credentials/credentials.c @@ -483,7 +483,11 @@ _PUBLIC_ bool cli_credentials_set_domain(struct cli_credentials *cred, * calculations */ cred-domain = strupper_talloc(cred, val); cred-domain_obtained = obtained; - cli_credentials_invalidate_ccache(cred, cred-domain_obtained); + /* setting domain does not mean we have to invalidate ccache +* because domain in not used
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via dcfb34f blackbox: fix samba4.blackbox.kinit test via 2b14453 gse: Use the smb_gss_oid_equal wrapper. via 0a6e568 krb5samba: Add smb_gss_oid_equal wrapper. via c1444c3 s3-autoconf: fix typo after migrating DNS resolver code to lib/addns via 77a6c81 wafsamba: ensure TO_LIST does not fail with empty string via 744f991 libcli/dns: make 'clidns' private library out of DNS code in WAF build via 2ddf89a Introduce system MIT krb5 build with --with-system-mitkrb5 option. System MIT krb5 build also enabled by specifying --without-ad-dc via 2fc96e6 s4: samba-tool is usable without export-keytab command, make sure it does not break via ec989e7 auth-credentials: Support using pre-fetched ccache when obtaining kerberos credentials via 2d9a0d8 s3-passdb: add unixid_from_uid/unixid_from_gid/unixid_from_both API via f32d437 dns: fix comments and make s4/libcli/resolve dns resolver working via 1feb312 lib/krb5_wrap: implement krb5_cc_get_lifetime for MIT Kerberos via ad945bc gensec_gssapi: Make it possible to build with MIT krb5 via 302abe6 auth and s4-rpc_server: Do not use features we currently can't implement with MIT Kerbros build via c54fe86 s4-resolve: Remove dependency on libroken via a8ee6f2 addns: Make ads_dns_lookup_srv pulic via 34a6573 Move source3/libads/dns.c to lib/addns via cc3321c s3-ads-dns: Avoid unnecessary dependencies via a7e94fc s3-ads-dns: Break dependency on lp_parm via 4a335e9 s3-ad-dns: Use more standard uint and booleans defs via 9c5aa0b addns: Fix talloc hiereachy from 37866df s3:smbd: use reply_force_doserror(req, ERRSRV, ERRbaduid) on SMBulogoff http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit dcfb34fbb4b7484bdaa70fbe9ae9fd84738ab469 Author: Alexander Bokovoy a...@samba.org Date: Wed May 23 17:34:24 2012 +0300 blackbox: fix samba4.blackbox.kinit test This deserves some explanation. With commit 518232d4578d700f5f5ea1609275a6cd1de3a1e7 samba4.blackbox.kinit test set was wrapped with password settings reset before and after the tests with an idea to maintain reliable state for the tests. As result, the resetting of the password settings was done after the test that tried to use smbclient with a Kerberos ticket obtained with machine account credentials. However, the code in credentials_krb5.c, function cli_credentials_get_client_gss_creds(), never worked correctly when credentials were already in ccache. Instead, gensec_gssapi module always re-kinited even if existing credentials were available in the ccache. This had an effect on 'samba4.blackbox.kinit(dc:local).reset password policies(dc:local)' test equal to never having initialized ccache at all, as if 'rm -f $KRB5CCNAME' was run before the test. When the issue of not using already initialized credentials from ccache was fixed with d0aae88f1290e6a7a6d4bfc24aa62795e4892a31 'auth-credentials: Support using pre-fetched ccache when obtaining kerberos credentials' commit, Samba 4 credentials library started to correctly re-used already obtained credentials from ccaches. This caused failure of the test 'samba4.blackbox.kinit(dc:local).reset password policies(dc:local)' because machine account has no permissions to modify password settings. Thus, the correct fix is to reset ccache state before performing the test. Autobuild-User: Alexander Bokovoy a...@samba.org Autobuild-Date: Wed May 23 18:46:12 CEST 2012 on sn-devel-104 commit 2b144531f1a760514f217012e9dab01359b7a0d7 Author: Andreas Schneider a...@samba.org Date: Mon May 21 18:25:28 2012 +0200 gse: Use the smb_gss_oid_equal wrapper. Signed-off-by: Andreas Schneider a...@samba.org commit 0a6e568344adb66e5f20ce61f106d791886fcb35 Author: Andreas Schneider a...@samba.org Date: Mon May 21 18:24:31 2012 +0200 krb5samba: Add smb_gss_oid_equal wrapper. Signed-off-by: Andreas Schneider a...@samba.org commit c1444c3839573793c24244da8572e6c8468c927f Author: Alexander Bokovoy a...@samba.org Date: Tue May 22 13:52:48 2012 +0300 s3-autoconf: fix typo after migrating DNS resolver code to lib/addns commit 77a6c8134763dc0b50ad33e1b4419441220c47a9 Author: Alexander Bokovoy a...@samba.org Date: Mon May 21 18:38:56 2012 +0300 wafsamba: ensure TO_LIST does not fail with empty string commit 744f9910c81cee13228165db4e46200c41c69221 Author: Alexander Bokovoy a...@samba.org Date: Mon May 21 17:54:13 2012 +0300 libcli/dns: make 'clidns' private library out of DNS code in WAF build After consolidating DNS resolver code to lib/addns, there is one piece that still needs to be moved into a common DNS resolver library
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 89e9984 waf: samba-specific methods should have capitalized names,
change process_separate_rule to follow
from e109cc5 docs: add a vfs_tsmsm manpage
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 89e998412fe07a01f9c79330973f62d909dc2da2
Author: Alexander Bokovoy a...@samba.org
Date: Sat Apr 14 08:16:20 2012 +0300
waf: samba-specific methods should have capitalized names, change
process_separate_rule to follow
Changing process_separate_rule to PROCESS_SEPARATE_RULE.
Thanks Thomas Nagy for review.
Autobuild-User: Alexander Bokovoy a...@samba.org
Autobuild-Date: Sat Apr 14 08:55:43 CEST 2012 on sn-devel-104
---
Summary of changes:
buildtools/wafsamba/samba_utils.py |6 +++---
wscript_build |6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_utils.py
b/buildtools/wafsamba/samba_utils.py
index bdf96fe..477e0b4 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -626,7 +626,7 @@ def get_tgt_list(bld):
return tgt_list
from Constants import WSCRIPT_FILE
-def process_separate_rule(self, rule):
+def PROCESS_SEPARATE_RULE(self, rule):
''' cause waf to process additional script based on `rule'.
You should have file named wscript_stage_rule in the current
directory
where stage is either 'configure' or 'build'
@@ -645,5 +645,5 @@ def process_separate_rule(self, rule):
dc = self.pre_recurse(txt, file_path, [])
exec(compile(txt, file_path, 'exec'), dc)
-Build.BuildContext.process_separate_rule = process_separate_rule
-ConfigurationContext.process_separate_rule = process_separate_rule
+Build.BuildContext.PROCESS_SEPARATE_RULE = PROCESS_SEPARATE_RULE
+ConfigurationContext.PROCESS_SEPARATE_RULE = PROCESS_SEPARATE_RULE
diff --git a/wscript_build b/wscript_build
index eeefeb3..ad790ca 100644
--- a/wscript_build
+++ b/wscript_build
@@ -118,11 +118,11 @@ if bld.CONFIG_SET(USING_SYSTEM_KRB5):
# When both HEIMDAL_KRB5_CONFIG and KRB5_CONFIG are set and not
equal,
# it means one is Heimdal-specific (krb5-config.heimdal, for
example)
# and there is system heimdal
-bld.process_separate_rule('system_heimdal')
+bld.PROCESS_SEPARATE_RULE('system_heimdal')
else:
-bld.process_separate_rule('system_krb5')
+bld.PROCESS_SEPARATE_RULE('system_krb5')
else:
-bld.process_separate_rule('embedded_heimdal')
+bld.PROCESS_SEPARATE_RULE('embedded_heimdal')
bld.RECURSE('libcli/smbreadline')
bld.RECURSE('codepages')
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1a8405c wafsamba: add support for separate rules in stages
from b8dea7e Wrong assertion/comparison: Compare value not pointer
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1a8405c320f115d584a9094bf5878b8cf6d58893
Author: Alexander Bokovoy a...@samba.org
Date: Fri Apr 13 17:53:04 2012 +0300
wafsamba: add support for separate rules in stages
bld.process_separate_rule(rule) and conf.process_separate_rule(rule)
will cause WAF to import wscript_stage_rule script into current
context.
Files wscript_configure|build_rule should exist in the current
directory.
This can be used to provide rules specific for alternative
implementations of certain libraries
Autobuild-User: Alexander Bokovoy a...@samba.org
Autobuild-Date: Fri Apr 13 18:34:39 CEST 2012 on sn-devel-104
---
Summary of changes:
buildtools/wafadmin/Utils.py |5 -
buildtools/wafsamba/samba_utils.py | 25 -
wscript_build | 15 +--
wscript_build_embedded_heimdal |2 ++
wscript_build_system_heimdal |2 ++
wscript_build_system_mitkrb5 |2 ++
6 files changed, 43 insertions(+), 8 deletions(-)
create mode 100644 wscript_build_embedded_heimdal
create mode 100644 wscript_build_system_heimdal
create mode 100644 wscript_build_system_mitkrb5
Changeset truncated at 500 lines:
diff --git a/buildtools/wafadmin/Utils.py b/buildtools/wafadmin/Utils.py
index 080d928..41dad57 100644
--- a/buildtools/wafadmin/Utils.py
+++ b/buildtools/wafadmin/Utils.py
@@ -111,9 +111,6 @@ class WscriptError(WafError):
return (frame[0], frame[1])
return (None, None)
-class WscriptCheckSkipped(WscriptError):
-pass
-
indicator = is_win32 and '\x1b[A\x1b[K%s%s%s\r' or '\x1b[K%s%s%s\r'
try:
@@ -648,8 +645,6 @@ class Context(object):
try:
try:
exec(compile(txt, file_path,
'exec'), dc)
- except WscriptCheckSkipped:
- pass
except Exception:
exc_type, exc_value, tb =
sys.exc_info()
raise
WscriptError(.join(traceback.format_exception(exc_type, exc_value, tb)), base)
diff --git a/buildtools/wafsamba/samba_utils.py
b/buildtools/wafsamba/samba_utils.py
index 519b77b..bdf96fe 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -3,7 +3,7 @@
import Build, os, sys, Options, Utils, Task, re, fnmatch, Logs
from TaskGen import feature, before
-from Configure import conf
+from Configure import conf, ConfigurationContext
from Logs import debug
import shlex
@@ -624,3 +624,26 @@ def get_tgt_list(bld):
sys.exit(1)
tgt_list.append(t)
return tgt_list
+
+from Constants import WSCRIPT_FILE
+def process_separate_rule(self, rule):
+''' cause waf to process additional script based on `rule'.
+You should have file named wscript_stage_rule in the current
directory
+where stage is either 'configure' or 'build'
+'''
+ctxclass = self.__class__.__name__
+stage = ''
+if ctxclass == 'ConfigurationContext':
+stage = 'configure'
+elif ctxclass == 'BuildContext':
+stage = 'build'
+file_path = os.path.join(self.curdir, WSCRIPT_FILE+'_'+stage+'_'+rule)
+txt = load_file(file_path)
+if txt:
+dc = {'ctx': self}
+if getattr(self.__class__, 'pre_recurse', None):
+dc = self.pre_recurse(txt, file_path, [])
+exec(compile(txt, file_path, 'exec'), dc)
+
+Build.BuildContext.process_separate_rule = process_separate_rule
+ConfigurationContext.process_separate_rule = process_separate_rule
diff --git a/wscript_build b/wscript_build
index e3cacbf..eeefeb3 100644
--- a/wscript_build
+++ b/wscript_build
@@ -111,8 +111,19 @@ bld.RECURSE('libcli/samsync')
bld.RECURSE('libcli/registry')
bld.RECURSE('source4/lib/policy')
bld.RECURSE('libcli/named_pipe_auth')
-if not bld.CONFIG_SET(USING_SYSTEM_KRB5):
-bld.RECURSE('source4/heimdal_build')
+
+if bld.CONFIG_SET(USING_SYSTEM_KRB5):
+if bld.CONFIG_SET(HEIMDAL_KRB5_CONFIG) and bld.CONFIG_SET(KRB5_CONFIG):
+if bld.CONFIG_GET(HEIMDAL_KRB5_CONFIG) !=
bld.CONFIG_GET(KRB5_CONFIG):
+# When both HEIMDAL_KRB5_CONFIG and KRB5_CONFIG are set and not
equal,
+# it means one is Heimdal-specific (krb5-config.heimdal, for
example)
+# and there is system heimdal
+bld.process_separate_rule('system_heimdal
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f9ec6ff s4-auth: Make sure ldb context is initialized even if not passed by Python code from 55cbf7b rely on sys/inotify.h for inotify http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f9ec6ff0733d0f068338b16d2589cd3debf8f087 Author: Alexander Bokovoy a...@samba.org Date: Fri Apr 13 23:44:52 2012 +0300 s4-auth: Make sure ldb context is initialized even if not passed by Python code Autobuild-User: Alexander Bokovoy a...@samba.org Autobuild-Date: Sat Apr 14 00:21:00 CEST 2012 on sn-devel-104 --- Summary of changes: source4/auth/pyauth.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/auth/pyauth.c b/source4/auth/pyauth.c index f448a44..f07fa78 100644 --- a/source4/auth/pyauth.c +++ b/source4/auth/pyauth.c @@ -223,7 +223,7 @@ static PyObject *py_auth_context_new(PyTypeObject *type, PyObject *args, PyObjec struct imessaging_context *imessaging_context = NULL; struct loadparm_context *lp_ctx; struct tevent_context *ev; - struct ldb_context *ldb; + struct ldb_context *ldb = NULL; NTSTATUS nt_status; const char **methods; -- Samba Shared Repository
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 7104439... Add link to Russian translation of Samba 3 by Example. I'm working with the translator to get it to DocBook and contributed back to the Samba.org from 0a8155f... reorder list http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 7104439b15ef91224352fb2dafa69db252659a82 Author: Alexander Bokovoy a...@samba.org Date: Tue Aug 17 05:48:10 2010 +0300 Add link to Russian translation of Samba 3 by Example. I'm working with the translator to get it to DocBook and contributed back to the Samba.org --- Summary of changes: docs/index.html |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/docs/index.html b/docs/index.html index bcc152c..046347e 100755 --- a/docs/index.html +++ b/docs/index.html @@ -60,6 +60,7 @@ earlier version of Samba then you may find some differences./p lia href=http://www.samba.gr.jp/project/translation/Samba3-HOWTO/ Samba HOWTO Collection in Japanese/a/li lia href=http://smb-conf.ru/;Samba 3 smb.conf man page in Russian/a/li + lia href=http://samba-doc.ru/samba3example/index.html;Samba 3 by Example in Russian (translation in progress)/a/li /ul h3Contributing/h3 -- Samba Website Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-905-g8eac189
The branch, master has been updated via 8eac1896299d820fec0fd92b2b8b6a058ae39642 (commit) via 217e3086c74eb0b46fab512b5887d9a5a5b7ee9a (commit) from d296c774c5981baa863c697782dba1b6280d632e (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8eac1896299d820fec0fd92b2b8b6a058ae39642 Merge: 217e3086c74eb0b46fab512b5887d9a5a5b7ee9a d296c774c5981baa863c697782dba1b6280d632e Author: Alexander Bokovoy a...@samba.org Date: Sat Aug 8 08:07:24 2009 +0300 Merge branch 'master' of ssh://git.samba.org/data/git/samba commit 217e3086c74eb0b46fab512b5887d9a5a5b7ee9a Author: Alexander Bokovoy a...@samba.org Date: Sat Aug 8 08:02:52 2009 +0300 Pass absolute file paths to Inkscape when transforming .svg files Some recent versions of Inkscape (0.47 or around) have bug when export file name is treated as relative against the directory of original .svg if it wasn't specified as an absolute path. Fix it by always using absolute paths during conversion. --- Summary of changes: docs-xml/Makefile |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/Makefile b/docs-xml/Makefile index 717d067..40a6c7b 100644 --- a/docs-xml/Makefile +++ b/docs-xml/Makefile @@ -153,10 +153,10 @@ $(PSDIR)/%.ps: %/index.xml $(PSDIR) xslt/latex.xsl %-images-eps $(DBLATEX) $(DBLATEX_OPTIONS) -I $*/images -t ps -o $@ $ %.eps: %.svg - $(INKSCAPE) -z -f $ --export-eps=$@ + $(INKSCAPE) -z -f $(abspath $) --export-eps=$(abspath $@) %.png: %.svg - $(INKSCAPE) -z -f $ --export-png=$@ + $(INKSCAPE) -z -f $(abspath $) --export-png=$(abspath $@) %.eps: %.png $(PNGTOPNM) $ | $(PNMTOPS) $@ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-760-g20d93b5
The branch, master has been updated
via 20d93b5b604da8a81d6435983fe2e3c33673b06c (commit)
from 4f147388c0512fc291cc53764c017d7117154afc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 20d93b5b604da8a81d6435983fe2e3c33673b06c
Author: Alexander Bokovoy a...@samba.org
Date: Sun Aug 2 17:42:49 2009 +0300
Fix breakage for connect function after API change (connect - connect_fn)
---
Summary of changes:
source3/modules/vfs_prealloc.c |2 +-
source3/modules/vfs_tsmsm.c|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_prealloc.c b/source3/modules/vfs_prealloc.c
index 4e6e5d9..c6333be 100644
--- a/source3/modules/vfs_prealloc.c
+++ b/source3/modules/vfs_prealloc.c
@@ -209,7 +209,7 @@ static int prealloc_ftruncate(vfs_handle_struct * handle,
static struct vfs_fn_pointers prealloc_fns = {
.open = prealloc_open,
.ftruncate = prealloc_ftruncate,
- .connect = prealloc_connect,
+ .connect_fn = prealloc_connect,
};
NTSTATUS vfs_prealloc_init(void);
diff --git a/source3/modules/vfs_tsmsm.c b/source3/modules/vfs_tsmsm.c
index e8ae7a2..19dc79b 100644
--- a/source3/modules/vfs_tsmsm.c
+++ b/source3/modules/vfs_tsmsm.c
@@ -363,7 +363,7 @@ static uint32_t tsmsm_fs_capabilities(struct
vfs_handle_struct *handle)
}
static struct vfs_fn_pointers tsmsm_fns = {
- .connect = tsmsm_connect,
+ .connect_fn = tsmsm_connect,
.fs_capabilities = tsmsm_fs_capabilities,
.aio_force = tsmsm_aio_force,
.aio_return = tsmsm_aio_return,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2755-g04cce8c
The branch, v3-2-test has been updated via 04cce8c620108ba00921bd1630a8692abdc2e0dc (commit) from b83beeda44e1c8d485c2ad6bb8ee539cdcbe8bda (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 04cce8c620108ba00921bd1630a8692abdc2e0dc Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Sun Jul 20 10:36:05 2008 +0400 Fix link to Using Samba --- Summary of changes: docs-xml/htmldocs.html |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html index 9657691..d2be5ef 100644 --- a/docs-xml/htmldocs.html +++ b/docs-xml/htmldocs.html @@ -23,7 +23,7 @@ td valign=topThis book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework./td /tr tr - td valign=topa href=using_samba/toc.htmlUsing Samba/a, 2nd Edition/td + td valign=topa href=../using_samba/toc.htmlUsing Samba/a, 2nd Edition/td td valign=topiUsing Samba/i, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients./td /tr tr -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-29-93-gc0cbac2
The branch, v3-0-test has been updated via c0cbac2d584833fd1a34127333d9c8a6f2464929 (commit) from 4a8ba39d0dc7f487090a112e5a60294e28a3962c (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log - commit c0cbac2d584833fd1a34127333d9c8a6f2464929 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Sun Jul 20 00:11:50 2008 +0400 Fix link for Using Samba --- Summary of changes: docs-xml/htmldocs.html |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html index 9657691..d2be5ef 100644 --- a/docs-xml/htmldocs.html +++ b/docs-xml/htmldocs.html @@ -23,7 +23,7 @@ td valign=topThis book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework./td /tr tr - td valign=topa href=using_samba/toc.htmlUsing Samba/a, 2nd Edition/td + td valign=topa href=../using_samba/toc.htmlUsing Samba/a, 2nd Edition/td td valign=topiUsing Samba/i, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients./td /tr tr -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3343-g2810dc9
The branch, v3-3-test has been updated via 2810dc9e40a0729bc1769c00b51ef24fb5e4ea90 (commit) from 03f7af26f255476d84a375a95fbccfce24db9de8 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 2810dc9e40a0729bc1769c00b51ef24fb5e4ea90 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Sun Jul 20 00:11:50 2008 +0400 Fix link for Using Samba --- Summary of changes: docs-xml/htmldocs.html |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html index 9657691..d2be5ef 100644 --- a/docs-xml/htmldocs.html +++ b/docs-xml/htmldocs.html @@ -23,7 +23,7 @@ td valign=topThis book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework./td /tr tr - td valign=topa href=using_samba/toc.htmlUsing Samba/a, 2nd Edition/td + td valign=topa href=../using_samba/toc.htmlUsing Samba/a, 2nd Edition/td td valign=topiUsing Samba/i, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients./td /tr tr -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-29-19-g2cbe492
The branch, v3-0-test has been updated via 2cbe492aac2103bacd6554a0759d76153cf27235 (commit) from 92d067497c60c5eab43bae11e6c1236e6cf760bb (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log - commit 2cbe492aac2103bacd6554a0759d76153cf27235 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Sat May 31 11:07:44 2008 +0400 Fix use of smbconfoption in samba.entities. During documentation migration to git my fixes to samba.entities got lost. Update them now from latest working version (from samba-web). --- Summary of changes: docs-xml/build/DTD/samba.entities | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities index 2e924d4..e34fbda 100644 --- a/docs-xml/build/DTD/samba.entities +++ b/docs-xml/build/DTD/samba.entities @@ -180,7 +180,7 @@ use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic./para paraNote that specifying this parameter here will -override the smbconfoptionnamelog level/name/smbconfoption parameter +override the smbconfoption name=log level / parameter in the smb.conf; file./para /listitem /varlistentry' @@ -207,7 +207,7 @@ use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic./para paraNote that specifying this parameter here will -override the smbconfoptionnamelog level/name/smbconfoption parameter +override the smbconfoption name=log level / parameter in the smb.conf; file./para /listitem /varlistentry' @@ -297,11 +297,11 @@ being on a locally connected subnet. paraIf this parameter is not set then the name resolve order defined in the smb.conf; file parameter -(smbconfoptionnamename resolve order/name/smbconfoption) will be used. +(smbconfoption name=name resolve order /) will be used. /para paraThe default order is lmhosts, host, wins, bcast. Without -this parameter or any entry in the smbconfoptionnamename resolve order/name/smbconfoption parameter of the smb.conf; file, the name +this parameter or any entry in the smbconfoption name=name resolve order / parameter of the smb.conf; file, the name resolution methods will be attempted in this order. /para/listitem /varlistentry' @@ -310,7 +310,7 @@ resolution methods will be attempted in this order. /para/listitem term-n lt;primary NetBIOS namegt;/term listitemparaThis option allows you to override the NetBIOS name that Samba uses for itself. This is identical -to setting the smbconfoptionnamenetbios name/name/smbconfoption parameter in the smb.conf; file. +to setting the smbconfoption name=netbios name/ parameter in the smb.conf; file. However, a command line setting will take precedence over settings in smb.conf;./para/listitem -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-29-12-g8f076ca
The branch, v3-0-test has been updated via 8f076ca8538df1fe7bba1e3c5497076141849e8c (commit) from 749178f44ea9a065120478ff1df44a932e45ec37 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log - commit 8f076ca8538df1fe7bba1e3c5497076141849e8c Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Thu May 29 13:13:59 2008 +0400 Fix documentation networkless build. We did override build/catalog.xml but didn't define BUILDDIR for it --- Summary of changes: docs-xml/configure.ac |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac index c0d6686..bc795ab 100644 --- a/docs-xml/configure.ac +++ b/docs-xml/configure.ac @@ -14,6 +14,9 @@ DOC_BUILD_DATE=`date '+%d-%m-%Y'` AC_SUBST(DOC_BUILD_DATE) AC_SUBST(SAMBASOURCEDIR) +BUILDDIR=$(pwd) +AC_SUBST(BUILDDIR) + DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL) DOCS_TARGET_REQUIRE_PROGRAM(RM, rm, ALL) dnl DOCS_TARGET_REQUIRE_PROGRAM(DIA, dia, LATEX) -- Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2199-gcc23f91
Jeremy,
Jeremy Allison wrote:
@@ -67,6 +68,13 @@
#define CONST_DISCARD(type, ptr) ((type) ((void *) (ptr)))
+#ifndef SAFE_FREE
+#define SAFE_FREE(x) do { if ((x) != NULL) {free(x); x=NULL;} } while(0)
+#endif
+
+#define MOUNT_PASSWD_SIZE 64
+#define DOMAIN_SIZE 64
+
const char *thisprogram;
int verboseflag = 0;
static int got_password = 0;
@@ -152,10 +160,7 @@ static void mount_cifs_usage(void)
printf(\nTo display the version number of the mount helper:);
printf(\n\t%s -V\n,thisprogram);
- if(mountpassword) {
- memset(mountpassword,0,64);
- free(mountpassword);
- }
+ SAFE_FREE(mountpassword);
Here we have non-equal behavior. Previously, the mountpassword content
was zeroed before freeing it due to security reasons. As
mount_cifs_usage() could be called multiple times (its call is in the
getopt_long()'s loop) and, particulary, after password has been filled
in, mountpassword's memory could still keep the password. Thus, memset()
is still needed.
@@ -289,10 +285,7 @@ static int open_cred_file(char * file_name)
}
fclose(fs);
- if(line_buf) {
- memset(line_buf,0,4096);
- free(line_buf);
- }
+ SAFE_FREE(line_buf);
Same here.
return 0;
}
@@ -303,9 +296,9 @@ static int get_password_from_file(int file_descript, char * filename)
char c;
if(mountpassword == NULL)
- mountpassword = (char *)calloc(65,1);
+ mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
There is still one place where (char *)calloc(65,1); is left after this
commit: line 1197 (see below).
@@ -1116,9 +1109,6 @@ int main(int argc, char ** argv)
MOUNT_CIFS_VERSION_MAJOR,
MOUNT_CIFS_VERSION_MINOR,
MOUNT_CIFS_VENDOR_SUFFIX);
- if(mountpassword) {
- memset(mountpassword,0,64);
- }
Again, mountpassword could be already filled in after some loops with
the getopt_long().
@@ -1206,7 +1196,7 @@ int main(int argc, char ** argv)
if(mountpassword == NULL)
mountpassword = (char *)calloc(65,1);
if(mountpassword) {
- strncpy(mountpassword,getenv(PASSWD),64);
+
strlcpy(mountpassword,getenv(PASSWD),MOUNT_PASSWD_SIZE);
got_password = 1;
}
} else if (getenv(PASSWD_FD)) {
Here it is: calloc(65,1) isn't replaced by calloc(MOUNT_PASSWD_SIZE+1,1).
--
/ Alexander Bokovoy
Samba Team http://www.samba.org/
ALT Linux Team http://www.altlinux.org/
Midgard Project Ry http://www.midgard-project.org/
Re: [SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2202-ga132cc3
Karolin, Alexander Bokovoy wrote: The branch, v3-2-test has been updated via a132cc3c6243c049860378f56c4d415d6cb35570 (commit) via e700cf9ef4aefcb04d500136d117ff13a51e6433 (commit) via 056935ff1f5fefc3ca42f7006182fc80c94d91ab (commit) from cc23f91d639db61903bf8b6c9fa46ec9c1f44178 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test These commits fix documentation build. It is needed for the release otherwise smb.conf(5) manpage will be broken. -- / Alexander Bokovoy Samba Team http://www.samba.org/ ALT Linux Team http://www.altlinux.org/ Midgard Project Ry http://www.midgard-project.org/
Re: [SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2199-gcc23f91
2008/4/25, Jeremy Allison [EMAIL PROTECTED]: On Fri, Apr 25, 2008 at 11:36:40AM +0400, Alexander Bokovoy wrote: Here we have non-equal behavior. Previously, the mountpassword content was zeroed before freeing it due to security reasons. As Ah. Looking more carefully I am right and you are wrong. There is no security benefit in zeroing out the password here. It's before a free, so just free it. You right, no more voodoo. :-) -- / Alexander Bokovoy
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2202-ga132cc3
The branch, v3-2-test has been updated
via a132cc3c6243c049860378f56c4d415d6cb35570 (commit)
via e700cf9ef4aefcb04d500136d117ff13a51e6433 (commit)
via 056935ff1f5fefc3ca42f7006182fc80c94d91ab (commit)
from cc23f91d639db61903bf8b6c9fa46ec9c1f44178 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit a132cc3c6243c049860378f56c4d415d6cb35570
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Thu Apr 24 23:46:01 2008 +0400
Fix yet another set of documentation links
Signed-off-by: Alexander Bokovoy [EMAIL PROTECTED]
commit e700cf9ef4aefcb04d500136d117ff13a51e6433
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Thu Apr 24 23:41:35 2008 +0400
Ignore intermediary documentation files in git
Signed-off-by: Alexander Bokovoy [EMAIL PROTECTED]
commit 056935ff1f5fefc3ca42f7006182fc80c94d91ab
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Thu Apr 24 23:40:51 2008 +0400
Fix documentation build: manpages, links in the HTML documents.
Fixed manpages generation to properly create handle smb.conf parameters'
titles
Changed HTML generator to include links for every smb.conf parameter.
Now we have correct linking between different HTML documents.
Signed-off-by: Alexander Bokovoy [EMAIL PROTECTED]
---
Summary of changes:
docs-xml/{.bzrignore = .gitignore} |0
docs-xml/Makefile |6 +-
docs-xml/configure.ac |2 +-
docs-xml/htmldocs.html|2 +-
docs-xml/manpages-3/ntlm_auth.1.xml |3 +-
docs-xml/manpages-3/winbindd.8.xml|7 +--
docs-xml/smbdotconf/generate-file-list.sh |4 +-
docs-xml/xslt/expand-sambadoc.xsl | 13 --
docs-xml/xslt/expand-smbconfdoc.xsl | 63 ++--
docs-xml/xslt/html-common.xsl |2 +-
docs-xml/xslt/man.xsl |2 +
11 files changed, 61 insertions(+), 43 deletions(-)
rename docs-xml/{.bzrignore = .gitignore} (100%)
Changeset truncated at 500 lines:
diff --git a/docs-xml/.bzrignore b/docs-xml/.gitignore
similarity index 100%
rename from docs-xml/.bzrignore
rename to docs-xml/.gitignore
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 1e41210..0f401d6 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -59,7 +59,7 @@ clean:
rm -f $(patsubst %.svg,%.png,$(foreach
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
$(patsubst %.svg,%.pdf,$(foreach
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
$(patsubst %.svg,%.eps,$(foreach
DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
- rm -f *.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
+ rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx
*.aux
rm -f *-images-html*
rm -f *-images-latex-* latexfigures
rm -f xslt/figures/*pdf
@@ -92,11 +92,11 @@ validate: $(addsuffix -validate,$(MAIN_DOCS))
$(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl
@echo Converting Samba-specific tags for $*...
@mkdir -p $(@D)
- $(XSLTPROC) --stringparam latex.imagebasedir $*/ --stringparam
noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $
+ $(XSLTPROC) --stringparam latex.imagebasedir $*/ --stringparam
noreference 0 --xinclude --output $@ xslt/expand-sambadoc.xsl $
$(DOCBOOKDIR)/manpages-3/%.xml: $(MANPAGEDIR3)/%.xml xslt/expand-sambadoc.xsl
@mkdir -p $(@D)
- $(XSLTPROC) --xinclude --stringparam noreference 1 --output $@
xslt/expand-sambadoc.xsl $
+ $(XSLTPROC) --xinclude --stringparam noreference 0 --output $@
xslt/expand-sambadoc.xsl $
$(DOCBOOKDIR)/manpages-3/index.xml: $(MANPAGES3) xslt/manpage-summary.xsl
@mkdir -p $(@D)
diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac
index 97c2b22..c0d6686 100644
--- a/docs-xml/configure.ac
+++ b/docs-xml/configure.ac
@@ -94,4 +94,4 @@ fi
AC_SUBST(TARGETS)
-AC_OUTPUT( Makefile.settings)
+AC_OUTPUT( Makefile.settings build/catalog.xml)
diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html
index e22808c..9657691 100644
--- a/docs-xml/htmldocs.html
+++ b/docs-xml/htmldocs.html
@@ -27,7 +27,7 @@
td valign=topiUsing Samba/i, Second Edition is a comprehensive guide
to Samba administration. It covers all versions of Samba from 2.0 to 2.2,
including selected features from an alpha version of 3.0, as well as the SWAT
graphical configuration tool. Updated for Windows 2000, ME, and XP, the book
also explores Samba's new role as a primary domain controller and domain member
server, its support for the use of Windows NT/2000/XP authentication and
filesystem security on the host Unix system, and accessing shared files and
printers from Unix clients./td
/tr
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-1145-g1b707cf
The branch, v3-0-test has been updated via 1b707cfd762fdb622080921695f313f59ad817dd (commit) from 50a64e7e87856c3dbd6211f702dbb2526b002554 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log - commit 1b707cfd762fdb622080921695f313f59ad817dd Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Thu Apr 24 23:58:42 2008 +0400 Fix documentation build for v3-0-test after grafting docs-xml. Changes are the same as for v3-2-test --- Summary of changes: docs-xml/Makefile |4 +- docs-xml/htmldocs.html|2 +- docs-xml/manpages-3/ntlm_auth.1.xml |3 +- docs-xml/manpages-3/winbindd.8.xml|7 +-- docs-xml/smbdotconf/generate-file-list.sh |4 +- docs-xml/xslt/expand-sambadoc.xsl | 13 -- docs-xml/xslt/expand-smbconfdoc.xsl | 63 ++-- docs-xml/xslt/html-common.xsl |2 +- docs-xml/xslt/man.xsl |2 + 9 files changed, 59 insertions(+), 41 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/Makefile b/docs-xml/Makefile index 1e41210..5bdde51 100644 --- a/docs-xml/Makefile +++ b/docs-xml/Makefile @@ -92,11 +92,11 @@ validate: $(addsuffix -validate,$(MAIN_DOCS)) $(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl @echo Converting Samba-specific tags for $*... @mkdir -p $(@D) - $(XSLTPROC) --stringparam latex.imagebasedir $*/ --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $ + $(XSLTPROC) --stringparam latex.imagebasedir $*/ --stringparam noreference 0 --xinclude --output $@ xslt/expand-sambadoc.xsl $ $(DOCBOOKDIR)/manpages-3/%.xml: $(MANPAGEDIR3)/%.xml xslt/expand-sambadoc.xsl @mkdir -p $(@D) - $(XSLTPROC) --xinclude --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $ + $(XSLTPROC) --xinclude --stringparam noreference 0 --output $@ xslt/expand-sambadoc.xsl $ $(DOCBOOKDIR)/manpages-3/index.xml: $(MANPAGES3) xslt/manpage-summary.xsl @mkdir -p $(@D) diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html index e22808c..9657691 100644 --- a/docs-xml/htmldocs.html +++ b/docs-xml/htmldocs.html @@ -27,7 +27,7 @@ td valign=topiUsing Samba/i, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients./td /tr tr - td valign=topa href=manpages/index.htmlMan pages/a/td + td valign=topa href=manpages-3/index.htmlMan pages/a/td td valign=topThe Samba man pages in HTML./td /tr tr diff --git a/docs-xml/manpages-3/ntlm_auth.1.xml b/docs-xml/manpages-3/ntlm_auth.1.xml index d1301fc..7d529ab 100644 --- a/docs-xml/manpages-3/ntlm_auth.1.xml +++ b/docs-xml/manpages-3/ntlm_auth.1.xml @@ -183,8 +183,7 @@ varlistentry termFull-Username/term listitemparaThe fully qualified username, expected to be in -Samba's smbconfoptionnameunix -charset/name/smbconfoption and qualified with the +Samba's smbconfoption name=unix charset/ and qualified with the smbconfoption name=winbind separator/. /para diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml index 7e3948c..4af8817 100644 --- a/docs-xml/manpages-3/winbindd.8.xml +++ b/docs-xml/manpages-3/winbindd.8.xml @@ -225,9 +225,7 @@ hosts: files wins determine which user and group ids correspond to Windows NT user and group rids. /para -paraSee the smbconfoptionnameidmap -domains/name/smbconfoption or the old smbconfoptionnameidmap - backend/name/smbconfoption parameters in +paraSee the smbconfoption name=idmap domains/ or the old smbconfoption name=idmap backend/ parameters in filenamesmb.conf/filename for options for sharing this database, such as via LDAP./para /refsect1 @@ -374,8 +372,7 @@ auth required/lib/security/pam_unix.so \ paraIf more than one UNIX machine is running commandwinbindd/command, then in general the user and groups ids allocated by winbindd will not be the same. The user and group ids will only be valid for the local - machine, unless a shared smbconfoptionnameidmap - backend/name/smbconfoption is configured./para + machine, unless a shared
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-1033-g2c3ffc1
The branch, v3-2-test has been updated via 2c3ffc1c53550c8e6feeca8fc0270ef9ac1ec70a (commit) via 8246ffc66e6425809cfb8ca48bb31710dcddbd26 (commit) from 14294535512a7f191c5008e622b6708e417854ae (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 2c3ffc1c53550c8e6feeca8fc0270ef9ac1ec70a Merge: 8246ffc66e6425809cfb8ca48bb31710dcddbd26 14294535512a7f191c5008e622b6708e417854ae Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Mon Apr 21 11:38:20 2008 +0400 Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test commit 8246ffc66e6425809cfb8ca48bb31710dcddbd26 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Mon Apr 21 11:37:25 2008 +0400 Ignore Emacs' semantic.cache --- Summary of changes: .gitignore |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/.gitignore b/.gitignore index e210315..d924a3f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.o *.po *~ +semantic.cache source/TAGS source/client/client_proto.h source/libnet/libnet_proto.h -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-892-g4abdbad
The branch, v3-2-test has been updated
via 4abdbad52e456764bca1b17ead04edee1e2a2a64 (commit)
from 78afb30f8073c3804dfa0cecadf973d5af5dd612 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 4abdbad52e456764bca1b17ead04edee1e2a2a64
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Mon Apr 14 13:56:36 2008 +0400
Use more error-prone form of testing dm_destroy_session() return code after
discussing with Tridge
---
Summary of changes:
source/smbd/dmapi.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/dmapi.c b/source/smbd/dmapi.c
index fd252e9..1049c95 100644
--- a/source/smbd/dmapi.c
+++ b/source/smbd/dmapi.c
@@ -223,7 +223,7 @@ bool dmapi_destroy_session(void)
{
if (samba_dmapi_session != DM_NO_SESSION) {
become_root();
- if (!dm_destroy_session(samba_dmapi_session)) {
+ if (0 == dm_destroy_session(samba_dmapi_session)) {
session_num--;
samba_dmapi_session = DM_NO_SESSION;
} else {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-687-ga0cefd4
The branch, v3-2-test has been updated
via a0cefd44009d414fa00ec6e08c70d21b74acdbcb (commit)
via 1faa97d5cc51277abbc6cb5c37d31c429bea04e4 (commit)
from 09852899cadc48abe2f2651ecbceaf881198e648 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit a0cefd44009d414fa00ec6e08c70d21b74acdbcb
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Tue Apr 8 15:19:01 2008 +0400
Destroy DMAPI session when main smbd daemon exits.
DMAPI session is precious resource maintained at kernel level. We open one
of them and use across multiple smbd daemons
but once last of them exits, DMAPI session needs to be destroyed. There are
some HSM implementations which fail to
shutdown when opened DMAPI sessions left. Ensure we shutdown our session
when it is really not needed anymore.
This is what recommended by DMAPI specification anyway.
commit 1faa97d5cc51277abbc6cb5c37d31c429bea04e4
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Tue Apr 8 15:17:53 2008 +0400
Allow broader range of HSM systems in vfs_tsmsm
Allow to specify value of DMAPI attribute returned during offline file
checks, 'tsmsm: dmapi value'.
Previously tsmsm module has supported only IBM TSM SM engine which
reports file state by *existence*
of a certain DMAPI attribute. Other HSM systems report a certain value
as DMAPI request's result.
Port from Tridge's v3-0-ctdb git tree.
---
Summary of changes:
source/modules/vfs_tsmsm.c | 36 +++-
source/smbd/dmapi.c| 24
source/smbd/server.c |9 +
3 files changed, 64 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/modules/vfs_tsmsm.c b/source/modules/vfs_tsmsm.c
index aa0f945..7dc8b38 100644
--- a/source/modules/vfs_tsmsm.c
+++ b/source/modules/vfs_tsmsm.c
@@ -72,6 +72,7 @@ struct tsmsm_struct {
float online_ratio;
char *hsmscript;
const char *attrib_name;
+ const char *attrib_value;
};
static void tsmsm_free_data(void **pptr) {
@@ -111,7 +112,11 @@ static int tsmsm_connect(struct vfs_handle_struct *handle,
tsmd-attrib_name = lp_parm_talloc_string(SNUM(handle-conn), tsmname,
dmapi attribute,
DM_ATTRIB_OBJECT);
talloc_steal(tsmd, tsmd-attrib_name);
-
+
+ tsmd-attrib_value = lp_parm_talloc_string(SNUM(handle-conn), tsmsm,
+ dmapi value, NULL);
+ talloc_steal(tsmd, tsmd-attrib_value);
+
/* retrieve 'online ratio'. In case of error default to
FILE_IS_ONLINE_RATIO */
fres = lp_parm_const_string(SNUM(handle-conn), tsmname,
online ratio, NULL);
@@ -143,7 +148,8 @@ static bool tsmsm_is_offline(struct vfs_handle_struct
*handle,
dm_attrname_t dmname;
int ret, lerrno;
bool offline;
- char buf[1];
+ char *buf;
+ int buflen;
/* if the file has more than FILE_IS_ONLINE_RATIO of blocks available,
then assume it is not offline (it may not be 100%, as it could be
sparse) */
@@ -181,11 +187,24 @@ static bool tsmsm_is_offline(struct vfs_handle_struct
*handle,
memset(dmname, 0, sizeof(dmname));
strlcpy((char *)dmname.an_chars[0], tsmd-attrib_name,
sizeof(dmname.an_chars));
+ if (tsmd-attrib_value != NULL) {
+ buflen = strlen(tsmd-attrib_value);
+ } else {
+ buflen = 1;
+ }
+ buf = talloc_zero_size(tsmd, buflen);
+ if (buf == NULL) {
+ DEBUG(0,(out of memory in tsmsm_is_offline -- assuming online
(%s)\n, path));
+ errno = ENOMEM;
+ offline = false;
+ goto done;
+ }
+
lerrno = 0;
do {
ret = dm_get_dmattr(*dmsession_id, dmhandle, dmhandle_len,
- DM_NO_TOKEN, dmname, sizeof(buf), buf,
rlen);
+ DM_NO_TOKEN, dmname, buflen, buf, rlen);
if (ret == -1 errno == EINVAL) {
DEBUG(0, (Stale DMAPI session, re-creating it.\n));
lerrno = EINVAL;
@@ -202,8 +221,14 @@ static bool tsmsm_is_offline(struct vfs_handle_struct
*handle,
}
} while (ret == -1 lerrno == EINVAL);
- /* its offline if the specified DMAPI attribute exists */
- offline = (ret == 0 || (ret == -1 errno == E2BIG));
+ /* check if we need a specific attribute value */
+ if (tsmd-attrib_value != NULL) {
+ offline = (ret == 0 rlen == buflen
+ memcmp(buf, tsmd-attrib_value, buflen) == 0);
+ } else
Re: [SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-334-g4cc09ec
On Thu, Mar 20, 2008 at 6:59 PM, Volker Lendecke [EMAIL PROTECTED] wrote:
commit df574fd2ee58f008b93b06f4d78c85cb909cc92c
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Thu Mar 20 12:49:13 2008 +0100
Fix some warnings in the tsmsm module
Alexander, please check!
---
Summary of changes:
source/modules/vfs_tsmsm.c| 10 --
source/rpc_server/srv_srvsvc_nt.c |1 +
source/smbd/server.c | 60
+++--
3 files changed, 64 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/modules/vfs_tsmsm.c b/source/modules/vfs_tsmsm.c
index 791e8cf..aa0f945 100644
--- a/source/modules/vfs_tsmsm.c
+++ b/source/modules/vfs_tsmsm.c
@@ -148,8 +148,9 @@ static bool tsmsm_is_offline(struct vfs_handle_struct
*handle,
/* if the file has more than FILE_IS_ONLINE_RATIO of blocks
available,
then assume it is not offline (it may not be 100%, as it could be
sparse) */
if (512 * (off_t)stbuf-st_blocks = stbuf-st_size *
tsmd-online_ratio) {
- DEBUG(10,(%s not offline: st_blocks=%ld st_size=%ld
online_ratio=%.2f\n,
- path, stbuf-st_blocks, stbuf-st_size,
tsmd-online_ratio));
+ DEBUG(10,(%s not offline: st_blocks=%ld st_size=%ld
+ online_ratio=%.2f\n, path,
(long)stbuf-st_blocks,
+ (long)stbuf-st_size, tsmd-online_ratio));
return false;
}
@@ -226,8 +227,9 @@ static bool tsmsm_aio_force(struct vfs_handle_struct
*handle, struct files_struc
if the file might be offline
*/
if(SMB_VFS_FSTAT(fsp, sbuf) == 0) {
- DEBUG(10,(tsmsm_aio_force st_blocks=%ld st_size=%ld
online_ratio=%.2f\n,
- sbuf.st_blocks, sbuf.st_size, tsmd-online_ratio));
+ DEBUG(10,(tsmsm_aio_force st_blocks=%ld st_size=%ld
+ online_ratio=%.2f\n, (long)sbuf.st_blocks,
+ (long)sbuf.st_size, tsmd-online_ratio));
return !(512 * (off_t)sbuf.st_blocks = sbuf.st_size *
tsmd-online_ratio);
}
return false;
These two look OK except that at least in Linux stat/stat64 defines
st_blocks as 'unsigned long'/'unsigned long long' correspondingly.
This is certainly problematic as to recognize both cases we would need
to change formatting symbol too. SUSv2 doesn't know %llu, only %lu,
but our snprintf() replacement knows %ll.
--
/ Alexander Bokovoy
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1938-g7da6c67
The branch, v3-2-test has been updated via 7da6c675440b0253ab37ee6097f769a2e45c7b7b (commit) via 9827d5ff416479408b19a8964c2321ea2517aa74 (commit) via f59d3786abcc53065c838a2fa82ec2f4b577b16f (commit) via 974cf508fb5ba2ba3bd8fe7ae79710c9396d1d06 (commit) via d46fc35dd4e22ecd777800a8cdb6c31763d0fac4 (commit) via d841a3fc999c5ebd9e9d54b2bd5099b1b50402b1 (commit) via 863b5ed07aca0978aeaf919d7c51204a95ce03e0 (commit) via 8afb7133e956ec963ac55720fb297b4d5b44702c (commit) via 5efb57d904e25e68b09a567e260292439ad9c095 (commit) via 58dce4cdf277c8c68865185d9d8b4faea996dd3e (commit) via 42d06d41bf2e9fb094f6064dc04f549d880b5f8d (commit) via cf1f90ad7a79dbe5926018790bb50d4e3b36cc7b (commit) from 7b15c75a6bacf783eb73568ed003e4b16d6ebd68 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 7da6c675440b0253ab37ee6097f769a2e45c7b7b Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Wed Feb 6 09:10:50 2008 +0300 Change the file time before we change the file mode. This doesn't matter for most applications, but for offline files it matters as it allows you to set files offline from windows clients even with HSM systems that refuse to offline newly created files. Merge from Tridge's v3-0-ctdb tree. commit 9827d5ff416479408b19a8964c2321ea2517aa74 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Wed Feb 6 09:09:23 2008 +0300 Allow actual call to set file offline Dos mode calculation was masking out FILE_ATTRIBUTE_OFFLINE so that code to set file offline was never called before. Merge from Tridge's v3-0-ctdb git tree. commit f59d3786abcc53065c838a2fa82ec2f4b577b16f Merge: 974cf508fb5ba2ba3bd8fe7ae79710c9396d1d06 7b15c75a6bacf783eb73568ed003e4b16d6ebd68 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Wed Feb 6 08:58:20 2008 +0300 Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration commit 974cf508fb5ba2ba3bd8fe7ae79710c9396d1d06 Merge: d46fc35dd4e22ecd777800a8cdb6c31763d0fac4 7d369906ec37caebaa4e2097874997fa257f1a31 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Thu Jan 31 16:44:57 2008 +0300 Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration commit d46fc35dd4e22ecd777800a8cdb6c31763d0fac4 Merge: d841a3fc999c5ebd9e9d54b2bd5099b1b50402b1 cb0fad1c97e1b590791fc0661f8ada1cdaa69318 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Thu Jan 31 16:08:57 2008 +0300 Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration commit d841a3fc999c5ebd9e9d54b2bd5099b1b50402b1 Merge: 863b5ed07aca0978aeaf919d7c51204a95ce03e0 6bbe0fde6ebb5c1ea00ea24d3bdbffbf6f246bd6 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Wed Jan 30 12:00:15 2008 +0300 Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration commit 863b5ed07aca0978aeaf919d7c51204a95ce03e0 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Tue Jan 29 18:33:22 2008 +0300 Fix typos and replace statvfs call with fs_capabilities() commit 8afb7133e956ec963ac55720fb297b4d5b44702c Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Tue Jan 29 18:01:23 2008 +0300 Fix BOOL introduced by last commit commit 5efb57d904e25e68b09a567e260292439ad9c095 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Tue Jan 29 17:43:49 2008 +0300 Merge DMAPI fixes from Tridge Support cases when existing DMAPI session is stale. In this case we are creating another one. The code differs from 3-0_ctdb branch in that we fail when it is not possible to create more sessions and pretend that file is offline. This allows to escape endless loop in vfs_tsmsm.c. commit 58dce4cdf277c8c68865185d9d8b4faea996dd3e Merge: bc0b68709cbbdd71996a39e23fe8305e1f144f31 42d06d41bf2e9fb094f6064dc04f549d880b5f8d Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Tue Jan 29 16:19:21 2008 +0300 Merge branch 'ctdb-merge' into dmapi-integration commit 42d06d41bf2e9fb094f6064dc04f549d880b5f8d Merge: cf1f90ad7a79dbe5926018790bb50d4e3b36cc7b f1d7de462cf0f64648a3a1fc6f0c64a7bbdb3c2a Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Thu Jan 24 14:06:22 2008 +0300 Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into ctdb-merge commit cf1f90ad7a79dbe5926018790bb50d4e3b36cc7b Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Fri Jan 18 17:34:21 2008 +0300 Merge DMAPI fixes from CTDB Samba --- Summary of changes: source/modules/vfs_tsmsm.c | 128 ++- source/smbd/dmapi.c| 247 +--- source/smbd/dosmode.c | 32 -- source/smbd/reply.c| 12 +- source/smbd/server.c |6 - 5 files changed, 221 insertions
Re: Rev 692: dmapi got into a state on a test cluster where dm_get_dmattr returned in http://samba.org/~tridge/3_0-ctdb
[EMAIL PROTECTED] пишет:
revno: 692
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: s3-ctdb-tridge
timestamp: Mon 2008-01-21 23:24:50 +1100
message:
dmapi got into a state on a test cluster where dm_get_dmattr returned
-1/EINVAL but it was impossible to delete the stale session, and the
session still showed up in dm_getall_sessions(). This patch copes
with that by changing to a new session name when the error occurs.
Is this a GPFS bug?
As we have about 4000 DMAPI handles limit in GPFS what do you plan to do
with limiting DMAPI exhaustion from Samba side? Currently session_num is
growing unbound and if all sessions are used up and inaccessible like in
case above the loop below will be indefinite:
+again:
ret = dm_get_dmattr(*sessionp, dmhandle, dmhandle_len,
- DM_NO_TOKEN, dmname, 0, NULL, rlen);
+ DM_NO_TOKEN, dmname, sizeof(buf), buf, rlen);
+
+ if (ret == -1 errno == EINVAL) {
+ DEBUG(0,(Stale DMAPI session - recreating\n));
+ if (dmapi_new_session()) {
+ sessionp = dmapi_get_current_session();
+ goto again;
+ }
+ }
Wouldn't we need to do something with it in this case?
--
/ Alexander Bokovoy
Samba Team http://www.samba.org/
ALT Linux Team http://www.altlinux.org/
Midgard Project Ry http://www.midgard-project.org/
Re: [SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1530-g64e54ea
Volker Lendecke пишет: commit 197b08ad789c4968155f1c711ef43a5383a89289 Author: Volker Lendecke [EMAIL PROTECTED] Date: Sat Jan 19 16:19:08 2008 +0100 The remote storage op is gone Alexander, I think this ok... That's right, this comment was a leftover. Thanks for noticing it! -- / Alexander Bokovoy Samba Team http://www.samba.org/ ALT Linux Team http://www.altlinux.org/ Midgard Project Ry http://www.midgard-project.org/
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1454-ge342ca0
The branch, v3-2-test has been updated
via e342ca0d931f9a5c8ec9e472dc9c63f1fe012b3a (commit)
via 75cc08661473cce62756fa062071bb2bc1fb39ec (commit)
from e1f5a8f10795831d3c7902d9803c9571c8ac811a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit e342ca0d931f9a5c8ec9e472dc9c63f1fe012b3a
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Thu Jan 17 16:51:14 2008 +0300
Remove is_remotestorage() call from VFS. We already have statvfs() there to
handle FS capabilities.
As discussed with Volker, it is better to calculate FS capabilities at
connection time. We already do this with help of VFS statvfs() call
which allows to fill-in system-specific attributes including FS
capabilities. So just re-use it if you want to represent additional
capabilities in your modules. The only caution is that you need to
call underlying statvfs() call to actually get system-specific
capabilities (and other fields) added. Then add module-specific ones.
commit 75cc08661473cce62756fa062071bb2bc1fb39ec
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Thu Jan 17 14:57:35 2008 +0300
Rework of VFS is_offline() function to only return boolean offline/online
result for a file.
This makes sense as upper levels are only taking returned result of 0
(no error) into consideration when deciding whether to mark file
offline/online as returned from is_offline.
That means that we simply can move the decision down to VFS module and
clean up upper levels so that they always see only file status. If there
is an error when trying to identify file status, then VFS module could
decide what to return (offline or online) by itself -- after all, it
ought to have system-specific knowledge anyway.
---
Summary of changes:
examples/VFS/skel_opaque.c | 10 ++
examples/VFS/skel_transparent.c |5 ++---
source/include/vfs.h|6 +-
source/include/vfs_macros.h |9 +++--
source/modules/vfs_default.c| 19 ---
source/modules/vfs_tsmsm.c | 34 +++---
source/smbd/dosmode.c |5 ++---
source/smbd/trans2.c| 10 --
8 files changed, 37 insertions(+), 61 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 1c2fc45..4a6e6be 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -585,9 +585,9 @@ static bool skel_aio_force(struct vfs_handle_struct
*handle, struct files_struct
return vfswrap_aio_force(NULL, fsp);
}
-static int skel_is_offline(struct vfs_handle_struct *handle, const char *path,
SMB_STRUCT_STAT *sbuf, bool *offline)
+static bool skel_is_offline(struct vfs_handle_struct *handle, const char
*path, SMB_STRUCT_STAT *sbuf)
{
- return vfswrap_set_offline(NULL, path, sbuf, offline);
+ return vfswrap_is_offline(NULL, path, sbuf);
}
static int skel_set_offline(struct vfs_handle_struct *handle, const char *path)
@@ -595,11 +595,6 @@ static int skel_set_offline(struct vfs_handle_struct
*handle, const char *path)
return vfswrap_set_offline(NULL, path);
}
-static bool skel_is_remotestorage(struct vfs_handle_struct *handle, const char
*path)
-{
- return vfswrap_is_remotestorage(NULL, path);
-}
-
/* VFS operations structure */
static vfs_op_tuple skel_op_tuples[] = {
@@ -724,7 +719,6 @@ static vfs_op_tuple skel_op_tuples[] = {
/* offline operations */
{SMB_VFS_OP(skel_is_offline), SMB_VFS_OP_IS_OFFLINE,
SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(skel_set_offline), SMB_VFS_OP_SET_OFFLINE,
SMB_VFS_LAYER_OPAQUE},
- {SMB_VFS_OP(skel_is_remotestorage),
SMB_VFS_OP_IS_REMOTESTORAGE,SMB_VFS_LAYER_OPAQUE},
{NULL, SMB_VFS_OP_NOOP,
SMB_VFS_LAYER_NOOP}
};
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 0a93497..f4cb9b1 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -544,9 +544,9 @@ static bool skel_aio_force(struct vfs_handle_struct
*handle, struct files_struct
return SMB_VFS_NEXT_AIO_FORCE(handle, fsp);
}
-static int skel_is_offline(struct vfs_handle_struct *handle, const char *path,
SMB_STRUCT_STAT *sbuf, bool *offline)
+static bool skel_is_offline(struct vfs_handle_struct *handle, const char
*path, SMB_STRUCT_STAT *sbuf)
{
- return SMB_VFS_NEXT_IS_OFFLINE(handle, path, sbuf, offline);
+ return SMB_VFS_NEXT_IS_OFFLINE(handle, path, sbuf);
}
static int skel_set_offline(struct vfs_handle_struct *handle, const char *path)
@@ -681,7
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1398-gdc568fd
The branch, v3-2-test has been updated
via dc568fd52ae8ffaaaef2015c5a207ed9a58a9a7f (commit)
from 4ff2101c69a0cfcfdc5f775493cb6e88c57e4bbe (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit dc568fd52ae8ffaaaef2015c5a207ed9a58a9a7f
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Wed Jan 16 12:28:52 2008 +0300
Fix build for pam_smbpass
Signed-off-by: Alexander Bokovoy [EMAIL PROTECTED]
---
Summary of changes:
source/pam_smbpass/pam_smb_acct.c |2 +-
source/pam_smbpass/pam_smb_passwd.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/pam_smbpass/pam_smb_acct.c
b/source/pam_smbpass/pam_smb_acct.c
index 59ed4ee..b9bcb31 100644
--- a/source/pam_smbpass/pam_smb_acct.c
+++ b/source/pam_smbpass/pam_smb_acct.c
@@ -78,7 +78,7 @@ int pam_sm_acct_mgmt( pam_handle_t *pamh, int flags,
}
if (geteuid() != 0) {
- _log_err(pamh, LOG_DEBUG, Cannot access samba password
database, not running as root.);
+ _log_err( LOG_DEBUG, Cannot access samba password database,
not running as root.);
return PAM_AUTHINFO_UNAVAIL;
}
diff --git a/source/pam_smbpass/pam_smb_passwd.c
b/source/pam_smbpass/pam_smb_passwd.c
index de53107..326a0b5 100644
--- a/source/pam_smbpass/pam_smb_passwd.c
+++ b/source/pam_smbpass/pam_smb_passwd.c
@@ -130,7 +130,7 @@ int pam_sm_chauthtok(pam_handle_t *pamh, int flags,
}
if (geteuid() != 0) {
- _log_err(pamh, LOG_DEBUG, Cannot access samba password database, not
running as root.);
+ _log_err( LOG_DEBUG, Cannot access samba password database, not
running as root.);
return PAM_AUTHINFO_UNAVAIL;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1423-g175662b
The branch, v3-2-test has been updated via 175662b5bbb5c8ecd81a60539f5846a938c26a3a (commit) via ee851730cef1eb506b47faf57e25789ad3c6aafa (commit) via 17b2bea7093681a4c4119f9fe7104c018fd0af6f (commit) via 060587fce558bf9e83d6c7b8e070a5ae58e3f275 (commit) via 136c024c9a32ca8ca33cb36b9a6b731237179af5 (commit) via b6df7e7709365fb620867ad8954bc5bf24496775 (commit) via d7752449f38747d59c93869656a5f7c02ebdf084 (commit) via 10c2ae1efd799b44255ce82c3bb0c7c9df0ec634 (commit) via c26e355533e473c4386d0e6d651637e71d4231dc (commit) via 1daad835cbfb4615a8fe7a241f4d578f7e69f214 (commit) via 875208724e39564fe81385dfe36e6c963e79e101 (commit) via 0c8e23afbbb2d081fc23908bafcad04650bfacea (commit) from d9c8a2271d5d4ff845f1fe5986a2c63d79c41415 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 175662b5bbb5c8ecd81a60539f5846a938c26a3a Merge: d9c8a2271d5d4ff845f1fe5986a2c63d79c41415 ee851730cef1eb506b47faf57e25789ad3c6aafa Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Wed Jan 16 18:53:16 2008 +0300 Merge branch 'ctdb-merge' into v3-2-test commit ee851730cef1eb506b47faf57e25789ad3c6aafa Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Wed Jan 16 16:50:46 2008 +0300 Convert old sid-string handling in idmap_tdb2 to a new one commit 17b2bea7093681a4c4119f9fe7104c018fd0af6f Merge: 060587fce558bf9e83d6c7b8e070a5ae58e3f275 dc568fd52ae8ffaaaef2015c5a207ed9a58a9a7f Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Wed Jan 16 12:57:15 2008 +0300 Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into ctdb-merge commit 060587fce558bf9e83d6c7b8e070a5ae58e3f275 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Wed Jan 16 12:28:52 2008 +0300 Fix build for pam_smbpass Signed-off-by: Alexander Bokovoy [EMAIL PROTECTED] commit 136c024c9a32ca8ca33cb36b9a6b731237179af5 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Wed Jan 16 12:28:28 2008 +0300 Enable building of VFS modules: vfs_tsmsm, vfs_shadowcopy2 and IDMAP module idmap_tdb2 Signed-off-by: Alexander Bokovoy [EMAIL PROTECTED] commit b6df7e7709365fb620867ad8954bc5bf24496775 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Wed Jan 16 12:27:29 2008 +0300 idmap TDB2 backend, used for clustered Samba setups. This uses 2 tdb files. One is permanent, and is in shared storage on the cluster (using tdb:idmap2.tdb = in smb.conf). The other is a temporary cache tdb on local storage. Signed-off-by: Alexander Bokovoy [EMAIL PROTECTED] commit d7752449f38747d59c93869656a5f7c02ebdf084 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Wed Jan 16 12:26:35 2008 +0300 Add offline storage support with Tivoli Storage Manager Space Manager Signed-off-by: Alexander Bokovoy [EMAIL PROTECTED] commit 10c2ae1efd799b44255ce82c3bb0c7c9df0ec634 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Wed Jan 16 12:21:38 2008 +0300 Merge a variant of Shadow Copy module for exposing snapshots to windows clients as shadow copies from Samba 3.0 CTDB This is a 2nd implemetation of a shadow copy module for exposing snapshots to windows clients as shadow copies. This version has the following features: 1) you don't need to populate your shares with symlinks to the snapshots. This can be very important when you have thousands of shares, or use [homes] 2) the inode number of the files is altered so it is different from the original. This allows the 'restore' button to work without a sharing violation Signed-off-by: Alexander Bokovoy [EMAIL PROTECTED] commit c26e355533e473c4386d0e6d651637e71d4231dc Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Wed Jan 16 12:19:51 2008 +0300 Support GPFS prealloc interface Signed-off-by: Alexander Bokovoy [EMAIL PROTECTED] commit 1daad835cbfb4615a8fe7a241f4d578f7e69f214 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Wed Jan 16 12:18:57 2008 +0300 Merge latest fixes to vfs_gpfs and NFS4 ACLs from Samba 3.0 CTDB branch (from http://samba.org/~tridge/3_0-ctdb) Signed-off-by: Alexander Bokovoy [EMAIL PROTECTED] commit 875208724e39564fe81385dfe36e6c963e79e101 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Wed Jan 16 12:17:03 2008 +0300 Add support for offline files support, remote storage, and Async I/O force operations to VFS Offline files support and remote storage are for allowing communication with backup and archiving tools that mark files moved to a tape library as offline. We translate this info into corresponding CIFS offline file attribute and mark an exported volume as remote storage. Async I/O force is to allow selective redirection of I/O
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1452-ge1f5a8f
The branch, v3-2-test has been updated
via e1f5a8f10795831d3c7902d9803c9571c8ac811a (commit)
via 4256f8e093e81fbc2c1afd8f823725ae286945ce (commit)
via b01f34141509c90b12003786957790866c286cba (commit)
via a40f68eac1d421c96fc3e10e5a7494dc2c5a124e (commit)
via 5c2d4c76d8b56be92edcee026f2289b8b46a4c27 (commit)
via 0afd2153c7649e89d595cb7eff0f7b3c0b56ea15 (commit)
from df3c4648399f8d62ff6fe0013be8b89abc18f0f0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit e1f5a8f10795831d3c7902d9803c9571c8ac811a
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Thu Jan 17 07:34:33 2008 +0300
Fix more VFS API mixup with offline files
I'm sorry for this mess. :-(
commit 4256f8e093e81fbc2c1afd8f823725ae286945ce
Merge: b01f34141509c90b12003786957790866c286cba
df3c4648399f8d62ff6fe0013be8b89abc18f0f0
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Thu Jan 17 07:26:12 2008 +0300
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into
v3-2-test
commit b01f34141509c90b12003786957790866c286cba
Merge: a40f68eac1d421c96fc3e10e5a7494dc2c5a124e
5838a9f556f151dc7c1773dcdc598b8ba79fca44
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Wed Jan 16 23:24:44 2008 +0300
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into
v3-2-test
commit a40f68eac1d421c96fc3e10e5a7494dc2c5a124e
Merge: 5c2d4c76d8b56be92edcee026f2289b8b46a4c27
a861ff20917eeca303e2d36de71cd8614e937d5f
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Mon Jan 14 22:36:47 2008 +0300
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into
v3-2-test
commit 5c2d4c76d8b56be92edcee026f2289b8b46a4c27
Merge: 0afd2153c7649e89d595cb7eff0f7b3c0b56ea15
3f081ebeadf30a7943723703ecae479e0412c60c
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Mon Jan 14 21:40:40 2008 +0300
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into
v3-2-test
commit 0afd2153c7649e89d595cb7eff0f7b3c0b56ea15
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Mon Jan 14 21:32:59 2008 +0300
Fix crash in winbind clients: instead of talloc-based pointer we passed
address of a local variable.
---
Summary of changes:
source/modules/vfs_tsmsm.c |9 -
1 files changed, 4 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/modules/vfs_tsmsm.c b/source/modules/vfs_tsmsm.c
index fe791b2..c2d826f 100644
--- a/source/modules/vfs_tsmsm.c
+++ b/source/modules/vfs_tsmsm.c
@@ -137,7 +137,6 @@ static int tsmsm_connect(struct vfs_handle_struct *handle,
}
static int tsmsm_is_offline(struct vfs_handle_struct *handle,
- struct connection_struct *conn,
const char *path,
SMB_STRUCT_STAT *stbuf,
bool *offline) {
@@ -171,7 +170,7 @@ static int tsmsm_is_offline(struct vfs_handle_struct
*handle,
ret = -1;
DEBUG(2,(dm_path_to_handle failed - assuming offline (%s) -
%s\n,
path, strerror(errno)));
- *offline = True;
+ *offline = true;
goto done;
}
@@ -210,7 +209,7 @@ static bool tsmsm_aio_force(struct vfs_handle_struct
*handle, struct files_struc
sbuf.st_blocks, sbuf.st_size, tsmd-online_ratio));
return !(512 * (off_t)sbuf.st_blocks = sbuf.st_size *
tsmd-online_ratio);
}
- return False;
+ return false;
}
static ssize_t tsmsm_aio_return(struct vfs_handle_struct *handle, struct
files_struct *fsp,
@@ -277,7 +276,7 @@ static ssize_t tsmsm_pwrite(struct vfs_handle_struct
*handle, struct files_struc
return result;
}
-static int tsmsm_set_offline(struct vfs_handle_struct *handle, struct
connection_struct *conn,
+static int tsmsm_set_offline(struct vfs_handle_struct *handle,
const char *path) {
struct tsmsm_struct *tsmd = (struct tsmsm_struct *) handle-data;
int result = 0;
@@ -297,7 +296,7 @@ static int tsmsm_set_offline(struct vfs_handle_struct
*handle, struct connection
return result;
}
-static bool tsmsm_is_remotestorage(struct vfs_handle_struct *handle, struct
connection_struct *conn, const char *path) {
+static bool tsmsm_is_remotestorage(struct vfs_handle_struct *handle, const
char *path) {
return True;
}
--
Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1423-g175662b
Jeremy Allison пишет: On Wed, Jan 16, 2008 at 09:54:00AM -0600, Alexander Bokovoy wrote: This is bad code and needs fixing. I'm deeply sorry for this. Thank you for fixing part of those issues. int vfswrap_is_offline(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *path, SMB_STRUCT_STAT *sbuf, bool *offline) Looks like a question for which the correct return is a bool. But it returns a tristate, 1, 0, -1. WHAT DO THESE THINGS MEAN ? It returns offline status in the *offline and returns the status of the whole operation (two-state, supported/non-supported on the system) as 0/-1 much like we do with other system calls. The problem here is that offline status could be non-existent on the system (i.e. there is no backup and archiving integration with file system in question). We return -1 in this case from a specialized module and upper level then doesn't look into *offline. In default action (vfs_default.c) we do so if there is no DMAPI enabled, this code path is the same as was before, without VFS abstraction. MacOS X uses DMAPI to communicate offline status, in vfs_tsmsm we do use DMAPI to get offline status from GPFS too. Had it be bool, it would be greater confusion because you'd have two bools then. -- / Alexander Bokovoy Samba Team http://www.samba.org/ ALT Linux Team http://www.altlinux.org/ Midgard Project Ry http://www.midgard-project.org/
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-635-g45636ef
The branch, v3-2-test has been updated
via 45636efa39cbcc2ecf7af4dfd1ac6a90f197ba01 (commit)
via fbc510f1717fe82338262c18c252d18987c55b5c (commit)
from 537b12647e25adcb7da3581f18d2e9feca1caf0c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 45636efa39cbcc2ecf7af4dfd1ac6a90f197ba01
Merge: fbc510f1717fe82338262c18c252d18987c55b5c
537b12647e25adcb7da3581f18d2e9feca1caf0c
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Thu Dec 13 12:57:24 2007 +0300
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into
v3-2-test
commit fbc510f1717fe82338262c18c252d18987c55b5c
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Thu Dec 13 12:55:32 2007 +0300
Fix pam_smbpass build
---
Summary of changes:
source/pam_smbpass/support.c |8 ++--
1 files changed, 2 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/pam_smbpass/support.c b/source/pam_smbpass/support.c
index 9d56bd4..bc9481d 100644
--- a/source/pam_smbpass/support.c
+++ b/source/pam_smbpass/support.c
@@ -61,10 +61,6 @@
void _cleanup(pam_handle_t *, void *, int);
char *_pam_delete(register char *);
- /* default configuration file location */
-
- const char *servicesf = get_dyn_CONFIGFILE();
-
/* syslogging function for errors and other information */
void _log_err( int err, const char *format, ... )
@@ -128,7 +124,7 @@
int set_ctrl( int flags, int argc, const char **argv )
{
int i = 0;
-const char *service_file = get_dyn_CONFIGFILE();
+const char *service_file = NULL;
unsigned int ctrl;
ctrl = SMB_DEFAULTS; /* the default selection of options */
@@ -139,7 +135,7 @@ int set_ctrl( int flags, int argc, const char **argv )
set( SMB__NONULL, ctrl );
/* initialize service file location */
-service_file=servicesf;
+service_file=get_dyn_CONFIGFILE();
if (flags PAM_SILENT) {
set( SMB__QUIET, ctrl );
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-636-gb8e582c
The branch, v3-2-test has been updated
via b8e582c9941d2466a403e476c52026f4b4201062 (commit)
from 45636efa39cbcc2ecf7af4dfd1ac6a90f197ba01 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit b8e582c9941d2466a403e476c52026f4b4201062
Author: Alexander Bokovoy [EMAIL PROTECTED]
Date: Thu Dec 13 14:23:04 2007 +0300
Fix codepagedir to follow predefined libdir when using FHS. Fixes x86_64
build.
---
Summary of changes:
source/configure.in |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/configure.in b/source/configure.in
index 84ae6f7..7272ae4 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -65,10 +65,10 @@ AC_ARG_WITH(fhs,
mandir=\${prefix}/share/man
logfilebase=\${VARDIR}/log/samba
privatedir=\${CONFIGDIR}/private
-libdir=\${prefix}/lib/samba
+test ${libdir} || libdir=\${prefix}/lib/samba
configdir=\${sysconfdir}/samba
swatdir=\${DATADIR}/samba/swat
-codepagedir=\${prefix}/lib/samba
+codepagedir=\${LIBDIR}
statedir=\${VARDIR}/lib/samba
cachedir=\${VARDIR}/lib/samba
AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])
--
Samba Shared Repository
Re: [SCM] Samba Shared Repository branch, v3-2-test, updated. initial-v3-2-unstable-4-gbe91677
Stefan (metze) Metzmacher пишет: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Gerald (Jerry) Carter schrieb: The branch, v3-2-test has been updated via be916777da8c681c393b817105e3dfe8a9c4ef12 (commit) from 631464e2651e33812e43fe59c1e49c5d71f9621a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. Hi, can remove this useless block, I always start to read that and in the middle of the 2nd line I realize that it's not a commit message Does anyone thing it's usefull? I think we could just leave the URL. Commit's SHA1 is already mentioned in the log message. 8 lines less is a good net result. :-) -- / Alexander Bokovoy Samba Team http://www.samba.org/ ALT Linux Team http://www.altlinux.org/ Midgard Project Ry http://www.midgard-project.org/
[SCM] Samba - Draft II. branch, v4-0-unstable, updated. 276cec66df7f1c68e787644dbaf9a80f9c7dee7f
The branch, v4-0-unstable has been updated via 276cec66df7f1c68e787644dbaf9a80f9c7dee7f (commit) from 89cad4f701cce6a463e5a01046673c4db2c7d240 (commit) http://gitweb.samba.org/?p=jerry/draft2/samba.git;a=shortlog;h=v4-0-unstable Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 276cec66df7f1c68e787644dbaf9a80f9c7dee7f Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Tue Oct 9 15:20:38 2007 +0400 Test multiple clones --- Summary of changes: git-test/test.txt |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/git-test/test.txt b/git-test/test.txt index 2ff461a..f3512b9 100644 --- a/git-test/test.txt +++ b/git-test/test.txt @@ -1 +1,3 @@ testing 1 2 3 +testing 3 2 1 + -- Samba - Draft II.
[SCM] Samba - Draft II. branch, v4-0-unstable, updated. da53ea07379b1167daabad051273670460cd86a6
The branch, v4-0-unstable has been updated via da53ea07379b1167daabad051273670460cd86a6 (commit) from 276cec66df7f1c68e787644dbaf9a80f9c7dee7f (commit) http://gitweb.samba.org/?p=jerry/draft2/samba.git;a=shortlog;h=v4-0-unstable Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit da53ea07379b1167daabad051273670460cd86a6 Author: Alexander Bokovoy [EMAIL PROTECTED] Date: Tue Oct 9 15:55:52 2007 +0400 Test bootstrap script --- Summary of changes: git-test/test.txt |1 - 1 files changed, 0 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/git-test/test.txt b/git-test/test.txt index f3512b9..7ac707c 100644 --- a/git-test/test.txt +++ b/git-test/test.txt @@ -1,3 +1,2 @@ testing 1 2 3 -testing 3 2 1 -- Samba - Draft II.
Re: svn commit: samba-docs r1128 - in trunk: manpages-3 smbdotconf/misc
[EMAIL PROTECTED] пишет: Author: obnox Date: 2007-06-26 08:11:40 + (Tue, 26 Jun 2007) New Revision: 1128 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1128 Log: Fix a couple of tags. It is a little cumbersome for me to debug my manpage-sourcecode since I can only see useful output once It is on http://samba.org/~samba-bugs/docs/ ... :-/ (I have not yet come across a system that can produce readable manpage output from the source.) A regular Ubuntu setup should be OK to generate manpages from our documentation build system. -- / Alexander Bokovoy Samba Team http://www.samba.org/ ALT Linux Team http://www.altlinux.org/ Midgard Project Ry http://www.midgard-project.org/
Re: svn commit: samba r11233 - in branches/SAMBA_3_0/source/smbd: .
On Sun, Oct 23, 2005 at 11:29:16AM -0700, Jeremy Allison wrote: On Sun, Oct 23, 2005 at 04:15:57PM +1000, James Peach wrote: On Thu, 2005-10-20 at 18:15 +, [EMAIL PROTECTED] wrote: Author: jra Date: 2005-10-20 18:15:44 + (Thu, 20 Oct 2005) New Revision: 11233 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=11233 Log: Forgot to add the statvfs file. Oops. Should this be merged with the statfs/statvfs calls in fs_usage()? Maybe - it was a point patch from ab - there was something missing from the POSIX point of view for Linux clients. I'll take a look at this - thanks for pointing it out. You mean lib/fsusage.c? I'll try to use that code though we need a bit more for Steve's client needs (which is documented in vfs.h in vfs_statvfs_struct) -- / Alexander Bokovoy Samba Team http://www.samba.org/ ALT Linux Team http://www.altlinux.org/ Midgard Project Ry http://www.midgard-project.org/ signature.asc Description: Digital signature
Re: Build status as of Sat May 7 00:00:01 2005
Can we have host OS spec included in those tables? It would make easier to see if problems are on specific OS. On Sat, May 07, 2005 at 12:00:18AM +, [EMAIL PROTECTED] wrote: URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-05-06 00:00:19.0 + +++ /home/build/master/cache/broken_results.txt 2005-05-07 00:00:18.0 + @@ -1,20 +1,21 @@ -Build status as of Fri May 6 00:00:01 2005 +Build status as of Sat May 7 00:00:01 2005 Build counts: Tree Total Broken Panic ccache 36 3 0 distcc 36 2 0 ppp 21 1 0 -rsync36 1 0 -samba1 0 0 +rsync36 2 0 +samba1 1 1 samba-docs 0 0 0 -samba4 38 20 0 -samba_3_038 24 1 +samba4 40 22 0 +samba_3_038 23 1 Currently broken builds: Host Tree Compiler Status aix1 samba4 gccok/ 2/?/? aix1 samba_3_0gccok/ 2/?/? +cyberone rsyncgccok/ok/ok/ 2 fusberta samba4 gccok/ 2/?/? fusberta samba_3_0gccok/ 2/?/? samba-s390 samba4 gccok/ 2/?/? @@ -22,10 +23,11 @@ rhonwynsamba4 gcc-4.0ok/ 2/?/? rhonwynsamba_3_0gcc-4.0ok/ 2/?/? rhonwynsamba4 tccok/ 2/?/? -superego samba_3_0gccok/ 2/?/? shelob ccache iccok/ok/ok/ 2 +aretnapsamba4 gccok/ 1/?/? aretnapsamba_3_0gccok/ 1/?/? aretnapccache iccok/ok/ok/ 1 +aretnapsamba4 iccok/ 1/?/? aretnapsamba_3_0iccok/ 1/?/? gc4samba4 gccok/ 1/?/? gc4samba_3_0gccok/ 1/?/? @@ -61,6 +63,7 @@ m30rsyncgccok/ok/ok/ 2 m30samba4 gccok/ 2/?/? m30samba_3_0gccok/ 2/?/? +metze02sambagccok/ok/ok/ 1/PANIC metze02samba4 gccok/ 2/?/? metze02samba_3_0gccok/ 2/?/? opippp gccok/ 2/?/? -- / Alexander Bokovoy Samba Team http://www.samba.org/ ALT Linux Team http://www.altlinux.org/ Midgard Project Ry http://www.midgard-project.org/ pgpU4Ip170IEG.pgp Description: PGP signature
CVS update: samba/source/lib
Date: Tue Mar 16 17:18:57 2004 Author: ab Update of /home/cvs/samba/source/lib In directory dp.samba.org:/tmp/cvs-serv26085/source/lib Modified Files: Tag: SAMBA_3_0 charcnv.c Log Message: Fix check_path_syntax() for multibyte encodings which have no '\' as second byte. This is intermediate fix as discussed with Jeremy until we move check_path_syntax() to UCS2 internally where all ambiguity is resolved. Please add other encodings into charcnv.c with such property.' ' Revisions: charcnv.c 1.55.2.55 = 1.55.2.56 http://www.samba.org/cgi-bin/cvsweb/samba/source/lib/charcnv.c.diff?r1=1.55.2.55r2=1.55.2.56
CVS update: samba/source/smbd
Date: Tue Mar 16 17:18:58 2004 Author: ab Update of /home/cvs/samba/source/smbd In directory dp.samba.org:/tmp/cvs-serv26085/source/smbd Modified Files: Tag: SAMBA_3_0 reply.c Log Message: Fix check_path_syntax() for multibyte encodings which have no '\' as second byte. This is intermediate fix as discussed with Jeremy until we move check_path_syntax() to UCS2 internally where all ambiguity is resolved. Please add other encodings into charcnv.c with such property.' ' Revisions: reply.c 1.381.2.75 = 1.381.2.76 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/reply.c.diff?r1=1.381.2.75r2=1.381.2.76
CVS update: samba/source/lib
Date: Tue Mar 16 17:21:06 2004 Author: ab Update of /home/cvs/samba/source/lib In directory dp.samba.org:/tmp/cvs-serv26897/source/lib Modified Files: charcnv.c Log Message: Fix check_path_syntax() for multibyte encodings which have no '\' as second byte. This is intermediate fix as discussed with Jeremy until we move check_path_syntax() to UCS2 internally where all ambiguity is resolved. Please add other encodings into charcnv.c with such property. Revisions: charcnv.c 1.97 = 1.98 http://www.samba.org/cgi-bin/cvsweb/samba/source/lib/charcnv.c.diff?r1=1.97r2=1.98
CVS update: samba/source/smbd
Date: Tue Mar 16 17:21:06 2004 Author: ab Update of /home/cvs/samba/source/smbd In directory dp.samba.org:/tmp/cvs-serv26897/source/smbd Modified Files: reply.c Log Message: Fix check_path_syntax() for multibyte encodings which have no '\' as second byte. This is intermediate fix as discussed with Jeremy until we move check_path_syntax() to UCS2 internally where all ambiguity is resolved. Please add other encodings into charcnv.c with such property. Revisions: reply.c 1.456 = 1.457 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/reply.c.diff?r1=1.456r2=1.457
