r25035: Fix some more warnings, use service pointer rather than service number in...

[samba.git] / source4 / torture / smb2 / util.c

diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c
index da74e47c0ad15453ea4b5aca761d816ee854c28d..8c55813c8c2e244c6c5e38ba3b9f30d45847df33 100644 (file)
--- a/source4/torture/smb2/util.c
+++ b/source4/torture/smb2/util.c
@@ -7,7 +7,7 @@
    
    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 2 of the License, or
+   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,
@@ -16,8 +16,7 @@
    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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -27,6 +26,8 @@
 #include "lib/events/events.h"
 #include "system/time.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "param/param.h"
+#include "torture/smb2/proto.h"
 
 
 /*
@@ -175,9 +176,9 @@ static NTSTATUS smb2_create_complex(struct smb2_tree *tree, const char *fname,
                printf("(%s) " #field " not setup correctly: %s(%llu) => %s(%llu)\n", \
                        __location__, \
                        nt_time_string(tree, setfile.basic_info.in.field), \
-                       setfile.basic_info.in.field, \
+                       (unsigned long long)setfile.basic_info.in.field, \
                        nt_time_string(tree, fileinfo.basic_info.out.field), \
-                       fileinfo.basic_info.out.field); \
+                       (unsigned long long)fileinfo.basic_info.out.field); \
                status = NT_STATUS_INVALID_PARAMETER; \
        } \
 } while (0)
@@ -302,8 +303,8 @@ void torture_smb2_all_info(struct smb2_tree *tree, struct smb2_handle handle)
 BOOL torture_smb2_connection(TALLOC_CTX *mem_ctx, struct smb2_tree **tree)
 {
        NTSTATUS status;
-       const char *host = lp_parm_string(-1, "torture", "host");
-       const char *share = lp_parm_string(-1, "torture", "share");
+       const char *host = lp_parm_string(NULL, "torture", "host");
+       const char *share = lp_parm_string(NULL, "torture", "share");
        struct cli_credentials *credentials = cmdline_credentials;
 
        status = smb2_connect(mem_ctx, host, share, credentials, tree,