Merge branch 'master' of /home/tridge/samba/git/combined

diff --git a/lib/replace/system/filesys.h b/lib/replace/system/filesys.h
index 1cf6f231b7bb58815019d788efbbe61847d6e104..22e3d23f3e79a8ed2ee32728d99c1bfd6109073c 100644 (file)
--- a/lib/replace/system/filesys.h
+++ b/lib/replace/system/filesys.h
@@ -1,16 +1,16 @@
 #ifndef _system_filesys_h
 #define _system_filesys_h
-/* 
+/*
    Unix SMB/CIFS implementation.
 
    filesystem system include wrappers
 
    Copyright (C) Andrew Tridgell 2004
-   
+
      ** NOTE! The following LGPL license applies to the replace
      ** library. This does NOT imply that all of Samba is released
      ** under the LGPL
-   
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
@@ -53,23 +53,23 @@
 #include <acl/libacl.h>
 #endif
 
-#ifdef HAVE_SYS_FS_S5PARAM_H 
+#ifdef HAVE_SYS_FS_S5PARAM_H
 #include <sys/fs/s5param.h>
 #endif
 
 #if defined (HAVE_SYS_FILSYS_H) && !defined (_CRAY)
-#include <sys/filsys.h> 
+#include <sys/filsys.h>
 #endif
 
 #ifdef HAVE_SYS_STATFS_H
 # include <sys/statfs.h>
 #endif
 
-#ifdef HAVE_DUSTAT_H              
+#ifdef HAVE_DUSTAT_H
 #include <sys/dustat.h>
 #endif
 
-#ifdef HAVE_SYS_STATVFS_H          
+#ifdef HAVE_SYS_STATVFS_H
 #include <sys/statvfs.h>
 #endif
 
@@ -123,7 +123,7 @@
 #endif
 
 /* Some POSIX definitions for those without */
- 
+
 #ifndef S_IFDIR
 #define S_IFDIR         0x4000
 #endif

diff --git a/lib/replace/system/passwd.h b/lib/replace/system/passwd.h
index 9d7de34bce968ea6ff9c88c8ff9bcf3b60f6d246..b41608c551b5058b0e64236ba43b414726cf2a39 100644 (file)
--- a/lib/replace/system/passwd.h
+++ b/lib/replace/system/passwd.h
@@ -1,17 +1,17 @@
 #ifndef _system_passwd_h
 #define _system_passwd_h
 
-/* 
+/*
    Unix SMB/CIFS implementation.
 
    passwd system include wrappers
 
    Copyright (C) Andrew Tridgell 2004
-   
+
      ** NOTE! The following LGPL license applies to the replace
      ** library. This does NOT imply that all of Samba is released
      ** under the LGPL
-   
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
@@ -80,7 +80,7 @@ char *rep_getpass(const char *prompt);
 #define NGROUPS_MAX 32 /* Guess... */
 #endif
 
-/* what is the longest significant password available on your system? 
+/* what is the longest significant password available on your system?
  Knowing this speeds up password searches a lot */
 #ifndef PASSWORD_LENGTH
 #define PASSWORD_LENGTH 8

diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c
index 7d1c025f18833aeff72e18954d91d4ffd2e99399..81bdf342b210d959a648481e835b8d9d9b819269 100644 (file)
--- a/source4/torture/libnet/libnet_BecomeDC.c
+++ b/source4/torture/libnet/libnet_BecomeDC.c
@@ -140,6 +140,7 @@ static NTSTATUS test_apply_schema(struct test_become_dc_state *s,
        uint32_t i;
        int ret;
        bool ok;
+       uint64_t seq_num;
 
        DEBUG(0,("Analyze and apply schema objects\n"));
 
@@ -273,7 +274,7 @@ static NTSTATUS test_apply_schema(struct test_become_dc_state *s,
                                                         s_dsa,
                                                         uptodateness_vector,
                                                         c->gensec_skey,
-                                                        s, &objs);
+                                                        s, &objs, &seq_num);
        if (!W_ERROR_IS_OK(status)) {
                DEBUG(0,("Failed to commit objects: %s\n", win_errstr(status)));
                return werror_to_ntstatus(status);
@@ -447,6 +448,7 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data,
        struct repsFromTo1 *s_dsa;
        char *tmp_dns_name;
        uint32_t i;
+       uint64_t seq_num;
 
        s_dsa                   = talloc_zero(s, struct repsFromTo1);
        NT_STATUS_HAVE_NO_MEMORY(s_dsa);
@@ -514,7 +516,7 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data,
                                                         s_dsa,
                                                         uptodateness_vector,
                                                         c->gensec_skey,
-                                                        s, &objs);
+                                                        s, &objs, &seq_num);
        if (!W_ERROR_IS_OK(status)) {
                DEBUG(0,("Failed to commit objects: %s\n", win_errstr(status)));
                return werror_to_ntstatus(status);