[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via bbacd90 selftest: Add test for smbpasswd against pdb_samba4
via 6acce6e s3-passdb: Fix pdb_samba4 setting of plaintext passwords
via 6bab4a3 s3-passdb: Use DSDB_PASSWORD_BYPASS_LAST_SET flags in
pdb_samba4
via 1a9ee7c dsdb: Allow DSDB_CONTROL_PASSWORD_BYPASS_LAST_SET_OID to be
specified as a flag
from 1f0298d python: Change except: statement to except Exception:
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit bbacd901cda42a0a5c284164c46f750a76fd0c7e
Author: Andrew Bartlett abart...@samba.org
Date: Tue Jan 24 19:23:20 2012 +1100
selftest: Add test for smbpasswd against pdb_samba4
Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Tue Jan 24 11:05:09 CET 2012 on sn-devel-104
commit 6acce6e5d71743b824a822e9b6f24dcc6d8106ca
Author: Andrew Bartlett abart...@samba.org
Date: Tue Jan 24 18:38:09 2012 +1100
s3-passdb: Fix pdb_samba4 setting of plaintext passwords
We were setting a UTF8 password into the UTF16 clearTextPassword.
Converting from CH_UNIX to CH_UTF16 should fix this.
Andrew Bartlett
commit 6bab4a3810f9b42e62d2fe1a9b1544e34893cb50
Author: Andrew Bartlett abart...@samba.org
Date: Tue Jan 24 18:37:24 2012 +1100
s3-passdb: Use DSDB_PASSWORD_BYPASS_LAST_SET flags in pdb_samba4
commit 1a9ee7cbd575f3865a2cd8dfe35e3f89ebdec073
Author: Andrew Bartlett abart...@samba.org
Date: Tue Jan 24 18:36:49 2012 +1100
dsdb: Allow DSDB_CONTROL_PASSWORD_BYPASS_LAST_SET_OID to be specified as a
flag
---
Summary of changes:
source3/passdb/pdb_samba4.c | 28 +---
source4/dsdb/common/util.c |7 +
source4/dsdb/common/util.h |1 +
testprogs/blackbox/test_passwords.sh | 45 +++---
4 files changed, 67 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/passdb/pdb_samba4.c b/source3/passdb/pdb_samba4.c
index 8da9b3c..bc3b123 100644
--- a/source3/passdb/pdb_samba4.c
+++ b/source3/passdb/pdb_samba4.c
@@ -357,13 +357,30 @@ static int pdb_samba4_replace_by_sam(struct
pdb_samba4_state *state,
return ret;
}
+ /* If we set a plaintext password, the system will
+* force the pwdLastSet to now() */
+ if (need_update(sam, PDB_PASSLASTSET)) {
+ dsdb_flags = DSDB_PASSWORD_BYPASS_LAST_SET;
+
+ ret |= pdb_samba4_add_time(msg, pwdLastSet,
+ pdb_get_pass_last_set_time(sam));
+ }
+
pw = pdb_get_plaintext_passwd(sam);
if (need_update(sam, PDB_PLAINTEXT_PW)) {
+ struct ldb_val pw_utf16;
if (pw == NULL) {
return LDB_ERR_OPERATIONS_ERROR;
}
- ret |= ldb_msg_add_string(msg, clearTextPassword, pw);
+ if (!convert_string_talloc(msg,
+ CH_UNIX, CH_UTF16,
+ pw, strlen(pw),
+ (void *)pw_utf16.data,
+ pw_utf16.length)) {
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+ ret |= ldb_msg_add_value(msg, clearTextPassword, pw_utf16,
NULL);
} else {
bool changed_lm_pw = false;
bool changed_nt_pw = false;
@@ -407,15 +424,6 @@ static int pdb_samba4_replace_by_sam(struct
pdb_samba4_state *state,
}
- /* If we set a plaintext password, the system will
-* force the pwdLastSet to now(), and it isn't worth
-* working around this for the real world use cases of
-* pdb_samba4 */
- if (need_update(sam, PDB_PASSLASTSET)) {
- ret |= pdb_samba4_add_time(msg, pwdLastSet,
-
pdb_get_pass_last_set_time(sam));
- }
-
if (need_update(sam, PDB_PWHISTORY)) {
uint32_t current_hist_len;
const uint8_t *history = pdb_get_pw_history(sam,
current_hist_len);
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 38391a9..814faa6 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -3725,6 +3725,13 @@ int dsdb_request_add_controls(struct ldb_request *req,
uint32_t dsdb_flags)
}
}
+ if (dsdb_flags DSDB_PASSWORD_BYPASS_LAST_SET) {
+ ret = ldb_request_add_control(req,
DSDB_CONTROL_PASSWORD_BYPASS_LAST_SET_OID, true, NULL);
+ if (ret != LDB_SUCCESS) {
+ return ret;
+
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 230f6cf Update URI for Samba commander from d0722e5 Remove http://sopastrike.com/strike java magic http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 230f6cf33c716e3fe14c983a6a0c45506919e855 Author: Lars Müller l...@samba.org Date: Tue Jan 24 12:12:59 2012 +0100 Update URI for Samba commander --- Summary of changes: GUI/index.html |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/GUI/index.html b/GUI/index.html index e81e8d1..0fd2ad9 100755 --- a/GUI/index.html +++ b/GUI/index.html @@ -165,7 +165,8 @@ squid password using a web-based interface. Freely available h3smbc - Simple Samba Commander/h3 -pa href=http://smbc.airm.net/;Simple Samba Commander/a is a text +pa href=http://sourceforge.net/projects/smbc/;Simple Samba Commander/a +is a text mode SMB network commander. With SMBC, you can browse your local network or use the search function to find files in a share. You can also download/upload files and directories or create them both locally and remotely. -- Samba Website Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f154504 s3:registry: do not write empty value lists to registry.tdb
from bbacd90 selftest: Add test for smbpasswd against pdb_samba4
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f1545048eb4d1917234540308977908244e6e8fb
Author: Gregor Beck gb...@sernet.de
Date: Tue Jan 24 10:45:32 2012 +0100
s3:registry: do not write empty value lists to registry.tdb
Signed-off-by: Michael Adam ob...@samba.org
Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Tue Jan 24 13:54:09 CET 2012 on sn-devel-104
---
Summary of changes:
source3/registry/reg_backend_db.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/registry/reg_backend_db.c
b/source3/registry/reg_backend_db.c
index 0245f4c..8537f40 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -1909,6 +1909,11 @@ static NTSTATUS regdb_store_values_internal(struct
db_context *db,
goto done;
}
+ if (regval_ctr_numvals(values) == 0) {
+ WERROR werr = regdb_delete_values(db, key);
+ return werror_to_ntstatus(werr);
+ }
+
ZERO_STRUCT(data);
len = regdb_pack_values(values, data.dptr, data.dsize);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c19753b s3: Add debug when a message is registered
from f154504 s3:registry: do not write empty value lists to registry.tdb
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c19753bb1f9216dc6d89b267a89e7f7ac0156a85
Author: Volker Lendecke v...@samba.org
Date: Tue Jan 24 13:18:42 2012 +0100
s3: Add debug when a message is registered
We've always had the corresponding deregister message
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Tue Jan 24 15:27:51 CET 2012 on sn-devel-104
---
Summary of changes:
source3/lib/messages.c |4
1 files changed, 4 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 12e3a48..947a274 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -281,6 +281,10 @@ NTSTATUS messaging_register(struct messaging_context
*msg_ctx,
{
struct messaging_callback *cb;
+ DEBUG(5, (Registering messaging pointer for type %u -
+ private_data=%p\n,
+ (unsigned)msg_type, private_data));
+
/*
* Only one callback per type
*/
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 7722e63 s3: Remove a typedef
via 637838a s3: Remove a typedef
from c19753b s3: Add debug when a message is registered
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7722e637b8d0c0ad5ff6bc76a5018c3253eda55d
Author: Volker Lendecke v...@samba.org
Date: Tue Jan 24 21:04:40 2012 +0100
s3: Remove a typedef
We have it in README.Coding to avoid typedef for structs, but I
think it also applies to enums.
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Tue Jan 24 22:45:50 CET 2012 on sn-devel-104
commit 637838a1a93d876338eeb38225ad5251f6d41677
Author: Volker Lendecke v...@samba.org
Date: Tue Jan 24 21:04:00 2012 +0100
s3: Remove a typedef
---
Summary of changes:
source3/utils/dbwrap_tool.c | 12 ++--
1 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c
index e178d5c..a74819a 100644
--- a/source3/utils/dbwrap_tool.c
+++ b/source3/utils/dbwrap_tool.c
@@ -28,9 +28,9 @@
#include messages.h
#include util_tdb.h
-typedef enum { OP_FETCH, OP_STORE, OP_DELETE, OP_ERASE, OP_LISTKEYS }
dbwrap_op;
+enum dbwrap_op { OP_FETCH, OP_STORE, OP_DELETE, OP_ERASE, OP_LISTKEYS };
-typedef enum { TYPE_INT32, TYPE_UINT32, TYPE_STRING, TYPE_HEX } dbwrap_type;
+enum dbwrap_type { TYPE_INT32, TYPE_UINT32, TYPE_STRING, TYPE_HEX };
static int dbwrap_tool_fetch_int32(struct db_context *db,
const char *keyname,
@@ -298,8 +298,8 @@ static int dbwrap_tool_listkeys(struct db_context *db,
}
struct dbwrap_op_dispatch_table {
- dbwrap_op op;
- dbwrap_type type;
+ enum dbwrap_op op;
+ enum dbwrap_type type;
int (*cmd)(struct db_context *db,
const char *keyname,
const char *data);
@@ -330,10 +330,10 @@ int main(int argc, const char **argv)
const char *dbname;
const char *opname;
- dbwrap_op op;
+ enum dbwrap_op op;
const char *keyname = ;
const char *keytype = int32;
- dbwrap_type type;
+ enum dbwrap_type type;
const char *valuestr = 0;
TALLOC_CTX *mem_ctx = talloc_stackframe();
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 612 s4-torture: For authenticated users, add AUTHENTICATED
USERS sid
via dc4ef9b dlz_bind9: for authenticated user, set the AUTHENTICATED
USERS sid in token
from 7722e63 s3: Remove a typedef
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 612b86717bea95edd66ded5bdfc6bc5f7bc2
Author: Amitay Isaacs ami...@gmail.com
Date: Wed Jan 25 10:01:10 2012 +1100
s4-torture: For authenticated users, add AUTHENTICATED USERS sid
Autobuild-User: Amitay Isaacs ami...@samba.org
Autobuild-Date: Wed Jan 25 01:36:02 CET 2012 on sn-devel-104
commit dc4ef9b57b7e5f6f44ccf799a26b497c6025609b
Author: Amitay Isaacs ami...@gmail.com
Date: Wed Jan 25 10:00:31 2012 +1100
dlz_bind9: for authenticated user, set the AUTHENTICATED USERS sid in token
---
Summary of changes:
source4/dns_server/dlz_bind9.c |5 +
source4/torture/rpc/remote_pac.c |4
2 files changed, 9 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c
index 549ae0d..6f6b1da 100644
--- a/source4/dns_server/dlz_bind9.c
+++ b/source4/dns_server/dlz_bind9.c
@@ -494,7 +494,12 @@ static NTSTATUS b9_generate_session_info_pac(struct
auth4_context *auth_context,
return status;
}
+ if (user_info_dc-info-authenticated) {
+ session_info_flags |= AUTH_SESSION_INFO_AUTHENTICATED;
+ }
+
session_info_flags |= AUTH_SESSION_INFO_SIMPLE_PRIVILEGES;
+
status = auth_generate_session_info(mem_ctx, NULL, NULL, user_info_dc,
session_info_flags, session_info);
if (!NT_STATUS_IS_OK(status)) {
diff --git a/source4/torture/rpc/remote_pac.c b/source4/torture/rpc/remote_pac.c
index caec1fd..625dfe7 100644
--- a/source4/torture/rpc/remote_pac.c
+++ b/source4/torture/rpc/remote_pac.c
@@ -85,6 +85,10 @@ static NTSTATUS test_generate_session_info_pac(struct
auth4_context *auth_ctx,
return nt_status;
}
+ if (user_info_dc-info-authenticated) {
+ session_info_flags |= AUTH_SESSION_INFO_AUTHENTICATED;
+ }
+
session_info_flags |= AUTH_SESSION_INFO_SIMPLE_PRIVILEGES;
nt_status = auth_generate_session_info(mem_ctx,
NULL,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9e6675e s3: improve the code in the AES encryption.
via fb235a3 s3: Fix bug #8674.
from 612 s4-torture: For authenticated users, add AUTHENTICATED
USERS sid
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9e6675e8d04f503bec0d620654f86e18149fcf88
Author: Matthieu Patou m...@matws.net
Date: Tue Jan 24 14:48:31 2012 -0800
s3: improve the code in the AES encryption.
Remove looping replace them by memcpy.
Fix bug #8674 (Buffer overflow in vfs_smb_traffic_analyzer).
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Wed Jan 25 03:12:14 CET 2012 on sn-devel-104
commit fb235a3be6372e40ff7f7ebbcd7905a08cb0
Author: Jeremy Allison j...@samba.org
Date: Tue Jan 24 14:41:30 2012 -0800
s3: Fix bug #8674.
Buffer overflow issue with AES encryption in samba traffic analyzer.
---
Summary of changes:
source3/modules/vfs_smb_traffic_analyzer.c | 19 +--
1 files changed, 9 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c
b/source3/modules/vfs_smb_traffic_analyzer.c
index 4d1ffbd..025fbbd 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -169,28 +169,27 @@ struct refcounted_sock {
static char *smb_traffic_analyzer_encrypt( TALLOC_CTX *ctx,
const char *akey, const char *str, size_t *len)
{
- int s1,s2,h,d;
+ int s1,s2,h;
AES_KEY key;
unsigned char filler[17]= ;
char *output;
- unsigned char crypted[18];
if (akey == NULL) return NULL;
samba_AES_set_encrypt_key((const unsigned char *) akey, 128, key);
s1 = strlen(str) / 16;
s2 = strlen(str) % 16;
- for (h = 0; h s2; h++) *(filler+h)=*(str+(s1*16)+h);
+ memcpy(filler, str + (s1*16), s2);
DEBUG(10, (smb_traffic_analyzer_send_data_socket: created %s
as filling block.\n, filler));
- output = talloc_array(ctx, char, (s1*16)+17 );
- d=0;
+
+ *len = ((s1 + 1)*16);
+ output = talloc_array(ctx, char, *len);
for (h = 0; h s1; h++) {
- samba_AES_encrypt((const unsigned char *) str+(16*h), crypted,
key);
- for (d = 0; d16; d++) output[d+(16*h)]=crypted[d];
+ samba_AES_encrypt((unsigned char *) str+(16*h), output+16*h,
+ key);
}
- samba_AES_encrypt( (const unsigned char *) str+(16*h), filler, key );
- for (d = 0;d 16; d++) output[d+(16*h)]=*(filler+d);
+ samba_AES_encrypt(filler, (const unsigned char *)(output+(16*h)), key);
*len = (s1*16)+16;
- return output;
+ return output;
}
/**
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ab5cdb3 Revert s3:build: for now do not require
gsskrb5_extract_authz_data_from_sec_context
via 23ddaa8 Revert build: Add -lz to wbinfo to fix build on some hosts
from 9e6675e s3: improve the code in the AES encryption.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ab5cdb31e98396fabce1e6f9d7fafe91d5a839d8
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 24 11:17:09 2012 +0100
Revert s3:build: for now do not require
gsskrb5_extract_authz_data_from_sec_context
This reverts commit 74abe369df26c58094a601dd6ff8c27c3d0b2b2a.
Having gsskrb5_extract_authz_data_from_sec_context as symbol in the
library is in indicator that gss_inquire_sec_context_by_oid() would work.
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Wed Jan 25 05:26:14 CET 2012 on sn-devel-104
commit 23ddaa858cc83085cbd4017fdb5b6bba870b8c1a
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 24 14:12:12 2012 +0100
Revert build: Add -lz to wbinfo to fix build on some hosts
This reverts commit 88daf798fec56a99e5eb3aed67f3b58572d97d34.
This is not needed as 5c88cfcc525290d0ad1c322401685c60c1abdf10 is the better
fix, see https://bugzilla.samba.org/show_bug.cgi?id=8711
metze
---
Summary of changes:
source3/Makefile.in |2 +-
source3/configure.in | 11 ++-
source3/wscript |8 +++-
3 files changed, 10 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 63ea283..a405a18 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3137,7 +3137,7 @@ bin/wbinfo@EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ)
@BUILD_POPT@ $(LIBTALLOC) $(
@echo Linking $@
@$(CC) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) \
$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
+ $(LIBWBCLIENT_LIBS)
bin/ntlm_auth@EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \
$(LIB_NONSMBD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
diff --git a/source3/configure.in b/source3/configure.in
index b1a3c08..1e09e48 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -4517,12 +4517,13 @@ if test x$with_ads_support != xno; then
fi
- # for now do not require gsskrb5_extract_authz_data_from_sec_context
- # as we do not use it
- if test x$ac_cv_func_ext_gss_get_name_attribute != xyes -a \
- x$ac_cv_func_ext_gss_inquire_sec_context_by_oid != xyes; then
- AC_MSG_WARN(need either gss_get_name_attribute or
gss_inquire_sec_context_by_oid in -lgssapi for PAC support)
+ if test x$ac_cv_func_ext_gss_get_name_attribute != xyes ; then
+if test x$ac_cv_func_ext_gsskrb5_extract_authz_data_from_sec_context !=
xyes -o \
+x$ac_cv_func_ext_gss_inquire_sec_context_by_oid != xyes
+then
+ AC_MSG_WARN(need either gss_get_name_attribute or
gsskrb5_extract_authz_data_from_sec_context and gss_inquire_sec_context_by_oid
in -lgssapi for PAC support)
use_ads=no
+fi
fi
if test x$use_ads = xyes; then
diff --git a/source3/wscript b/source3/wscript
index 552735f..1a5a5c4 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -805,12 +805,10 @@ return krb5_kt_resolve(context, WRFILE:api, keytab);
# gsskrb5_extract_authz_data_from_sec_context, but it is a
# clue that this Heimdal, which does the PAC processing we
# need on the standard gss_inquire_sec_context_by_oid
-#
-# For now do not require gsskrb5_extract_authz_data_from_sec_context,
-# as we do not use it.
if not conf.CONFIG_SET('HAVE_GSS_GET_NAME_ATTRIBUTE') and \
-not conf.CONFIG_SET('HAVE_GSS_INQUIRE_SEC_CONTEXT_BY_OID'):
-Logs.warn(need eiterh gss_get_name_attribute or
gss_inquire_sec_context_by_oid in -lgssapi for PAC support)
+not
(conf.CONFIG_SET('HAVE_GSSKRB5_EXTRACT_AUTHZ_DATA_FROM_SEC_CONTEXT') and \
+ conf.CONFIG_SET('HAVE_GSS_INQUIRE_SEC_CONTEXT_BY_OID')):
+Logs.warn(need eiterh gss_get_name_attribute or
gsskrb5_extract_authz_data_from_sec_context and gss_inquire_sec_context_by_oid
in -lgssapi for PAC support)
use_ads=False
if use_ads:
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 34e7d96 ldbedit: prevent a transaction warning on failure
from ab5cdb3 Revert s3:build: for now do not require
gsskrb5_extract_authz_data_from_sec_context
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 34e7d960d0065a51b5524630a6699834c9b362b1
Author: Kelly Yeoh ky...@au1.ibm.com
Date: Wed Jan 25 14:58:44 2012 +1100
ldbedit: prevent a transaction warning on failure
if a modify fails then cancel the transaction to prevent a dangling
transaction error
Signed-off-by: Andrew Tridgell tri...@samba.org
Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Wed Jan 25 07:06:40 CET 2012 on sn-devel-104
---
Summary of changes:
lib/ldb/tools/ldbedit.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/tools/ldbedit.c b/lib/ldb/tools/ldbedit.c
index aaf6d80..cf4ab3f 100644
--- a/lib/ldb/tools/ldbedit.c
+++ b/lib/ldb/tools/ldbedit.c
@@ -152,6 +152,7 @@ static int merge_edits(struct ldb_context *ldb,
if (ret != -1) {
modifies += (unsigned int) ret;
} else {
+ ldb_transaction_cancel(ldb);
return -1;
}
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via da8e8e5 s3:smb2_sessetup: call set_current_user_info() and reload_services() on success from 34e7d96 ldbedit: prevent a transaction warning on failure http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit da8e8e5fa5574eab635b9b7b7bb4ccd898889e85 Author: Stefan Metzmacher me...@samba.org Date: Wed Jan 25 05:22:38 2012 +0100 s3:smb2_sessetup: call set_current_user_info() and reload_services() on success This matches the smb1 code. metze Autobuild-User: Stefan Metzmacher me...@samba.org Autobuild-Date: Wed Jan 25 08:39:35 CET 2012 on sn-devel-104 --- Summary of changes: source3/smbd/smb2_sesssetup.c | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c index 0cd24c9..3163ac0 100644 --- a/source3/smbd/smb2_sesssetup.c +++ b/source3/smbd/smb2_sesssetup.c @@ -261,6 +261,12 @@ static NTSTATUS smbd_smb2_session_setup_krb5(struct smbd_smb2_session *session, goto fail; } + set_current_user_info(session-session_info-unix_info-sanitized_username, + session-session_info-unix_info-unix_name, + session-session_info-info-domain_name); + + reload_services(smb2req-sconn, conn_snum_used, true); + session-status = NT_STATUS_OK; /* @@ -473,6 +479,11 @@ static NTSTATUS smbd_smb2_common_ntlmssp_auth_return(struct smbd_smb2_session *s return NT_STATUS_LOGON_FAILURE; } + set_current_user_info(session-session_info-unix_info-sanitized_username, + session-session_info-unix_info-unix_name, + session-session_info-info-domain_name); + + reload_services(smb2req-sconn, conn_snum_used, true); session-status = NT_STATUS_OK; -- Samba Shared Repository
