[Samba] Admin privileges samba 3.6
I know that this issue was already a topic here, but I can't find a solution. I upgraded from 3.5.11 to 3.6 and my domain admin has no admin rights on the win 7 clients any more any hints? regards Martin -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba Digest, Vol 104, Issue 24
apt-cache policy samba cups cups: Installé : 1.4.4-7 Candidat : 1.4.4-7 Table de version : *** 1.4.4-7 0 500 http://ftp.fr.debian.org/debian/ squeeze/main i386 Packages 100 /var/lib/dpkg/status samba: Installé : 2:3.5.6~dfsg-3squeeze5 Candidat : 2:3.5.6~dfsg-3squeeze5 Table de version : *** 2:3.5.6~dfsg-3squeeze5 0 500 http://security.debian.org/ squeeze/updates/main i386 Packages 100 /var/lib/dpkg/status 2:3.5.6~dfsg-3squeeze4 0 500 http://ftp.fr.debian.org/debian/ squeeze/main i386 Packages Le 24/08/2011 20:00, samba-requ...@lists.samba.org a écrit : Sujet: Re: [Samba] Sharing network printer drivers with Windows 7 Pro clients does not work De : Christian PERRIER bubu...@debian.org Date : Tue, 23 Aug 2011 18:35:10 +0200 Pour : samba@lists.samba.org Quoting Bruno CAPELETO (bruno.capel...@free.fr): Dear all, This is the tested config : - debian squeeze 32bits (samba 3.5.6 / cups 1.4.4) Which package version? I (as maintainer of samba packages in Debian) backported a few changes from further 3.5 versions, some of which related to 64-bit printing, so the package version is important, here. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] mount.cifs - Unisys MCP Mainframe -- Linux touch command setting times of `testfile.txt': Permission denied
I've got a share from a Unisys MCP Mainframe mounted with mount.cifs from RHEL 6.1 (samba-common-3.5.6-86.el6.x86_64). when I try to touch a file, it creates the file, but reports an error - setting times of `testfile.txt': Permission denied strace on the touch command shows that it is erroring out on the utimensat() call utimensat(0, NULL, NULL, 0) = -1 EACCES (Permission denied) Documentation from the Unisys Mainframe can be found here http://public.support.unisys.com/aseries/docs/clearpath-mcp-12.0/pdf/70118328-103.pdf Pages: C-2 and C3 show what POSIX functions are/not supported utime() and utimensat() are not among the supported functions listed there. Is there any combination of parameters to mount.cifs that can be used that would prevent touch from reporting this error? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] samba file sharing and 2FA with yubikeys
List, I am attempting to install samba and use multiple authentication mechanisms. My goal is to use domain creds via winbind and yubikey otp. So my initial thought was to use stacked pam modules (yubikey has to use pam module). However I don't believe samba can be configured to have a working winbind configuration AND utilize pam (at least my testing is failing). My question is how can I achieve this or what direction should I take? My latest thought is having two instances of samba running, one with working winbind configuration and the other with winbind disabled, utilizing pam, and hosting my shares with yubikey's pam module and winbind stacked. If I am to use any pam authentication I'm assuming server signing must be enabled to protect the clear text passwords? thanks, Casey -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] ntconfig.pol for samba3.5.6+openldap+Win7
Hi all, All clients are Win 7. How can I transmit rules defined in gpedit for users (for example forbid execution of regedit) to the Default User roaming profile? Is it done with a ntconfig.pol ? If yes, how can I make it ? Thanks This message was sent using IMP, the Internet Messaging Program. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Password expires every month even though 'Password Must Change' is set to 'never' (Samba+LDAP)
Hi all, Since a few months ago Samba ask each of our users to change password at log on every month and I have not been able to disable it. I found this page and follow the instructions: http://playingwithsid.blogspot.com/2010/12/change-samba-password-expiry-setting.html The default 'Password Must Change' policy was set to never and pdbedit shows 'Password Must Change: never' for each user, yet the passwords still get expire once a month. Can anyone please give me some pointers? - Jeff -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Why using several Samba4 servers?
Hi! We're trying to figure out the best way to use samba4 in our environment and after testing back and forth we are now left with a question; why would we want to have several samba4 servers? The environment is one HQ with multiple branch offices where each branch office as a network connection to HQ with at least a 2Mbit DSL. The initial idea was to put a samba4 DC in every branch office to lighten the load on HQ DC and network connection. However after having tested this we couldn't get failover/reduncency to work as we figured it should. We set up the first DC added clients, users, policies and profiles. Worked like a charm. Added a second DC and then made sure all log files said replication was OK and we could see the second DC in administration tools. So then we took the first DC offline and naturally things like policies stopped working (since clients ask for specific DNS entries and those point to the first DC). Reading up on howtos, googling like mad and thinking about this we found no real way to make this work as our initial idea. So the question remains; is there any point in running more than one Samba4 DC for redundancy/load balacing issues or is the only point to have it as a backup? Regards, /Dieter -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] what's the impact if register sessions for the guest user
Hello all,
I set up a samba server(3.4.13) that guest has access to it. When I
run command “net status shares parseable” on the server, it shows results
like this:
test\17358\\\pc-vincent\\Thu Aug 25 15:00:49 2011
And there’s no ip address for the client. I googled the reason and hacked
the samba source code, I found this comments in function session_claim() of
file source3/smbd/session.c:
/* don't register sessions for the guest user - its just too
expensive to go through pam session code for browsing etc */
if (vuser-server_info-guest) {
return True;
}
I comment out the above code, which is to say, register sessions for the
guest user, and then reinstall samba, there’s ip address in the result of
“net status shares parseable”:
test\7962\guest\guests\pc-vincent\192.168.8.126\Thu Aug 25 15:34:37 2011
and everything on the samba server seems right.
I want to know what’s the impact if I made changes like this?
Forgive my poor English. Thanks very much.
Vincent
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba Digest, Vol 104, Issue 24
Quoting Bruno CAPELETO (bruno.capel...@free.fr): apt-cache policy samba cups cups: Installé : 1.4.4-7 Candidat : 1.4.4-7 Table de version : *** 1.4.4-7 0 500 http://ftp.fr.debian.org/debian/ squeeze/main i386 Packages 100 /var/lib/dpkg/status samba: Installé : 2:3.5.6~dfsg-3squeeze5 Candidat : 2:3.5.6~dfsg-3squeeze5 OK, these are official and latest packages for squeeze. There are possibilities that some fixes between 3.5.6 and 3.5.11 add better support for some printing functionalities. In case you're in the position of doing this, I can suggest testing the backported 3.5.11 version (packages from Debian unstable, recompiled for squeeze): http://packages.debian.org/search?keywords=sambasearchon=namessection=allsuite=squeeze-backports -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Understanding UID/GID mapping models.
I am using either DOMAIN or ADS for authentication and am trying to understand how UID/GID mapping rules are triggered. This[1] seems to suggest that if I do not specify the idmap uid/gid parameters in smb.conf, then authenticated usernames are mapped to local user accounts having the same name. If, however, I _do_ specify idmap uid/gid then one of the idmap_* allocator modules is used. Is my understanding correct there? We have a mixed NIS/AD environment, and in most cases we do not use idmap parameters and, as such, rely on the existence of an NIS account to map UID/GID's. However, when users attempt to set permissions from Windows, it appears that a SID is passed to Samba which is unable to map it into a valid file system ACL and the permissions aren't actually set. The only workaround I've found is to enable idmap so these SID's can be resolved properly to NSS-sourced (in our case, NIS or local accounts) UID/GID's. I do something like this: idmap backend = tdb # Users without NIS accounts are assigned random UID/GID's from the # following pool (assuming they're allowed to connect) idmap uid = 100-1000 idmap gid = 100-1000 # NIS users should never have UID/GID 59 idmap config DOMAIN : backend = nss idmap config DOMAIN : range = 0-59 This seems to work, but I'm looking to confirm that I have the correct understanding. Thanks, Ray -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via be44c45 smbtorture4: Fix a typo from 8e5adf7 Fixed regression test case for Bug 8412 - Microsoft Office 2007 (Microsoft Word) fails to save as on a Samba share with SMB2 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit be44c45440c19c7f88b876478db24bced227ae36 Author: Volker Lendecke v...@samba.org Date: Tue Aug 30 08:20:57 2011 +0200 smbtorture4: Fix a typo Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Tue Aug 30 09:51:10 CEST 2011 on sn-devel-104 --- Summary of changes: source4/torture/smb2/oplock.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c index e5c3571..5b12e13 100644 --- a/source4/torture/smb2/oplock.c +++ b/source4/torture/smb2/oplock.c @@ -790,7 +790,7 @@ static bool test_smb2_oplock_exclusive6(struct torture_context *tctx, CHECK_VAL(break_info.count, 0); CHECK_VAL(break_info.failures, 0); - /* Close the parent directry handle. */ + /* Close the parent directory handle. */ ZERO_STRUCT(closeio); closeio.in.file.handle = h; status = smb2_close(tree1, closeio); -- Samba Shared Repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-08-30-1322/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-08-30-1322/samba3.stderr http://git.samba.org/autobuild.flakey/2011-08-30-1322/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-08-30-1322/samba4.stderr http://git.samba.org/autobuild.flakey/2011-08-30-1322/samba4.stdout The top commit at the time of the failure was: commit be44c45440c19c7f88b876478db24bced227ae36 Author: Volker Lendecke v...@samba.org Date: Tue Aug 30 08:20:57 2011 +0200 smbtorture4: Fix a typo Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Tue Aug 30 09:51:10 CEST 2011 on sn-devel-104
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-08-30-1522/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-08-30-1522/samba3.stderr http://git.samba.org/autobuild.flakey/2011-08-30-1522/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-08-30-1522/samba4.stderr http://git.samba.org/autobuild.flakey/2011-08-30-1522/samba4.stdout The top commit at the time of the failure was: commit be44c45440c19c7f88b876478db24bced227ae36 Author: Volker Lendecke v...@samba.org Date: Tue Aug 30 08:20:57 2011 +0200 smbtorture4: Fix a typo Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Tue Aug 30 09:51:10 CEST 2011 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via e52fa62 s3: Silence some warnings from be44c45 smbtorture4: Fix a typo http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e52fa6298a461bce125e4292c3c035a7bed22a51 Author: Volker Lendecke v...@samba.org Date: Tue Aug 30 17:02:54 2011 +0200 s3: Silence some warnings Rusty, please suggest a proper fix for this. Thanks, Volker Lendecke Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Tue Aug 30 19:16:14 CEST 2011 on sn-devel-104 --- Summary of changes: source3/lib/ctdbd_conn.c | 19 +++ source3/lib/dbwrap/dbwrap_ctdb.c | 19 +++ source3/lib/messages_ctdbd.c | 18 ++ 3 files changed, 56 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index 1b4f9ac..21a417c 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -27,7 +27,26 @@ #include ctdb_packet.h #include messages.h +/* + * It is not possible to include ctdb.h and tdb_compat.h (included via + * some other include above) without warnings. This fixes those + * warnings. + */ + +#ifdef typesafe_cb +#undef typesafe_cb +#endif + +#ifdef typesafe_cb_preargs +#undef typesafe_cb_preargs +#endif + +#ifdef typesafe_cb_postargs +#undef typesafe_cb_postargs +#endif + /* paths to these include files come from --with-ctdb= in configure */ + #include ctdb.h #include ctdb_private.h diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c index ada5cfc..3233253 100644 --- a/source3/lib/dbwrap/dbwrap_ctdb.c +++ b/source3/lib/dbwrap/dbwrap_ctdb.c @@ -23,6 +23,25 @@ #include lib/util/tdb_wrap.h #include util_tdb.h #ifdef CLUSTER_SUPPORT + +/* + * It is not possible to include ctdb.h and tdb_compat.h (included via + * some other include above) without warnings. This fixes those + * warnings. + */ + +#ifdef typesafe_cb +#undef typesafe_cb +#endif + +#ifdef typesafe_cb_preargs +#undef typesafe_cb_preargs +#endif + +#ifdef typesafe_cb_postargs +#undef typesafe_cb_postargs +#endif + #include ctdb.h #include ctdb_private.h #include ctdbd_conn.h diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c index 3140f65..9e092bc 100644 --- a/source3/lib/messages_ctdbd.c +++ b/source3/lib/messages_ctdbd.c @@ -23,6 +23,24 @@ #ifdef CLUSTER_SUPPORT +/* + * It is not possible to include ctdb.h and tdb_compat.h (included via + * some other include above) without warnings. This fixes those + * warnings. + */ + +#ifdef typesafe_cb +#undef typesafe_cb +#endif + +#ifdef typesafe_cb_preargs +#undef typesafe_cb_preargs +#endif + +#ifdef typesafe_cb_postargs +#undef typesafe_cb_postargs +#endif + #include ctdb.h #include ctdb_private.h #include ctdbd_conn.h -- Samba Shared Repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-08-30-1925/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-08-30-1925/samba3.stderr http://git.samba.org/autobuild.flakey/2011-08-30-1925/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-08-30-1925/samba4.stderr http://git.samba.org/autobuild.flakey/2011-08-30-1925/samba4.stdout The top commit at the time of the failure was: commit be44c45440c19c7f88b876478db24bced227ae36 Author: Volker Lendecke v...@samba.org Date: Tue Aug 30 08:20:57 2011 +0200 smbtorture4: Fix a typo Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Tue Aug 30 09:51:10 CEST 2011 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a38ff63 s3-rpc_server: Make sure we switch always the connecting
user.
from e52fa62 s3: Silence some warnings
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a38ff63fcdc0d3ac1669b1c1343006d9db4e926b
Author: Andreas Schneider a...@samba.org
Date: Tue Aug 30 16:37:40 2011 +0200
s3-rpc_server: Make sure we switch always the connecting user.
We always have a valid session info and if it is a anonymous connection
we have a session info of the guest user. This means we should always
call become_authenticated_pipe_user() else and anonymous user could do
things as root.
Autobuild-User: Andreas Schneider a...@cryptomilk.org
Autobuild-Date: Tue Aug 30 20:50:54 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/rpc_server/srv_pipe.c | 24 +++-
1 files changed, 11 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 058f1b8..7a616c0 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -1521,18 +1521,18 @@ static bool api_pipe_request(struct pipes_struct *p,
struct ncacn_packet *pkt)
{
bool ret = False;
- bool changed_user = False;
struct pipe_rpc_fns *pipe_fns;
- if (p-pipe_bound
- ((p-auth.auth_type == DCERPC_AUTH_TYPE_NTLMSSP) ||
-(p-auth.auth_type == DCERPC_AUTH_TYPE_KRB5) ||
-(p-auth.auth_type == DCERPC_AUTH_TYPE_SPNEGO))) {
- if(!become_authenticated_pipe_user(p-session_info)) {
- data_blob_free(p-out_data.rdata);
- return False;
- }
- changed_user = True;
+ if (!p-pipe_bound) {
+ DEBUG(1, (Pipe not bound!\n));
+ data_blob_free(p-out_data.rdata);
+ return false;
+ }
+
+ if (!become_authenticated_pipe_user(p-session_info)) {
+ DEBUG(1, (Failed to become pipe user!\n));
+ data_blob_free(p-out_data.rdata);
+ return false;
}
/* get the set of RPC functions for this context */
@@ -1557,9 +1557,7 @@ static bool api_pipe_request(struct pipes_struct *p,
pkt-u.request.context_id));
}
- if (changed_user) {
- unbecome_authenticated_pipe_user();
- }
+ unbecome_authenticated_pipe_user();
return ret;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 4db2504 Fix bug Bug 8422 - Infinite loop in ACL module code.
from 0b1ce3f s3-vfs: Fix vfs_chown_fsp.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 4db250449dda30e3ffa05c8918e0cf39cbacc5d8
Author: Jeremy Allison j...@samba.org
Date: Mon Aug 29 16:53:04 2011 -0700
Fix bug Bug 8422 - Infinite loop in ACL module code.
Missing assignment means this loop will never terminate. Need to be applied
to 3.5.x and 3.6.1.
---
Summary of changes:
source3/modules/vfs_acl_common.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index b209824..af4c41d 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -862,7 +862,7 @@ static int acl_common_remove_object(vfs_handle_struct
*handle,
/* Ensure we have this file open with DELETE access. */
id = vfs_file_id_from_sbuf(conn, local_fname.st);
- for (fsp = file_find_di_first(id); fsp; file_find_di_next(fsp)) {
+ for (fsp = file_find_di_first(id); fsp; fsp = file_find_di_next(fsp)) {
if (fsp-access_mask DELETE_ACCESS
fsp-delete_on_close) {
/* We did open this for delete,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 225c66a Fix bug Bug 8422 - Infinite loop in ACL module code.
from 9bf2b30 Fix bug #8395 - optimize serverid_exists() for Solaris.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 225c66ada497449a55d2eed6dfb27cedf3a863c0
Author: Jeremy Allison j...@samba.org
Date: Mon Aug 29 16:46:15 2011 -0700
Fix bug Bug 8422 - Infinite loop in ACL module code.
Missing assignment means this loop will never terminate. Need to be applied
to 3.5.x and 3.6.1.
(cherry picked from commit 218cccfdf1820a9840a5cbc7df3915b6b58a762d)
---
Summary of changes:
source3/modules/vfs_acl_common.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index b6fcbb0..bc06f0b 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -868,7 +868,7 @@ static int acl_common_remove_object(vfs_handle_struct
*handle,
/* Ensure we have this file open with DELETE access. */
id = vfs_file_id_from_sbuf(conn, local_fname.st);
for (fsp = file_find_di_first(conn-sconn, id); fsp;
-file_find_di_next(fsp)) {
+fsp = file_find_di_next(fsp)) {
if (fsp-access_mask DELETE_ACCESS
fsp-delete_on_close) {
/* We did open this for delete,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 45392d0 s3: Fix bug 8385
from 225c66a Fix bug Bug 8422 - Infinite loop in ACL module code.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 45392d05ff059987fb76d3818969177b5a5de6b0
Author: Volker Lendecke v...@samba.org
Date: Mon Aug 22 14:16:26 2011 +0200
s3: Fix bug 8385
Poll and select behave differently regarding error handling. When doing the
connect(2), we can not rely on poll telling us both readability and
writability
upon error. Just always try a second connect(2). At least on Linux it
returns 0
when it succeeded.
Signed-off-by: Jeremy Allison j...@samba.org
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Thu Aug 25 19:39:12 CEST 2011 on sn-devel-104
(cherry picked from commit 50e30afa608dfdeae8a260730ead9761ed424dad)
---
Summary of changes:
lib/async_req/async_sock.c | 40 ++--
1 files changed, 14 insertions(+), 26 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index 2c90b6d..bb8518f 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -325,36 +325,24 @@ static void async_connect_connected(struct tevent_context
*ev,
priv, struct tevent_req);
struct async_connect_state *state =
tevent_req_data(req, struct async_connect_state);
+ int ret;
- /*
-* Stevens, Network Programming says that if there's a
-* successful connect, the socket is only writable. Upon an
-* error, it's both readable and writable.
-*/
- if ((flags (TEVENT_FD_READ|TEVENT_FD_WRITE))
- == (TEVENT_FD_READ|TEVENT_FD_WRITE)) {
- int ret;
-
- ret = connect(state-fd,
- (struct sockaddr *)(void *)state-address,
- state-address_len);
- if (ret == 0) {
- TALLOC_FREE(fde);
- tevent_req_done(req);
- return;
- }
-
- if (errno == EINPROGRESS) {
- /* Try again later, leave the fde around */
- return;
- }
+ ret = connect(state-fd, (struct sockaddr *)(void *)state-address,
+ state-address_len);
+ if (ret == 0) {
+ state-sys_errno = 0;
TALLOC_FREE(fde);
- tevent_req_error(req, errno);
+ tevent_req_done(req);
return;
}
-
- state-sys_errno = 0;
- tevent_req_done(req);
+ if (errno == EINPROGRESS) {
+ /* Try again later, leave the fde around */
+ return;
+ }
+ state-sys_errno = errno;
+ TALLOC_FREE(fde);
+ tevent_req_error(req, errno);
+ return;
}
int async_connect_recv(struct tevent_req *req, int *perrno)
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via e66a1f0 s3: Fix the build of vfs_aixacl2.c from 45392d0 s3: Fix bug 8385 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit e66a1f06dc0cdbebf6a4adb801317773a09f0dbc Author: SATOH Fumiyasu fumi...@osstech.co.jp Date: Mon Aug 22 13:48:40 2011 +0900 s3: Fix the build of vfs_aixacl2.c Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Thu Aug 25 23:06:12 CEST 2011 on sn-devel-104 (cherry picked from commit faa769ec19b6486675048734837a6e2237d6f0a4) Fix bug #8390 (vfs_aixacl2.c needs system/filesys.h). --- Summary of changes: source3/modules/vfs_aixacl2.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c index e74c00f..5ded2a8 100644 --- a/source3/modules/vfs_aixacl2.c +++ b/source3/modules/vfs_aixacl2.c @@ -18,6 +18,7 @@ */ #include includes.h +#include system/filesys.h #include smbd/smbd.h #include nfs4_acls.h -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 2f0a5b4 s3: Use sys_read in fork_domain_child
via 11ab2d6 s3: Use sys_write in fork_domain_child
via b181fe9 s3: Fix a winbind race leading to 100% CPU
from e66a1f0 s3: Fix the build of vfs_aixacl2.c
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 2f0a5b477f58378c3505631d15b422057b037efe
Author: Volker Lendecke v...@samba.org
Date: Fri Aug 26 11:38:21 2011 +0200
s3: Use sys_read in fork_domain_child
I've seen
[2011/08/26 01:44:10.872057, 1]
winbindd/winbindd_dual.c:1336(fork_domain_child)
fork_domain_child: Could not read child status: nread=-1,
error=Interrupted system call
on a customer box. Not good.
(cherry picked from commit 964e809ce2069ad888e0fb12dfe51bac5a461508)
The last 3 patches address bug #8409 (f7d97868 created a new race
condition).
commit 11ab2d68023dbfd9089a7e2ec2d36ef4f1f7974e
Author: Volker Lendecke v...@samba.org
Date: Fri Aug 26 11:39:41 2011 +0200
s3: Use sys_write in fork_domain_child
Counterpart for last checkin. A lot less likely, but not impossible in a
child.
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Fri Aug 26 13:14:27 CEST 2011 on sn-devel-104
(cherry picked from commit e0e3d215b1902ecbeb3d469af9a196856711921e)
commit b181fe9ec50ff63074b217143b6daa5cddfb8853
Author: Volker Lendecke v...@samba.org
Date: Fri Aug 26 16:54:18 2011 +0200
s3: Fix a winbind race leading to 100% CPU
This fixes a race condition that leads to the winbindd_children list
becoming
corrupted. It happens when on a busy winbind SIGCHLD is a bit late.
Imagine a winbind with multiple requests in the queue for a single child.
Child
dies, and before the SIGCHLD handler is called we find the socket to be
dead.
wb_child_request_done is called, receiving an error from
wb_simple_trans_recv.
It closes the socket. Then immediately the wb_child_request_trigger will do
another fork_domain_child before the signal handler is called. This means
that
we do another fork_domain_child, we have child-sock==-1 at this point.
fork_domain_child will do a DLIST_ADD(winbindd_children, child) a second
time
where the child is already part of that list. This corrupts the list. Then
the
signal handler kicks in, spinning in
for (child = winbindd_children; child != NULL; child = child-next) {
forever. Not good. This patch makes sure that both conditions (sock==-1 and
not
part of the list) for a winbindd_child struct match up.
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Fri Aug 26 18:51:24 CEST 2011 on sn-devel-104
(cherry picked from commit ed058f4dc3e059967f3c0538bc220866e9c63588)
---
Summary of changes:
source3/winbindd/winbindd_dual.c |9 +
1 files changed, 5 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 1078f8d..f4edf1d 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -43,6 +43,8 @@
extern bool override_logfile;
extern struct winbindd_methods cache_methods;
+static struct winbindd_child *winbindd_children = NULL;
+
/* Read some data from a client connection */
static NTSTATUS child_read_request(struct winbindd_cli_state *state)
@@ -171,6 +173,7 @@ static void wb_child_request_done(struct tevent_req *subreq)
*/
close(state-child-sock);
state-child-sock = -1;
+ DLIST_REMOVE(winbindd_children, state-child);
tevent_req_error(req, err);
return;
}
@@ -489,8 +492,6 @@ void setup_child(struct winbindd_domain *domain, struct
winbindd_child *child,
SMB_ASSERT(child-binding_handle != NULL);
}
-static struct winbindd_child *winbindd_children = NULL;
-
void winbind_child_died(pid_t pid)
{
struct winbindd_child *child;
@@ -1329,7 +1330,7 @@ static bool fork_domain_child(struct winbindd_child
*child)
close(fdpair[0]);
- nread = read(fdpair[1], status, sizeof(status));
+ nread = sys_read(fdpair[1], status, sizeof(status));
if (nread != sizeof(status)) {
DEBUG(1, (fork_domain_child: Could not read child
status:
nread=%d, error=%s\n, (int)nread,
@@ -1360,7 +1361,7 @@ static bool fork_domain_child(struct winbindd_child
*child)
status = winbindd_reinit_after_fork(child, child-logfilename);
- nwritten = write(state.sock, status, sizeof(status));
+ nwritten = sys_write(state.sock, status, sizeof(status));
if (nwritten != sizeof(status)) {
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via a0a7996 Fix bug 8412 - Microsoft Office 2007 (Microsoft Word) fails
to save as on a Samba share with SMB2. (cherry picked from commit
dec3b21cd1737b317749e7ebced5aa1c2115ebdf)
from 2f0a5b4 s3: Use sys_read in fork_domain_child
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit a0a799663bd4780bb9f948e2dd0635dadb4e2c40
Author: Jeremy Allison j...@samba.org
Date: Mon Aug 29 16:47:16 2011 -0700
Fix bug 8412 - Microsoft Office 2007 (Microsoft Word) fails to save as on a
Samba share with SMB2. (cherry picked from commit
dec3b21cd1737b317749e7ebced5aa1c2115ebdf)
---
Summary of changes:
source3/smbd/reply.c| 46 +++
source3/smbd/smb2_setinfo.c |6 -
2 files changed, 46 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 4178f3f..ac450bb 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -5936,6 +5936,47 @@ static void notify_rename(connection_struct *conn, bool
is_dir,
}
/
+ Returns an error if the parent directory for a filename is open in an
+ incompatible way.
+/
+
+static NTSTATUS parent_dirname_compatible_open(connection_struct *conn,
+ const struct smb_filename
*smb_fname_dst_in)
+{
+ char *parent_dir = NULL;
+ struct smb_filename smb_fname_parent;
+ struct file_id id;
+ files_struct *fsp = NULL;
+ int ret;
+
+ if (!parent_dirname(talloc_tos(), smb_fname_dst_in-base_name,
+ parent_dir, NULL)) {
+ return NT_STATUS_NO_MEMORY;
+ }
+ ZERO_STRUCT(smb_fname_parent);
+ smb_fname_parent.base_name = parent_dir;
+
+ ret = SMB_VFS_LSTAT(conn, smb_fname_parent);
+ if (ret == -1) {
+ return map_nt_error_from_unix(errno);
+ }
+
+ /*
+* We're only checking on this smbd here, mostly good
+* enough.. and will pass tests.
+*/
+
+ id = vfs_file_id_from_sbuf(conn, smb_fname_parent.st);
+ for (fsp = file_find_di_first(conn-sconn, id); fsp;
+ fsp = file_find_di_next(fsp)) {
+ if (fsp-access_mask DELETE_ACCESS) {
+ return NT_STATUS_SHARING_VIOLATION;
+}
+}
+ return NT_STATUS_OK;
+}
+
+/
Rename an open file - given an fsp.
/
@@ -5956,6 +5997,11 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
return status;
}
+ status = parent_dirname_compatible_open(conn, smb_fname_dst_in);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+
/* Make a copy of the dst smb_fname structs */
status = copy_smb_filename(ctx, smb_fname_dst_in, smb_fname_dst);
diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index e114940..96b44aa 100644
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -219,12 +219,6 @@ static struct tevent_req
*smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
if (file_info_level == SMB_FILE_RENAME_INFORMATION) {
/* SMB2_FILE_RENAME_INFORMATION_INTERNAL == 0xFF00 +
in_file_info_class */
file_info_level = SMB2_FILE_RENAME_INFORMATION_INTERNAL;
- if (fsp-oplock_type != FAKE_LEVEL_II_OPLOCK
- fsp-oplock_type != NO_OPLOCK) {
- /* No break, but error. */
- tevent_req_nterror(req,
NT_STATUS_SHARING_VIOLATION);
- return tevent_req_post(req, ev);
- }
}
if (fsp-fh-fd == -1) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 1a996fe s3: Fix getent group if trusted domains are not reachable
from a0a7996 Fix bug 8412 - Microsoft Office 2007 (Microsoft Word) fails
to save as on a Samba share with SMB2. (cherry picked from commit
dec3b21cd1737b317749e7ebced5aa1c2115ebdf)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 1a996fe1d12a55e68b7266ce5db8972b6e5f101a
Author: Volker Lendecke v...@samba.org
Date: Thu Aug 25 20:13:09 2011 +0200
s3: Fix getent group if trusted domains are not reachable
Fix bug #8420 (wb_group_members: non-resistance against garbage).
---
Summary of changes:
source3/winbindd/wb_group_members.c |9 +++--
1 files changed, 7 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/wb_group_members.c
b/source3/winbindd/wb_group_members.c
index e6efcab..8776a8c 100644
--- a/source3/winbindd/wb_group_members.c
+++ b/source3/winbindd/wb_group_members.c
@@ -209,8 +209,13 @@ static void wb_groups_members_done(struct tevent_req
*subreq)
* and just continue if an error occured.
*/
- if (tevent_req_nterror(req, status)) {
- return;
+ if (!NT_STATUS_IS_OK(status)) {
+ if (!NT_STATUS_EQUAL(
+ status, NT_STATUS_TRUSTED_DOMAIN_FAILURE)) {
+ tevent_req_nterror(req, status);
+ return;
+ }
+ num_members = 0;
}
num_all_members = talloc_array_length(state-all_members);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 126d343 v3-5-test: Fix getent group if trusted domains are not
reachable
from 4db2504 Fix bug Bug 8422 - Infinite loop in ACL module code.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 126d343580e7ba6465cfdf60ea60958cbe98b242
Author: Volker Lendecke v...@samba.org
Date: Thu Aug 25 20:13:09 2011 +0200
v3-5-test: Fix getent group if trusted domains are not reachable
Fix bug #8420 (wb_group_members: non-resistance against garbage).
---
Summary of changes:
source3/winbindd/wb_group_members.c |8 ++--
1 files changed, 6 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/wb_group_members.c
b/source3/winbindd/wb_group_members.c
index a7eb9ba..cad04f8 100644
--- a/source3/winbindd/wb_group_members.c
+++ b/source3/winbindd/wb_group_members.c
@@ -213,8 +213,12 @@ static void wb_groups_members_done(struct tevent_req
*subreq)
*/
if (!NT_STATUS_IS_OK(status)) {
- tevent_req_nterror(req, status);
- return;
+ if (!NT_STATUS_EQUAL(
+ status, NT_STATUS_TRUSTED_DOMAIN_FAILURE)) {
+ tevent_req_nterror(req, status);
+ return;
+ }
+ num_members = 0;
}
num_all_members = talloc_array_length(state-all_members);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via fc8c588 s3:smb2 fix Bug 8428 - wrong reply to DHnC (durable handle
reconnect)
from 1a996fe s3: Fix getent group if trusted domains are not reachable
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit fc8c5880d9785103e3345781bfca48e67a92cc33
Author: Christian Ambach a...@samba.org
Date: Tue Aug 30 17:39:56 2011 +0200
s3:smb2 fix Bug 8428 - wrong reply to DHnC (durable handle reconnect)
According to [MS-SMB2] 3.3.5.9.7
(http://msdn.microsoft.com/en-us/library/cc246784%28v=PROT.13%29.aspx),
smbd must reply with NT_STATUS_OBJECT_NAME_NOT_FOUND as it does not
support durable file-handles yet.
I have seen w2k8r2 running xcopy /C ending up in an endless loop
trying to get back the original file handle from smbd sending the same
requests over and over.
Metze, Jeremy, please check!
---
Summary of changes:
source3/smbd/smb2_create.c | 12 ++--
1 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index fcd8945..b8557e0 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -537,7 +537,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX
*mem_ctx,
if (exta) {
if (dhnc) {
- tevent_req_nterror(req,
NT_STATUS_INVALID_PARAMETER);
+
tevent_req_nterror(req,NT_STATUS_OBJECT_NAME_NOT_FOUND);
return tevent_req_post(req, ev);
}
@@ -552,7 +552,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX
*mem_ctx,
if (mxac) {
if (dhnc) {
- tevent_req_nterror(req,
NT_STATUS_INVALID_PARAMETER);
+ tevent_req_nterror(req,
NT_STATUS_OBJECT_NAME_NOT_FOUND);
return tevent_req_post(req, ev);
}
@@ -570,7 +570,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX
*mem_ctx,
enum ndr_err_code ndr_err;
if (dhnc) {
- tevent_req_nterror(req,
NT_STATUS_INVALID_PARAMETER);
+ tevent_req_nterror(req,
NT_STATUS_OBJECT_NAME_NOT_FOUND);
return tevent_req_post(req, ev);
}
@@ -592,7 +592,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX
*mem_ctx,
if (dhnq) {
if (dhnc) {
- tevent_req_nterror(req,
NT_STATUS_INVALID_PARAMETER);
+ tevent_req_nterror(req,
NT_STATUS_OBJECT_NAME_NOT_FOUND);
return tevent_req_post(req, ev);
}
@@ -618,7 +618,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX
*mem_ctx,
if (alsi) {
if (dhnc) {
- tevent_req_nterror(req,
NT_STATUS_INVALID_PARAMETER);
+ tevent_req_nterror(req,
NT_STATUS_OBJECT_NAME_NOT_FOUND);
return tevent_req_post(req, ev);
}
@@ -635,7 +635,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX
*mem_ctx,
struct tm *tm;
if (dhnc) {
- tevent_req_nterror(req,
NT_STATUS_INVALID_PARAMETER);
+ tevent_req_nterror(req,
NT_STATUS_OBJECT_NAME_NOT_FOUND);
return tevent_req_post(req, ev);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b58e7bb s3:smb2 fix Bug 8428 - wrong reply to DHnC (durable handle
reconnect)
from a38ff63 s3-rpc_server: Make sure we switch always the connecting
user.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b58e7bb88eb29f35527e1e9dc0e0a36ea034cf80
Author: Christian Ambach a...@samba.org
Date: Tue Aug 30 17:39:56 2011 +0200
s3:smb2 fix Bug 8428 - wrong reply to DHnC (durable handle reconnect)
According to [MS-SMB2] 3.3.5.9.7
(http://msdn.microsoft.com/en-us/library/cc246784%28v=PROT.13%29.aspx),
smbd must reply with NT_STATUS_OBJECT_NAME_NOT_FOUND as it does not
support durable file-handles yet.
I have seen w2k8r2 running xcopy /C ending up in an endless loop
trying to get back the original file handle from smbd sending the same
requests over and over.
Metze, Jeremy, please check!
Signed-off-by: Jeremy Allison j...@samba.org
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Tue Aug 30 22:20:36 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/smbd/smb2_create.c | 12 ++--
1 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index aaa461c..9a60fda 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -537,7 +537,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX
*mem_ctx,
if (exta) {
if (dhnc) {
- tevent_req_nterror(req,
NT_STATUS_INVALID_PARAMETER);
+
tevent_req_nterror(req,NT_STATUS_OBJECT_NAME_NOT_FOUND);
return tevent_req_post(req, ev);
}
@@ -552,7 +552,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX
*mem_ctx,
if (mxac) {
if (dhnc) {
- tevent_req_nterror(req,
NT_STATUS_INVALID_PARAMETER);
+ tevent_req_nterror(req,
NT_STATUS_OBJECT_NAME_NOT_FOUND);
return tevent_req_post(req, ev);
}
@@ -570,7 +570,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX
*mem_ctx,
enum ndr_err_code ndr_err;
if (dhnc) {
- tevent_req_nterror(req,
NT_STATUS_INVALID_PARAMETER);
+ tevent_req_nterror(req,
NT_STATUS_OBJECT_NAME_NOT_FOUND);
return tevent_req_post(req, ev);
}
@@ -592,7 +592,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX
*mem_ctx,
if (dhnq) {
if (dhnc) {
- tevent_req_nterror(req,
NT_STATUS_INVALID_PARAMETER);
+ tevent_req_nterror(req,
NT_STATUS_OBJECT_NAME_NOT_FOUND);
return tevent_req_post(req, ev);
}
@@ -618,7 +618,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX
*mem_ctx,
if (alsi) {
if (dhnc) {
- tevent_req_nterror(req,
NT_STATUS_INVALID_PARAMETER);
+ tevent_req_nterror(req,
NT_STATUS_OBJECT_NAME_NOT_FOUND);
return tevent_req_post(req, ev);
}
@@ -635,7 +635,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX
*mem_ctx,
struct tm *tm;
if (dhnc) {
- tevent_req_nterror(req,
NT_STATUS_INVALID_PARAMETER);
+ tevent_req_nterror(req,
NT_STATUS_OBJECT_NAME_NOT_FOUND);
return tevent_req_post(req, ev);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 480a031 smb2_constants: add SMB2_HDR_CREDIT_CHARGE via 7e7f085 s3:include: add CAP_LWIO and CAP_DYNAMIC_REAUTH defines via 3b9feed s3-build: move libsmb/clisigning.c to LIBSMB_SRC from b58e7bb s3:smb2 fix Bug 8428 - wrong reply to DHnC (durable handle reconnect) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 480a031c5b9a2ffe1e03e3fcb197e526e6d69e72 Author: Stefan Metzmacher me...@samba.org Date: Tue Aug 30 11:48:16 2011 +0200 smb2_constants: add SMB2_HDR_CREDIT_CHARGE SMB2_HDR_EPOCH was never used and SMB 2.10 uses it as SMB2_HDR_CREDIT_CHARGE. We keep SMB2_HDR_EPOCH as alias for now, until all callers are fixed. metze Autobuild-User: Stefan Metzmacher me...@samba.org Autobuild-Date: Tue Aug 30 23:49:56 CEST 2011 on sn-devel-104 commit 7e7f085419bd56ba7d8c7901188180e86840789b Author: Stefan Metzmacher me...@samba.org Date: Mon Aug 29 20:39:55 2011 +0200 s3:include: add CAP_LWIO and CAP_DYNAMIC_REAUTH defines metze commit 3b9feedd48076cdebf6da3e74925a8e650853c04 Author: Stefan Metzmacher me...@samba.org Date: Tue Aug 30 16:58:09 2011 +0200 s3-build: move libsmb/clisigning.c to LIBSMB_SRC It's only needed in the client library. metze --- Summary of changes: libcli/smb/smb2_constants.h |3 ++- source3/Makefile.in |4 ++-- source3/include/smb.h |2 ++ source3/wscript_build |5 +++-- 4 files changed, 9 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/smb/smb2_constants.h b/libcli/smb/smb2_constants.h index 7ab496d..0e2c267 100644 --- a/libcli/smb/smb2_constants.h +++ b/libcli/smb/smb2_constants.h @@ -25,7 +25,8 @@ /* offsets into header elements for a sync SMB2 request */ #define SMB2_HDR_PROTOCOL_ID0x00 #define SMB2_HDR_LENGTH0x04 -#define SMB2_HDR_EPOCH 0x06 +#define SMB2_HDR_CREDIT_CHARGE 0x06 +#define SMB2_HDR_EPOCH SMB2_HDR_CREDIT_CHARGE /* TODO: remove this */ #define SMB2_HDR_STATUS0x08 #define SMB2_HDR_OPCODE0x0c #define SMB2_HDR_CREDIT0x0e diff --git a/source3/Makefile.in b/source3/Makefile.in index c633510..9236750 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -459,7 +459,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \ lib/substitute.o lib/substitute_generic.o ../lib/util/substitute.o lib/dbwrap/dbwrap_util.o \ lib/ms_fnmatch.o ../lib/util/ms_fnmatch.o lib/errmap_unix.o ../libcli/util/errmap_unix.o \ lib/tallocmsg.o lib/dmallocmsg.o \ - libsmb/clisigning.o libsmb/smb_signing.o \ + libsmb/smb_signing.o \ ../lib/util/charset/iconv.o intl/lang_tdb.o \ lib/conn_tdb.o lib/adt_tree.o lib/gencache.o \ lib/sessionid_tdb.o \ @@ -594,7 +594,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \ libsmb/clistr.o libsmb/cliquota.o libsmb/clifsinfo.o libsmb/clidfs.o \ libsmb/clioplock.o libsmb/clirap2.o \ libsmb/smb_seal.o libsmb/async_smb.o \ -libsmb/read_smb.o \ +libsmb/read_smb.o libsmb/clisigning.o \ libsmb/smb2cli_base.o \ libsmb/smb2cli_negprot.o \ libsmb/smb2cli_session.o \ diff --git a/source3/include/smb.h b/source3/include/smb.h index 207fc9e..c88b3fd 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1234,7 +1234,9 @@ http://msdn.microsoft.com/en-us/library/cc246334(PROT.13).aspx #define CAP_W2K_SMBS 0x2000 #define CAP_LARGE_READX 0x4000 #define CAP_LARGE_WRITEX 0x8000 +#define CAP_LWIO 0x1 #define CAP_UNIX 0x80 /* Capabilities for UNIX extensions. Created by HP. */ +#define CAP_DYNAMIC_REAUTH0x2000 #define CAP_EXTENDED_SECURITY 0x8000 /* printing types */ diff --git a/source3/wscript_build b/source3/wscript_build index cdf1958..d04f519 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -76,7 +76,7 @@ LIB_SRC = ''' lib/substitute.c lib/substitute_generic.c lib/ms_fnmatch.c lib/tallocmsg.c lib/dmallocmsg.c - libsmb/clisigning.c libsmb/smb_signing.c + libsmb/smb_signing.c intl/lang_tdb.c lib/conn_tdb.c lib/gencache.c lib/sessionid_tdb.c @@ -136,7 +136,8 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c libsmb/clitrans.c libsmb/clisecdesc.c libsmb/clidgram.c libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c libsmb/clioplock.c libsmb/clirap2.c - libsmb/smb_seal.c libsmb/async_smb.c
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via cdce324 MAINTAINERS.txt: ping me about CCAN changes
via b88e0c4 ccan: fix likely redefinition warnings with --enable-tdb2
via b10ad70 tdb2: fix build with --enable-tdb2
from 480a031 smb2_constants: add SMB2_HDR_CREDIT_CHARGE
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit cdce32470a9e6f16da5149c91989382390012663
Author: Rusty Russell ru...@rustcorp.com.au
Date: Wed Aug 31 13:58:14 2011 +0930
MAINTAINERS.txt: ping me about CCAN changes
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
Autobuild-User: Rusty Russell ru...@rustcorp.com.au
Autobuild-Date: Wed Aug 31 07:58:34 CEST 2011 on sn-devel-104
commit b88e0c40b777480e101a7524697656d6a03fb563
Author: Rusty Russell ru...@rustcorp.com.au
Date: Wed Aug 31 13:57:14 2011 +0930
ccan: fix likely redefinition warnings with --enable-tdb2
When we do --enable-tdb2, we start clashing with the replace.h
version:
In file included from ../lib/tdb2/tools/../private.h:25:0,
from ../lib/tdb2/tools/tdb2torture.c:60:
../lib/ccan/likely/likely.h:32:0: warning: likely redefined
../lib/replace/replace.h:762:0: note: this is the location of the previous
definition
../lib/ccan/likely/likely.h:53:0: warning: unlikely redefined
../lib/replace/replace.h:765:0: note: this is the location of the previous
definition
I don't like to #ifndef-protect them in general, since you don't want
different parts of the code to silently have different definitions,
but it's the simplest fix for now.
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
commit b10ad70f8fd5ee359b4409b373ba93ff050c82d4
Author: Rusty Russell ru...@rustcorp.com.au
Date: Wed Aug 31 13:56:40 2011 +0930
tdb2: fix build with --enable-tdb2
tdb2 doesn't expost tdb_jenkins_hash; go straight to the source in
ccan/hash.
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
---
Summary of changes:
MAINTAINERS.txt|5 +
lib/ccan/likely/likely.h |8
source3/modules/vfs_shadow_copy2.c |5 ++---
3 files changed, 15 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt
index 36e1840..9e40103 100644
--- a/MAINTAINERS.txt
+++ b/MAINTAINERS.txt
@@ -72,6 +72,11 @@ policy:
Other non-trivial (typo, etc) commits require pre- or post-push
review by the
maintainer or one of the maintainers of the containing subsystem.
+files: lib/ccan
+maintainers:
+ Rusty Russell ru...@samba.org
+policy:
+ Please ping me when changes made, so I can sync with CCAN project.
===
diff --git a/lib/ccan/likely/likely.h b/lib/ccan/likely/likely.h
index c43d276..3a9c6d4 100644
--- a/lib/ccan/likely/likely.h
+++ b/lib/ccan/likely/likely.h
@@ -30,7 +30,9 @@
* return false;
* }
*/
+#ifndef likely
#define likely(cond) __builtin_expect(!!(cond), 1)
+#endif
/**
* unlikely - indicate that a condition is unlikely to be true.
@@ -51,11 +53,17 @@
* fprintf(stderr, Overflow!);
* }
*/
+#ifndef unlikely
#define unlikely(cond) __builtin_expect(!!(cond), 0)
+#endif
#else
+#ifndef likely
#define likely(cond) (!!(cond))
+#endif
+#ifndef unlikely
#define unlikely(cond) (!!(cond))
#endif
+#endif
#else /* CCAN_LIKELY_DEBUG versions */
#define likely(cond) \
(_likely_trace(!!(cond), 1, stringify(cond), __FILE__, __LINE__))
diff --git a/source3/modules/vfs_shadow_copy2.c
b/source3/modules/vfs_shadow_copy2.c
index ca33b6d..4ac9e84 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -99,7 +99,7 @@
#include system/filesys.h
#include include/ntioctl.h
#include smbd/proto.h
-#include tdb.h
+#include ccan/hash/hash.h
#include util_tdb.h
#define GMT_NAME_LEN 24 /* length of a @GMT- name */
@@ -438,9 +438,8 @@ static void convert_sbuf(vfs_handle_struct *handle, const
char *fname,
without significant VFS changes
*/
uint32_t shash;
- TDB_DATA data = string_tdb_data(fname);
- shash = tdb_jenkins_hash(data) 0xFF00;
+ shash = hash(fname, strlen(fname), 0) 0xFF00;
if (shash == 0) {
shash = 1;
}
--
Samba Shared Repository
