[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via d004fd0 talloc: added test suite for talloc_free_children() via 52182a5 talloc: preserve context name on talloc_free_children() via 03f9250 samba-tool: use ldb.binary_encode() on search expression elements via 8dda0ef samba-tool: fixed binary encoding of usernames in setpassword via 7ce4aca pyldb: added binary_encode() and binary_decode() methods via d815ce0 ldb: added a test for an invalid search expression via e3b76bd ldb: fixed a search expression parse bug from 2663586 s4-auth Fill in the remainder of the unix info in auth_session_info http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit d004fd0b53fb6f3ae64f0e24cf51f4471d434574 Author: Andrew Tridgell tri...@samba.org Date: Fri Jul 29 11:57:07 2011 +1000 talloc: added test suite for talloc_free_children() this tests the fix from Simo Autobuild-User: Andrew Tridgell tri...@samba.org Autobuild-Date: Fri Jul 29 11:30:13 CEST 2011 on sn-devel-104 commit 52182a528117c4dd9624f64b34a873c0903ad70a Author: Simo Sorce i...@samba.org Date: Wed Jul 27 12:02:35 2011 -0400 talloc: preserve context name on talloc_free_children() Otherwise tc-name will end up pointing to garbage when it is not set to a const but rather to a string allocate as child of the context itself. Signed-off-by: Andrew Tridgell tri...@samba.org commit 03f92508ef2ebb4e7790f612e3f833382c691051 Author: Andrew Tridgell tri...@samba.org Date: Thu Jul 28 17:14:28 2011 +1000 samba-tool: use ldb.binary_encode() on search expression elements this allows us to deal with search elements containing characters that must be escaped in LDAP Pair-Programmed-With: Andrew Bartlett abart...@samba.org Pair-Programmed-With: Amitay Isaacs ami...@gmail.com commit 8dda0ef57fa908c94c14d2521ded883ceb253b2f Author: Andrew Tridgell tri...@samba.org Date: Thu Jul 28 17:03:57 2011 +1000 samba-tool: fixed binary encoding of usernames in setpassword Pair-Programmed-With: Amitay Isaacs ami...@gmail.com Pair-Programmed-With: Andrew Bartlett abart...@samba.org commit 7ce4aca029473b219d053221ced1e3686ce2d3ad Author: Andrew Tridgell tri...@samba.org Date: Thu Jul 28 17:03:06 2011 +1000 pyldb: added binary_encode() and binary_decode() methods this gives access to RFC2254 encoding from python Pair-Programmed-With: Andrew Bartlett abart...@samba.org Pair-Programmed-With: Amitay Isaacs ami...@gmail.com commit d815ce094e7a495fb2ddf0668015c5a1b9bb1dc4 Author: Andrew Tridgell tri...@samba.org Date: Thu Jul 28 15:56:15 2011 +1000 ldb: added a test for an invalid search expression this tests the fix for invalid expressions in and | expressions Pair-Programmed-With: Andrew Bartlett abart...@samba.org Pair-Programmed-With: Amitay Isaacs ami...@gmail.com commit e3b76bd6205acfc1a89fbcab5d9588b32cb47b88 Author: Andrew Tridgell tri...@samba.org Date: Thu Jul 28 15:51:31 2011 +1000 ldb: fixed a search expression parse bug when a secondary component of a or | expression was invalid, it was ignored rather than giving an error. For example: (|(objectclass=user)(samaccountname=foo\blah)) was treated as being: (objectclass=user) whereas it should be an error, as foo\blah is invalid Pair-Programmed-With: Amitay Isaacs ami...@gmail.com Pair-Programmed-With: Andrew Bartlett abart...@samba.org --- Summary of changes: lib/ldb/common/ldb_parse.c | 12 - lib/ldb/pyldb.c| 53 lib/ldb/tests/python/api.py|4 ++ lib/ldb/tests/test-generic.sh |3 + lib/talloc/talloc.c| 23 + lib/talloc/testsuite.c | 44 source4/scripting/python/samba/join.py |4 +- .../scripting/python/samba/netcmd/delegation.py| 10 ++-- source4/scripting/python/samba/netcmd/domain.py|2 +- source4/scripting/python/samba/netcmd/drs.py |5 +- source4/scripting/python/samba/netcmd/gpo.py |6 +- source4/scripting/python/samba/netcmd/rodc.py |2 +- source4/scripting/python/samba/netcmd/spn.py |8 ++-- source4/scripting/python/samba/netcmd/user.py |8 ++-- source4/scripting/python/samba/samdb.py| 10 ++-- 15 files changed, 167 insertions(+), 27 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/ldb/common/ldb_parse.c b/lib/ldb/common/ldb_parse.c index b4eabf8..8c6c2d9 100644 --- a/lib/ldb/common/ldb_parse.c +++ b/lib/ldb/common/ldb_parse.c @@ -534,8 +534,18 @@
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0b5c4a6 s3:dbwrap: move all .c and .h files of dbwrap to lib/dbwrap/
via d4c93ca s3-waf: replace the dbwrap_util library by a dbwrap library
that contains the dbwrap core
via 2414fc8 s3:dbwrap: move db_is_local() from dbwrap.c to dbwrap_open.c
via 1abdd9b s3:dbwrap: move db_open() to a file dbwrap_open.c of its
own.
via 75c7320 s3:g_lock: explicitly include dbwrap.h
via ee3be0d s3:modules:nfs4_acls: fix the include of dbwrap.h to not
include include/
via f72153e s3:dbwrap: explicitly include dbwrap.h in dbwrap_ctdb.c
from d004fd0 talloc: added test suite for talloc_free_children()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0b5c4a601a983aab06e4aba158cd9359babd1e71
Author: Michael Adam ob...@samba.org
Date: Thu Jul 7 17:42:08 2011 +0200
s3:dbwrap: move all .c and .h files of dbwrap to lib/dbwrap/
Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Fri Jul 29 13:34:22 CEST 2011 on sn-devel-104
commit d4c93ca721d0edd8780ce84e7cccd0e5a1ea4f37
Author: Michael Adam ob...@samba.org
Date: Wed Jul 6 17:02:13 2011 +0200
s3-waf: replace the dbwrap_util library by a dbwrap library that contains
the dbwrap core
commit 2414fc88d85c8dcc22ddbb389255d6c36838cbad
Author: Michael Adam ob...@samba.org
Date: Wed Jul 6 16:49:34 2011 +0200
s3:dbwrap: move db_is_local() from dbwrap.c to dbwrap_open.c
commit 1abdd9b2bb09d072496db5207814aefefe403f60
Author: Michael Adam ob...@samba.org
Date: Wed Jul 6 16:40:21 2011 +0200
s3:dbwrap: move db_open() to a file dbwrap_open.c of its own.
Also start new folder lib/dbwrap/ where dbwrap_open.c is stored and
make the fallbacke implementation functoins non-static and create a
dbwrap_private.h header file that contains their prototypes.
commit 75c7320497dc53d23bced5472faef7d9c31c1d9b
Author: Michael Adam ob...@samba.org
Date: Wed Jul 6 16:09:17 2011 +0200
s3:g_lock: explicitly include dbwrap.h
commit ee3be0defab27a7ab95144a6ee7fc6050e9e7265
Author: Michael Adam ob...@samba.org
Date: Wed Jul 6 16:14:18 2011 +0200
s3:modules:nfs4_acls: fix the include of dbwrap.h to not include include/
commit f72153ea83368cd7035b4a1003e35fedcb905ff6
Author: Michael Adam ob...@samba.org
Date: Wed Jul 6 14:27:03 2011 +0200
s3:dbwrap: explicitly include dbwrap.h in dbwrap_ctdb.c
This used to come in via g_lock.h
Pair-Programmed-With: Gregor Beck gb...@sernet.de
---
Summary of changes:
source3/Makefile.in | 10 +-
source3/groupdb/mapping_tdb.c |3 +-
source3/include/dbwrap.h | 145 ---
source3/include/g_lock.h |2 +-
source3/lib/conn_tdb.c|3 +-
source3/lib/dbwrap.c | 159
source3/lib/dbwrap/dbwrap.c | 66 ++
source3/lib/dbwrap/dbwrap.h | 138 +++
source3/lib/dbwrap/dbwrap_ctdb.c | 1440 +
source3/lib/{ = dbwrap}/dbwrap_file.c|0
source3/lib/dbwrap/dbwrap_open.c | 119 +++
source3/lib/dbwrap/dbwrap_open.h | 43 +
source3/lib/dbwrap/dbwrap_private.h | 38 +
source3/lib/dbwrap/dbwrap_rbt.c | 420 +
source3/lib/dbwrap/dbwrap_tdb.c | 379
source3/lib/{ = dbwrap}/dbwrap_util.c|0
source3/lib/dbwrap_ctdb.c | 1439
source3/lib/dbwrap_rbt.c | 420 -
source3/lib/dbwrap_tdb.c | 379
source3/lib/g_lock.c |2 +
source3/lib/messages.c|2 +-
source3/lib/privileges.c |2 +-
source3/lib/serverid.c|3 +-
source3/lib/sessionid_tdb.c |3 +-
source3/lib/sharesec.c|3 +-
source3/lib/talloc_dict.c |2 +-
source3/libnet/libnet_dssync_passdb.c |2 +-
source3/locking/brlock.c |3 +-
source3/locking/locking.c |3 +-
source3/locking/posix.c |2 +-
source3/modules/nfs4_acls.c |3 +-
source3/modules/vfs_acl_tdb.c |3 +-
source3/modules/vfs_xattr_tdb.c |3 +-
source3/param/loadparm.c |2 +-
source3/passdb/account_pol.c |3 +-
source3/passdb/machine_account_secrets.c |2 +-
source3/passdb/machine_sid.c |2 +-
source3/passdb/pdb_tdb.c |3 +-
source3/passdb/secrets.c |3 +-
source3/printing/printer_list.c |3 +-
source3/registry/reg_backend_db.c |3 +-
source3/registry/reg_objects.c|2
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via fac5c65 s3: Add a fallback for missing openx support in OS/X Lion
via 190b543 s3: Make map_open_params_to_ntcreate() available in lib/
via 0102c6e s3: Make is_executable() available in lib/
via 6d67d41 s3: We only need base_name in map_open_params_to_ntcreate
from 0b5c4a6 s3:dbwrap: move all .c and .h files of dbwrap to lib/dbwrap/
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit fac5c654e2fe17c2c11d150b16088e8a51f6be20
Author: Volker Lendecke v...@samba.org
Date: Fri Jul 29 16:37:18 2011 +0200
s3: Add a fallback for missing openx support in OS/X Lion
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Fri Jul 29 17:55:20 CEST 2011 on sn-devel-104
commit 190b5432f0fd55113b26c97aeac97c76b28dbedf
Author: Volker Lendecke v...@samba.org
Date: Fri Jul 29 16:36:58 2011 +0200
s3: Make map_open_params_to_ntcreate() available in lib/
commit 0102c6e2bc289352ab726d68956c126727cf8d81
Author: Volker Lendecke v...@samba.org
Date: Fri Jul 29 16:14:39 2011 +0200
s3: Make is_executable() available in lib/
commit 6d67d41444aef527215d985bdcdb0f214de875f9
Author: Volker Lendecke v...@samba.org
Date: Fri Jul 29 16:12:16 2011 +0200
s3: We only need base_name in map_open_params_to_ntcreate
---
Summary of changes:
source3/include/proto.h |8 ++
source3/lib/util.c | 165 ++
source3/libsmb/clifile.c | 87 +++-
source3/smbd/open.c | 164 -
source3/smbd/proto.h |8 --
source3/smbd/reply.c |8 ++-
source3/smbd/trans2.c|3 +-
7 files changed, 248 insertions(+), 195 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 35c26c2..095c52c 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -606,6 +606,14 @@ bool tevent_req_poll_ntstatus(struct tevent_req *req,
bool any_nt_status_not_ok(NTSTATUS err1, NTSTATUS err2, NTSTATUS *result);
int timeval_to_msec(struct timeval t);
char *valid_share_pathname(TALLOC_CTX *ctx, const char *dos_pathname);
+bool is_executable(const char *fname);
+bool map_open_params_to_ntcreate(const char *smb_base_fname,
+int deny_mode, int open_func,
+uint32 *paccess_mask,
+uint32 *pshare_mode,
+uint32 *pcreate_disposition,
+uint32 *pcreate_options,
+uint32_t *pprivate_flags);
/* The following definitions come from lib/util_cmdline.c */
diff --git a/source3/lib/util.c b/source3/lib/util.c
index b8fc319..689d41e 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -29,6 +29,7 @@
#include ../lib/util/util_pw.h
#include messages.h
#include ccan/hash/hash.h
+#include libcli/security/security.h
/* Max allowable allococation - 256mb - 0x1000 */
#define MAX_ALLOC_SIZE (1024*1024*256)
@@ -2238,3 +2239,167 @@ char *valid_share_pathname(TALLOC_CTX *ctx, const char
*dos_pathname)
return ptr;
}
+
+/***
+ Return True if the filename is one of the special executable types.
+/
+
+bool is_executable(const char *fname)
+{
+ if ((fname = strrchr_m(fname,'.'))) {
+ if (strequal(fname,.com) ||
+ strequal(fname,.dll) ||
+ strequal(fname,.exe) ||
+ strequal(fname,.sym)) {
+ return True;
+ }
+ }
+ return False;
+}
+
+/
+ Open a file with a share mode - old openX method - map into NTCreate.
+/
+
+bool map_open_params_to_ntcreate(const char *smb_base_fname,
+int deny_mode, int open_func,
+uint32 *paccess_mask,
+uint32 *pshare_mode,
+uint32 *pcreate_disposition,
+uint32 *pcreate_options,
+uint32_t *pprivate_flags)
+{
+ uint32 access_mask;
+ uint32 share_mode;
+ uint32 create_disposition;
+ uint32 create_options = FILE_NON_DIRECTORY_FILE;
+ uint32_t private_flags = 0;
+
+ DEBUG(10,(map_open_params_to_ntcreate: fname = %s, deny_mode = 0x%x,
+ open_func = 0x%x\n,
+ smb_base_fname, (unsigned int)deny_mode,
+ (unsigned
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1d4d919 Secod part of bugfix for bug #8335 - file copy aborts with
smb2_validate_message_id: bad message_id
via 9edc159 First part of bugfix for bug #8335 - file copy aborts with
smb2_validate_message_id: bad message_id
from fac5c65 s3: Add a fallback for missing openx support in OS/X Lion
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1d4d9194abf3694e2f890744c6f7764088b1c1f3
Author: Jeremy Allison j...@samba.org
Date: Thu Jul 28 20:23:30 2011 -0700
Secod part of bugfix for bug #8335 - file copy aborts with
smb2_validate_message_id: bad message_id
Modify the credit granting algorithm to closer to what I believe
Windows does.
Split up max_credits into 1/16ths, and then scale
the requested credits by how many 16ths have been
currently granted. Less than 1/16th == grant all
requested (100%), scale down as more have been
granted. Never ask for less than 1 if the client
asked for at least 1.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Fri Jul 29 20:37:42 CEST 2011 on sn-devel-104
commit 9edc1599125fbd3588a22d9a4145666a9c322798
Author: Jeremy Allison j...@samba.org
Date: Thu Jul 28 20:22:45 2011 -0700
First part of bugfix for bug #8335 - file copy aborts with
smb2_validate_message_id: bad message_id
Set default max credits to 8192 now this has been documented in the
SMB2 spec.
---
Summary of changes:
docs-xml/smbdotconf/protocol/smb2maxcredits.xml |2 +-
source3/include/local.h |2 +-
source3/smbd/smb2_server.c | 27 --
3 files changed, 26 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
index 69d04f7..310b898 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
@@ -8,7 +8,7 @@
that Samba tells the client it will allow. This is similar to the
smbconfoption name=max mux/
parameter for SMB1. You should never need to set this parameter.
/para
-paraThe default is 128 credits, which is the same as a Windows SMB2
server./para
+paraThe default is 8192 credits, which is the same as a Windows 2008R2 SMB2
server./para
/description
value type=default128/value
diff --git a/source3/include/local.h b/source3/include/local.h
index 594f700..d71a72c 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -235,7 +235,7 @@
#define DEFAULT_SMB2_MAX_READ (1024*1024)
#define DEFAULT_SMB2_MAX_WRITE (1024*1024)
#define DEFAULT_SMB2_MAX_TRANSACT (1024*1024)
-#define DEFAULT_SMB2_MAX_CREDITS 128
+#define DEFAULT_SMB2_MAX_CREDITS 8192
#define DEFAULT_SMB2_MAX_CREDIT_BITMAP_FACTOR 2
#endif
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 11b5ed8..288cc79 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -455,9 +455,30 @@ static void smb2_set_operation_credit(struct
smbd_server_connection *sconn,
SMB_ASSERT(sconn-smb2.max_credits = sconn-smb2.credits_granted);
- /* Remember what we gave out. */
- credits_granted = MIN(credits_requested, (sconn-smb2.max_credits -
- sconn-smb2.credits_granted));
+ if (credits_requested) {
+ uint16_t modified_credits_requested;
+ uint32_t multiplier;
+
+ /*
+* Split up max_credits into 1/16ths, and then scale
+* the requested credits by how many 16ths have been
+* currently granted. Less than 1/16th == grant all
+* requested (100%), scale down as more have been
+* granted. Never ask for less than 1 as the client
+* asked for at least 1. JRA.
+*/
+
+ multiplier = 16 - (((sconn-smb2.credits_granted * 16) /
sconn-smb2.max_credits) % 16);
+
+ modified_credits_requested = (multiplier * credits_requested) /
16;
+ if (modified_credits_requested == 0) {
+ modified_credits_requested = 1;
+ }
+
+ /* Remember what we gave out. */
+ credits_granted = MIN(modified_credits_requested,
+ (sconn-smb2.max_credits -
sconn-smb2.credits_granted));
+ }
if (credits_granted == 0 sconn-smb2.credits_granted == 0) {
/* First negprot packet, or ensure the client credits can
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 24fe5fe nbt: fix WinXP S3 domain join: alignment of
nbt_netlogon_response_from_pdc
from 146549d Fix bug #8324 - smbclient cannot list directories from a
big-endian machine.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 24fe5fea8fb7839dcbcf39a346a31c9e90e7beb9
Author: Andrew Bartlett abart...@samba.org
Date: Wed Jul 27 12:04:26 2011 +1000
nbt: fix WinXP S3 domain join: alignment of nbt_netlogon_response_from_pdc
This fixes WinXP joining a Samba3 domain, which was broken on hosts
with an even number of characters in the host name. The alignment
requested in the structure was ignored because of the overall
NDR_NOALIGN set on the packet.
Andrew Bartlett
Fix bug #8326 (WinXP cannot join a Samba3 domain with a 'even' hostname).
---
Summary of changes:
librpc/idl/nbt.idl |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/nbt.idl b/librpc/idl/nbt.idl
index cbfa966..ee9a64e 100644
--- a/librpc/idl/nbt.idl
+++ b/librpc/idl/nbt.idl
@@ -494,7 +494,7 @@ interface nbt
} nbt_netlogon_query_for_pdc;
/* response from pdc */
- typedef [flag(NDR_NOALIGN),public] struct {
+ typedef [public] struct {
netlogon_command command;
astring pdc_name;
[flag(NDR_ALIGN2)] DATA_BLOB _pad;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 254cc7a s3:loadparm: fix the reload of the configuration: also
reload activated registry shares
via cc3c8d1 s3:loadparm: add reload_registry_shares() - reload only
those shares already loaded (cherry picked from commit
ec113a58a4dc4e4f3ea03f7818eb312325f69482)
from 24fe5fe nbt: fix WinXP S3 domain join: alignment of
nbt_netlogon_response_from_pdc
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 254cc7ae23f2b0108bada37b6b59dd90ac198469
Author: Michael Adam ob...@samba.org
Date: Fri Jul 22 10:11:52 2011 +0200
s3:loadparm: fix the reload of the configuration: also reload activated
registry shares
Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Fri Jul 22 16:53:49 CEST 2011 on sn-devel-104
(cherry picked from commit efbe1602bd014eada4811f336bdccbf4692d3807)
The last 2 patches address bug 8327 (config reload fails to reload shares
from
registry).
commit cc3c8d10940ef5d5d0e636b0f9d46606d46b0dc7
Author: Michael Adam ob...@samba.org
Date: Fri Jul 22 10:10:43 2011 +0200
s3:loadparm: add reload_registry_shares() - reload only those shares
already loaded (cherry picked from commit
ec113a58a4dc4e4f3ea03f7818eb312325f69482)
---
Summary of changes:
source3/param/loadparm.c | 37 +++--
1 files changed, 35 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 0a1a4b0..bec525e 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -7351,6 +7351,35 @@ done:
return ret;
}
+/**
+ * reload those shares from registry that are already
+ * activated in the services array.
+ */
+static bool reload_registry_shares(void)
+{
+ int i;
+ bool ret = true;
+
+ for (i = 0; i iNumServices; i++) {
+ if (!VALID(i)) {
+ continue;
+ }
+
+ if (ServicePtrs[i]-usershare == USERSHARE_VALID) {
+ continue;
+ }
+
+ ret = process_registry_service(ServicePtrs[i]-szService);
+ if (!ret) {
+ goto done;
+ }
+ }
+
+done:
+ return ret;
+}
+
+
#define MAX_INCLUDE_DEPTH 100
static uint8_t include_depth;
@@ -9599,8 +9628,12 @@ static bool lp_load_ex(const char *pszFname,
bRetval = false;
}
- if (bRetval lp_registry_shares() allow_registry_shares) {
- bRetval = process_registry_shares();
+ if (bRetval lp_registry_shares()) {
+ if (allow_registry_shares) {
+ bRetval = process_registry_shares();
+ } else {
+ bRetval = reload_registry_shares();
+ }
}
lp_add_auto_services(lp_auto_services());
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2049357 Added missing return. Not strictly neccessary, the
following if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) clause will
catch this and use tevent_req_nterror(req, status); to set the status as
NT_STATUS_OK, but it looks strange to do it that way.
from 1d4d919 Secod part of bugfix for bug #8335 - file copy aborts with
smb2_validate_message_id: bad message_id
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 20493572178ed5791806dbdb4572f595db3110b2
Author: Jeremy Allison j...@samba.org
Date: Fri Jul 29 15:20:15 2011 -0700
Added missing return. Not strictly neccessary, the following if
(!NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED))
clause will catch this and use tevent_req_nterror(req, status); to set the
status as NT_STATUS_OK, but
it looks strange to do it that way.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Sat Jul 30 01:34:24 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/libsmb/clifile.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 3590350..59cdb7b 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -2253,6 +2253,7 @@ static void cli_open_done(struct tevent_req *subreq)
if (NT_STATUS_IS_OK(status)) {
state-fnum = SVAL(vwv+2, 0);
tevent_req_done(req);
+ return;
}
if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
--
Samba Shared Repository
