diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 04:02:47 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 04:02:47 +0100 |
| commit | 31fa08dcbdc643ec738474c0be471e77925f76fc (patch) | |
| tree | c4337b4bd77a31f4f593d8c94bbd15b796123117 /source4 | |
| parent | 5a56c0adf2c63602b819d052644cb14caf732438 (diff) | |
| parent | 7b186c48d365ae8eda81ae9a0af100d2214bee32 (diff) | |
| download | samba-31fa08dcbdc643ec738474c0be471e77925f76fc.tar.gz samba-31fa08dcbdc643ec738474c0be471e77925f76fc.tar.bz2 samba-31fa08dcbdc643ec738474c0be471e77925f76fc.zip | |
Merge branch 'master' of /home/jelmer/samba3
Conflicts:
lib/replace/README
lib/replace/libreplace.m4
lib/replace/replace.c
source3/include/proto.h
source3/lib/system.c
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/include/includes.h | 4 | ||||
| -rw-r--r-- | source4/torture/rpc/samlogon.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h index 08d6cdb5f6..f925e836c5 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -40,8 +40,10 @@ #ifndef _PRINTF_ATTRIBUTE #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2) #endif -#include "../lib/util/util.h" +#include "../lib/util/xfile.h" +#include "../lib/util/attr.h" #include "../lib/util/debug.h" +#include "../lib/util/util.h" #include "libcli/util/error.h" diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c index 9a707605e6..db4657e835 100644 --- a/source4/torture/rpc/samlogon.c +++ b/source4/torture/rpc/samlogon.c @@ -1567,7 +1567,7 @@ bool torture_rpc_samlogon(struct torture_context *torture) old_user_password = user_password; - test_ChangePasswordUser3(torture_join_samr_pipe(user_ctx), mem_ctx, + test_ChangePasswordUser3(torture_join_samr_pipe(user_ctx), torture, TEST_USER_NAME, 16 /* > 14 */, &user_password, NULL, 0, false); |