[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated
via 92e4c21 s4:auth/gensec_gssapi: let gensec_gssapi_update() return
NT_STATUS_LOGON_FAILURE for unknown errors
from 786cbeb s3:configure: require external talloc >= 2.1.2
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 92e4c218156fd99627b1b8dc3696c6820affbb2f
Author: Stefan Metzmacher
Date: Fri Mar 13 14:39:10 2015 +0100
s4:auth/gensec_gssapi: let gensec_gssapi_update() return
NT_STATUS_LOGON_FAILURE for unknown errors
The 'nt_status' variable is set to NT_STATUS_OK before.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11164
Signed-off-by: Stefan Metzmacher
Reviewed-by: Andrew Bartlett
(cherry picked from commit 09b3e42e70b35bfa1985e70780a67085644b9914)
Autobuild-User(v4-0-test): Karolin Seeger
Autobuild-Date(v4-0-test): Thu Apr 9 22:54:29 CEST 2015 on sn-devel-104
---
Summary of changes:
source4/auth/gensec/gensec_gssapi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/auth/gensec/gensec_gssapi.c
b/source4/auth/gensec/gensec_gssapi.c
index 2b09665..b9e5c37 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -643,14 +643,14 @@ static NTSTATUS gensec_gssapi_update(struct
gensec_security *gensec_security,
gensec_security->gensec_role ==
GENSEC_CLIENT ? "client" : "server",
gensec_gssapi_state->gss_exchange_count,
gssapi_error_string(out_mem_ctx,
maj_stat, min_stat, gensec_gssapi_state->gss_oid)));
- return nt_status;
+ return NT_STATUS_LOGON_FAILURE;
}
} else {
DEBUG(1, ("GSS %s Update(%d) failed: %s\n",
gensec_security->gensec_role == GENSEC_CLIENT
? "client" : "server",
gensec_gssapi_state->gss_exchange_count,
gssapi_error_string(out_mem_ctx, maj_stat,
min_stat, gensec_gssapi_state->gss_oid)));
- return nt_status;
+ return NT_STATUS_LOGON_FAILURE;
}
break;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0c6c081 s4:torture/winbind: add
torture:winbindd_domain_without_prefix option
via 86f29d6 s4:torture/local: add more torture_assert() checks
via 85827c5 selftest/Samba4: use 'testallowed account' instead of 'test
allowed'
via ff5f466 selftest/knownfail: remove unused
^samba4.winbind.struct.show_sequence\(ad_dc\) line
from 2bca4cd rpcclient: Fix the timeout command
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0c6c081dc4e743c142a59d90c9e7f5b6e4cf5bd1
Author: Stefan Metzmacher
Date: Sat Mar 28 10:04:30 2015 +0100
s4:torture/winbind: add torture:winbindd_domain_without_prefix option
We should not assume that names in the domain
specified by 'torture:winbindd_netbios_domain' have no DOMAIN\ prefix.
On an AD DC we prefix all principals.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11183
Signed-off-by: Stefan Metzmacher
Reviewed-by: Andreas Schneider
Autobuild-User(master): Stefan Metzmacher
Autobuild-Date(master): Thu Apr 9 19:35:38 CEST 2015 on sn-devel-104
commit 86f29d62a6ebb6c0245c07a9d8e7524ac0b93940
Author: Stefan Metzmacher
Date: Sun Mar 29 11:21:16 2015 +0200
s4:torture/local: add more torture_assert() checks
We need to make sure we return when torture_assert_passwd_equal()
or torture_assert_group_equal() fails.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11183
Signed-off-by: Stefan Metzmacher
Reviewed-by: Andreas Schneider
commit 85827c5292fca0eef565b0361948405aa662c59b
Author: Stefan Metzmacher
Date: Sun Mar 29 11:15:29 2015 +0200
selftest/Samba4: use 'testallowed account' instead of 'test allowed'
local.nss test might print lines starting with 'test allowed:...'
and that confused the subunit parser.
Signed-off-by: Stefan Metzmacher
Reviewed-by: Andreas Schneider
commit ff5f46682566452dc28123e052bb32216ebf1e14
Author: Stefan Metzmacher
Date: Sat Mar 28 10:07:41 2015 +0100
selftest/knownfail: remove unused
^samba4.winbind.struct.show_sequence\(ad_dc\) line
Signed-off-by: Stefan Metzmacher
Reviewed-by: Andreas Schneider
---
Summary of changes:
selftest/knownfail | 1 -
selftest/target/Samba4.pm | 17 ++-
source4/selftest/tests.py | 6 +-
source4/torture/local/nss_tests.c | 255 +++--
source4/torture/winbind/struct_based.c | 8 +-
5 files changed, 164 insertions(+), 123 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/knownfail b/selftest/knownfail
index c16e916..d4a6923 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -241,7 +241,6 @@
#
# The Samba4 winbind does not cover the full winbind protocol, so these are
expected
#
-^samba4.winbind.struct.show_sequence\(ad_dc\)
^samba.blackbox.wbinfo\(ad_dc_ntvfs:local\).wbinfo -N against ad_dc_ntvfs
^samba.blackbox.wbinfo\(ad_dc_ntvfs:local\).wbinfo -I against ad_dc_ntvfs
^samba.blackbox.wbinfo\(ad_dc_ntvfs:local\).wbinfo --trusted-domains against
ad_dc_ntvfs
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 9d765c4..26f6dda 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -816,8 +816,9 @@ sub provision_raw_step2($$$)
return undef;
}
+ my $testallowed_account = "testallowed";
my $samba_tool_cmd = Samba::bindir_path($self, "samba-tool")
- . " user add --configfile=$ctx->{smb_conf} testallowed
$ctx->{password}";
+ . " user add --configfile=$ctx->{smb_conf} $testallowed_account
$ctx->{password}";
unless (system($samba_tool_cmd) == 0) {
warn("Unable to add testallowed user: \n$samba_tool_cmd\n");
return undef;
@@ -830,12 +831,13 @@ sub provision_raw_step2($$$)
$base_dn = "DC=$ctx->{netbiosname}";
}
- my $user_dn = "cn=testallowed,cn=users,$base_dn";
+ my $user_dn = "cn=$testallowed_account,cn=users,$base_dn";
+ $testallowed_account = "testallowed account";
open(LDIF, "|$ldbmodify -H $ctx->{privatedir}/sam.ldb");
print LDIF "dn: $user_dn
changetype: modify
replace: samAccountName
-samAccountName: test allowed
+samAccountName: $testallowed_account
-
";
close(LDIF);
@@ -869,9 +871,9 @@ userPrincipalName: testdenied_upn\@$ctx->{realm}.upn
close(LDIF);
$samba_tool_cmd = Samba::bindir_path($self, "samba-tool")
- . " group addmembers --configfile=$ctx->{smb_conf} 'Allowed RODC
Password Replication Group' 'test allowed'";
+ . " group addmembers --configfile=$ctx->{smb_conf} 'Allowed RODC
Password Replication Group' '$testallowed_account'";
unless (system($samba
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2bca4cd rpcclient: Fix the timeout command
from e66e06b fss: Fix CID 1293354 Wrong operator used
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2bca4cdc6f83dce48c73a33288c4fd3ae80f883b
Author: Andreas Schneider
Date: Tue Apr 7 16:12:18 2015 +0200
rpcclient: Fix the timeout command
https://bugzilla.samba.org/show_bug.cgi?id=11199
Signed-off-by: Andreas Schneider
Reviewed-by: Stefan Metzmacher
Autobuild-User(master): Andreas Schneider
Autobuild-Date(master): Thu Apr 9 16:57:15 CEST 2015 on sn-devel-104
---
Summary of changes:
source3/rpcclient/rpcclient.c | 24
1 file changed, 8 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 47789f4..4908518 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -487,8 +487,6 @@ static NTSTATUS cmd_seal(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
static NTSTATUS cmd_timeout(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
int argc, const char **argv)
{
- struct cmd_list *tmp;
-
if (argc > 2) {
printf("Usage: %s timeout\n", argv[0]);
return NT_STATUS_OK;
@@ -496,19 +494,6 @@ static NTSTATUS cmd_timeout(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
if (argc == 2) {
timeout = atoi(argv[1]);
-
- for (tmp = cmd_list; tmp; tmp = tmp->next) {
-
- struct cmd_set *tmp_set;
-
- for (tmp_set = tmp->cmd_set; tmp_set->name; tmp_set++) {
- if (tmp_set->rpc_pipe == NULL) {
- continue;
- }
-
- rpccli_set_timeout(tmp_set->rpc_pipe, timeout);
- }
- }
}
printf("timeout is %d\n", timeout);
@@ -803,6 +788,11 @@ static NTSTATUS do_cmd(struct cli_state *cli,
}
}
+ /* Set timeout for new connections */
+ if (cmd_entry->rpc_pipe) {
+ rpccli_set_timeout(cmd_entry->rpc_pipe, timeout);
+ }
+
/* Run command */
if ( cmd_entry->returntype == RPC_RTYPE_NTSTATUS ) {
@@ -1140,7 +1130,9 @@ out_free:
/* Load command lists */
rpcclient_cli_state = cli;
- timeout = cli_set_timeout(cli, 1);
+
+ timeout = 1;
+ cli_set_timeout(cli, timeout);
cmd_set = rpcclient_command_list;
--
Samba Shared Repository
