[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Tue Jul 2 15:27:03 MDT 2013
The branch, master has been updated
via caf3af3 s3-winbind: Allow sec_initial_uid() to store creds.
via a4af4fa selftest: Use higher ip numbers.
via d5511b1 selftest: Add a newline to root entries in the nss files.
via 7392985 selftest: Fix domain name of plugindc.
via bf5bc72 torture: Don't segfault in smb2.session on error.
via d295e18 torture: Don't segfault in raw.session on error.
via 474eee0 torture: Fix comparsion of uninitalized bytes.
from 0b58eed tsocket: Pass the full port number to getaddrinfo().
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit caf3af33deeea9bee61a741fcc991285006cc6f5
Author: Andreas Schneider <asn at samba.org>
Date: Mon Jul 1 13:02:48 2013 +0200
s3-winbind: Allow sec_initial_uid() to store creds.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Tue Jul 2 23:26:24 CEST 2013 on sn-devel-104
commit a4af4fa9db768dce2e009ba132cf88525a9b8314
Author: Andreas Schneider <asn at samba.org>
Date: Mon Jul 1 13:02:47 2013 +0200
selftest: Use higher ip numbers.
127.0.0.2 is used by some distributions to resolve the own hostname.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit d5511b125ccfd9c46cad63796aa49258bcc0ae38
Author: Andreas Schneider <asn at samba.org>
Date: Mon Jul 1 13:02:46 2013 +0200
selftest: Add a newline to root entries in the nss files.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 7392985b2981cb82be5f99255faae1605972be53
Author: Andreas Schneider <asn at samba.org>
Date: Mon Jul 1 13:02:45 2013 +0200
selftest: Fix domain name of plugindc.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit bf5bc723da0605c7bc796f5e047e3f041db0b943
Author: Andreas Schneider <asn at samba.org>
Date: Mon Jul 1 13:02:44 2013 +0200
torture: Don't segfault in smb2.session on error.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit d295e18409a2e18e52c5bb76fec0e0540b6199cf
Author: Andreas Schneider <asn at samba.org>
Date: Mon Jul 1 13:02:43 2013 +0200
torture: Don't segfault in raw.session on error.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 474eee0df7893a3a4546e1c6ea47220700c5b99f
Author: Andreas Schneider <asn at samba.org>
Date: Tue Jul 2 15:24:40 2013 +0200
torture: Fix comparsion of uninitalized bytes.
As we compare string make sure we have the null terminator.
Found by valgrind.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
-----------------------------------------------------------------------
Summary of changes:
selftest/target/Samba.pm | 11 ++++++-----
selftest/target/Samba3.pm | 6 ++++--
selftest/target/Samba4.pm | 2 +-
source3/winbindd/winbindd_ccache_access.c | 2 +-
source4/torture/raw/session.c | 4 +++-
source4/torture/smb2/session.c | 2 +-
6 files changed, 16 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index fa18985..ab3851f 100644
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -150,11 +150,12 @@ sub get_interface($)
$netbiosname = lc($netbiosname);
my %interfaces = ();
- $interfaces{"locals3dc2"} = 2;
- $interfaces{"localmember3"} = 3;
- $interfaces{"localshare4"} = 4;
- $interfaces{"localktest6"} = 6;
- $interfaces{"maptoguest"} = 7;
+ $interfaces{"locals3dc2"} = 3;
+ $interfaces{"localmember3"} = 4;
+ $interfaces{"localshare4"} = 5;
+
+ $interfaces{"localktest6"} = 7;
+ $interfaces{"maptoguest"} = 8;
# 11-16 used by selftest.pl for client interfaces
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 91a8133..26f5e92 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1124,7 +1124,8 @@ $unix_name:x:$unix_uid:$unix_gids[0]:$unix_name gecos:$prefix_abs:/bin/false
pdbtest:x:$uid_pdbtest:$gid_nogroup:pdbtest gecos:$prefix_abs:/bin/false
";
if ($unix_uid != 0) {
- print PASSWD "root:x:$uid_root:$gid_root:root gecos:$prefix_abs:/bin/false";
+ print PASSWD "root:x:$uid_root:$gid_root:root gecos:$prefix_abs:/bin/false
+";
}
close(PASSWD);
@@ -1139,7 +1140,8 @@ domusers:X:$gid_domusers:
domadmins:X:$gid_domadmins:
";
if ($unix_gids[0] != 0) {
- print GROUP "root:x:$gid_root:";
+ print GROUP "root:x:$gid_root:
+";
}
close(GROUP);
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 495cc23..e279beb 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1465,7 +1465,7 @@ sub provision_plugin_s4_dc($$)
"domain controller",
"plugindc",
"PLUGINDOMAIN",
- "plugin.samba.example.com",
+ "plugindc.samba.example.com",
"2008",
"locDCpass1",
undef, $extra_smbconf_options,
diff --git a/source3/winbindd/winbindd_ccache_access.c b/source3/winbindd/winbindd_ccache_access.c
index 5557b95..7787b3e 100644
--- a/source3/winbindd/winbindd_ccache_access.c
+++ b/source3/winbindd/winbindd_ccache_access.c
@@ -168,7 +168,7 @@ static bool check_client_uid(struct winbindd_cli_state *state, uid_t uid)
return False;
}
- if (uid != ret_uid) {
+ if (uid != ret_uid && ret_uid != sec_initial_uid()) {
DEBUG(1, ("check_client_uid: Client lied about its uid: said %u, "
"actually was %u; denying access\n",
(unsigned int)uid, (unsigned int)ret_uid));
diff --git a/source4/torture/raw/session.c b/source4/torture/raw/session.c
index 5b5b782..1937ef7 100644
--- a/source4/torture/raw/session.c
+++ b/source4/torture/raw/session.c
@@ -70,6 +70,8 @@ static bool test_session_reauth1(struct torture_context *tctx,
torture_assert_ntstatus_ok_goto(tctx, status, ok, done, "setup2");
torture_assert_int_equal_goto(tctx, io.out.vuid, vuid1, ok, done, "setup2");
+ buf[dlen] = '\0';
+
num = smbcli_read(cli->tree, fnum, &buf, 0, dlen);
torture_assert_int_equal_goto(tctx, num, dlen, ok, done, "read file");
torture_assert_str_equal_goto(tctx, buf, data, ok, done, "read file");
@@ -238,7 +240,7 @@ static bool test_session_expire1(struct torture_context *tctx)
char fname[256];
union smb_fileinfo qfinfo;
uint16_t vuid;
- uint16_t fnum;
+ uint16_t fnum = 0;
struct smb_composite_sesssetup io_sesssetup;
size_t i;
diff --git a/source4/torture/smb2/session.c b/source4/torture/smb2/session.c
index 9592b5e..6901f47 100644
--- a/source4/torture/smb2/session.c
+++ b/source4/torture/smb2/session.c
@@ -863,7 +863,7 @@ static bool test_session_expire1(struct torture_context *tctx)
const char *host = torture_setting_string(tctx, "host", NULL);
const char *share = torture_setting_string(tctx, "share", NULL);
struct cli_credentials *credentials = cmdline_credentials;
- struct smb2_tree *tree;
+ struct smb2_tree *tree = NULL;
enum credentials_use_kerberos use_kerberos;
char fname[256];
struct smb2_handle _h1;
--
Samba Shared Repository
More information about the samba-cvs
mailing list