[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-681-gf752152
Jelmer Vernooij
jelmer at samba.org
Sat Feb 9 14:04:28 GMT 2008
The branch, v4-0-test has been updated
via f7521525e42d62e96cc6f55fb1b23644a60fc36d (commit)
via 94dedaf6ed55b146a0123407137f7ee4cfd41283 (commit)
via d19d27f406c0377d98c9fe9da9284dcebd373bb7 (commit)
via 9705263a6c58d4ade556d17db2009dbb85291b22 (commit)
from 41309dc8627e707cee226a76238b9a70d417a345 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit f7521525e42d62e96cc6f55fb1b23644a60fc36d
Merge: 94dedaf6ed55b146a0123407137f7ee4cfd41283 41309dc8627e707cee226a76238b9a70d417a345
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 9 15:04:03 2008 +0100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
commit 94dedaf6ed55b146a0123407137f7ee4cfd41283
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 9 14:42:55 2008 +0100
Ignore kinit with pkinit test failures for now.
commit d19d27f406c0377d98c9fe9da9284dcebd373bb7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 9 14:26:46 2008 +0100
torture: Merge util.c into util_smb.c
commit 9705263a6c58d4ade556d17db2009dbb85291b22
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Feb 9 14:24:24 2008 +0100
Move nt_time_equal() to libutil.
-----------------------------------------------------------------------
Summary of changes:
source/lib/util/time.c | 8 +++++
source/lib/util/time.h | 5 ++-
source/samba4-knownfail | 2 +
source/torture/config.mk | 2 +-
source/torture/util.c | 73 ---------------------------------------------
source/torture/util_smb.c | 39 ++++++++++++++++++++++++
6 files changed, 54 insertions(+), 75 deletions(-)
delete mode 100644 source/torture/util.c
Changeset truncated at 500 lines:
diff --git a/source/lib/util/time.c b/source/lib/util/time.c
index fc51498..a181885 100644
--- a/source/lib/util/time.c
+++ b/source/lib/util/time.c
@@ -612,3 +612,11 @@ _PUBLIC_ int get_time_zone(time_t t)
return 0;
return tm_diff(&tm_utc,tm);
}
+
+/**
+ check if 2 NTTIMEs are equal.
+*/
+bool nt_time_equal(NTTIME *t1, NTTIME *t2)
+{
+ return *t1 == *t2;
+}
diff --git a/source/lib/util/time.h b/source/lib/util/time.h
index 557c5d4..1ab976c 100644
--- a/source/lib/util/time.h
+++ b/source/lib/util/time.h
@@ -224,6 +224,9 @@ _PUBLIC_ void nttime_to_timeval(struct timeval *tv, NTTIME t);
*/
_PUBLIC_ int get_time_zone(time_t t);
-
+/**
+ check if 2 NTTIMEs are equal.
+*/
+bool nt_time_equal(NTTIME *t1, NTTIME *t2);
#endif /* _SAMBA_TIME_H_ */
diff --git a/source/samba4-knownfail b/source/samba4-knownfail
index b1b2140..cf5f97c 100644
--- a/source/samba4-knownfail
+++ b/source/samba4-knownfail
@@ -34,3 +34,5 @@ RPC-NETLOGON.*.GetTrustPasswords
BASE-CHARSET.*.Testing partial surrogate
.*NET-API-DELSHARE.* # DelShare isn't implemented yet
RAP.*netservergetinfo
+kinit with pkinit # fails with: salt type 3 not supported
+
diff --git a/source/torture/config.mk b/source/torture/config.mk
index 0ee7873..2666a1d 100644
--- a/source/torture/config.mk
+++ b/source/torture/config.mk
@@ -14,7 +14,7 @@ PUBLIC_DEPENDENCIES = \
LIBTALLOC
[SUBSYSTEM::TORTURE_UTIL]
-OBJ_FILES = util.o util_smb.o
+OBJ_FILES = util_smb.o
PRIVATE_DEPENDENCIES = LIBCLI_RAW
PUBLIC_PROTO_HEADER = util.h
PUBLIC_DEPENDENCIES = POPT_CREDENTIALS
diff --git a/source/torture/util.c b/source/torture/util.c
deleted file mode 100644
index 0e9dda4..0000000
--- a/source/torture/util.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- SMB torture tester utility functions
- Copyright (C) Jelmer Vernooij 2006
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "system/filesys.h"
-#include "system/wait.h"
-#include "torture/torture.h"
-#include "libcli/raw/interfaces.h"
-#include "libcli/raw/libcliraw.h"
-
-/**
- check if 2 NTTIMEs are equal.
-*/
-bool nt_time_equal(NTTIME *t1, NTTIME *t2)
-{
- return *t1 == *t2;
-}
-
-NTSTATUS torture_second_tcon(TALLOC_CTX *mem_ctx,
- struct smbcli_session *session,
- const char *sharename,
- struct smbcli_tree **res)
-{
- union smb_tcon tcon;
- struct smbcli_tree *result;
- TALLOC_CTX *tmp_ctx;
- NTSTATUS status;
-
- if ((tmp_ctx = talloc_new(mem_ctx)) == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
-
- result = smbcli_tree_init(session, tmp_ctx, false);
- if (result == NULL) {
- talloc_free(tmp_ctx);
- return NT_STATUS_NO_MEMORY;
- }
-
- tcon.generic.level = RAW_TCON_TCONX;
- tcon.tconx.in.flags = 0;
-
- /* Ignore share mode security here */
- tcon.tconx.in.password = data_blob(NULL, 0);
- tcon.tconx.in.path = sharename;
- tcon.tconx.in.device = "?????";
-
- status = smb_raw_tcon(result, tmp_ctx, &tcon);
- if (!NT_STATUS_IS_OK(status)) {
- talloc_free(tmp_ctx);
- return status;
- }
-
- result->tid = tcon.tconx.out.tid;
- *res = talloc_steal(mem_ctx, result);
- talloc_free(tmp_ctx);
- return NT_STATUS_OK;
-}
diff --git a/source/torture/util_smb.c b/source/torture/util_smb.c
index de7303b..ddf7b85 100644
--- a/source/torture/util_smb.c
+++ b/source/torture/util_smb.c
@@ -863,3 +863,42 @@ _PUBLIC_ struct torture_test *torture_suite_add_1smb_test(
}
+NTSTATUS torture_second_tcon(TALLOC_CTX *mem_ctx,
+ struct smbcli_session *session,
+ const char *sharename,
+ struct smbcli_tree **res)
+{
+ union smb_tcon tcon;
+ struct smbcli_tree *result;
+ TALLOC_CTX *tmp_ctx;
+ NTSTATUS status;
+
+ if ((tmp_ctx = talloc_new(mem_ctx)) == NULL) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ result = smbcli_tree_init(session, tmp_ctx, false);
+ if (result == NULL) {
+ talloc_free(tmp_ctx);
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ tcon.generic.level = RAW_TCON_TCONX;
+ tcon.tconx.in.flags = 0;
+
+ /* Ignore share mode security here */
+ tcon.tconx.in.password = data_blob(NULL, 0);
+ tcon.tconx.in.path = sharename;
+ tcon.tconx.in.device = "?????";
+
+ status = smb_raw_tcon(result, tmp_ctx, &tcon);
+ if (!NT_STATUS_IS_OK(status)) {
+ talloc_free(tmp_ctx);
+ return status;
+ }
+
+ result->tid = tcon.tconx.out.tid;
+ *res = talloc_steal(mem_ctx, result);
+ talloc_free(tmp_ctx);
+ return NT_STATUS_OK;
+}
--
Samba Shared Repository
More information about the samba-cvs
mailing list