Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 14:04:03 +0000 (15:04 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 14:04:03 +0000 (15:04 +0100)
source/lib/util/time.c
source/lib/util/time.h
source/samba4-knownfail
source/torture/config.mk
source/torture/util.c [deleted file]
source/torture/util_smb.c

index fc514980098a7877154c02000dbce1d60f1ff608..a18188580619378fe91a6f863cb3a0aa391d663d 100644 (file)
@@ -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;
+}
index 557c5d4eabb5594dd83a53b155fe3fb02d607988..1ab976ca78c1d3428abd461ac3e3028a003e02f2 100644 (file)
@@ -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_ */
index b1b2140fec18c44526919806131c14afaa80be5f..cf5f97ca74ced6bb9d6693e8da841badc3a29d1c 100644 (file)
@@ -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
+
index 0ee7873628e946b47132fad70fc331efe00ab3be..2666a1d0be3d317a6bf8e6ab6a92714344041a68 100644 (file)
@@ -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 (file)
index 0e9dda4..0000000
+++ /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;
-}
index de7303bac8b3241d1184d2e8e62c283fc2fb618b..ddf7b85c6360677c583407340516efca18c08765 100644 (file)
@@ -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;
+}