The branch, master has been updated via 59cc0c09d5413d1264758bef505856f5f56131e4 (commit) via 838b950138255beb7135a32d4429a74fec2bfe42 (commit) via f71db89256b65c3700eadaf44b2727623eb831fa (commit) via fc3ffedcfe173900d65f6fa7db3a3cf2608f9f68 (commit) from b6457c78d61992f12903ed0966d9d1608de68da8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 59cc0c09d5413d1264758bef505856f5f56131e4 Merge: 838b950138255beb7135a32d4429a74fec2bfe42 b6457c78d61992f12903ed0966d9d1608de68da8 Author: Jelmer Vernooij <jel...@samba.org> Date: Wed Feb 25 15:22:31 2009 +0100 Merge branch 'master' of ssh://git.samba.org/data/git/samba commit 838b950138255beb7135a32d4429a74fec2bfe42 Author: Jelmer Vernooij <jel...@samba.org> Date: Wed Feb 25 15:22:08 2009 +0100 Rerun pidl. commit f71db89256b65c3700eadaf44b2727623eb831fa Author: Jelmer Vernooij <jel...@samba.org> Date: Wed Feb 25 15:21:36 2009 +0100 Include header with NTSTATUS, as some IDL files use it. commit fc3ffedcfe173900d65f6fa7db3a3cf2608f9f68 Author: Jelmer Vernooij <jel...@samba.org> Date: Wed Feb 25 15:05:43 2009 +0100 Don't define _GNU_SOURCE if it's already defined on the command-line. ----------------------------------------------------------------------- Summary of changes: librpc/gen_ndr/dfs.h | 2 ++ librpc/gen_ndr/drsblobs.h | 2 ++ librpc/gen_ndr/drsuapi.h | 2 ++ librpc/gen_ndr/dssetup.h | 2 ++ librpc/gen_ndr/echo.h | 2 ++ librpc/gen_ndr/epmapper.h | 2 ++ librpc/gen_ndr/eventlog.h | 2 ++ librpc/gen_ndr/initshutdown.h | 2 ++ librpc/gen_ndr/krb5pac.h | 2 ++ librpc/gen_ndr/lsa.h | 2 ++ librpc/gen_ndr/misc.h | 2 ++ librpc/gen_ndr/named_pipe_auth.h | 2 ++ librpc/gen_ndr/nbt.h | 2 ++ librpc/gen_ndr/netlogon.h | 2 ++ librpc/gen_ndr/ntsvcs.h | 2 ++ librpc/gen_ndr/samr.h | 2 ++ librpc/gen_ndr/security.h | 2 ++ librpc/gen_ndr/spoolss.h | 2 ++ librpc/gen_ndr/srvsvc.h | 2 ++ librpc/gen_ndr/svcctl.h | 2 ++ librpc/gen_ndr/winreg.h | 2 ++ librpc/gen_ndr/wkssvc.h | 2 ++ librpc/gen_ndr/xattr.h | 2 ++ pidl/lib/Parse/Pidl/Samba4/Header.pm | 3 +++ pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 2 ++ 25 files changed, 51 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/librpc/gen_ndr/dfs.h b/librpc/gen_ndr/dfs.h index 07548c3..41be3bd 100644 --- a/librpc/gen_ndr/dfs.h +++ b/librpc/gen_ndr/dfs.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/misc.h" #ifndef _HEADER_netdfs #define _HEADER_netdfs diff --git a/librpc/gen_ndr/drsblobs.h b/librpc/gen_ndr/drsblobs.h index bb33464..190e012 100644 --- a/librpc/gen_ndr/drsblobs.h +++ b/librpc/gen_ndr/drsblobs.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/drsuapi.h" #include "librpc/gen_ndr/misc.h" #include "librpc/gen_ndr/samr.h" diff --git a/librpc/gen_ndr/drsuapi.h b/librpc/gen_ndr/drsuapi.h index e3d4803..8f9b165 100644 --- a/librpc/gen_ndr/drsuapi.h +++ b/librpc/gen_ndr/drsuapi.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/security.h" #include "librpc/gen_ndr/misc.h" #include "librpc/gen_ndr/samr.h" diff --git a/librpc/gen_ndr/dssetup.h b/librpc/gen_ndr/dssetup.h index d284a63..5d254fe 100644 --- a/librpc/gen_ndr/dssetup.h +++ b/librpc/gen_ndr/dssetup.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/misc.h" #ifndef _HEADER_dssetup #define _HEADER_dssetup diff --git a/librpc/gen_ndr/echo.h b/librpc/gen_ndr/echo.h index 79d4220..9c78304 100644 --- a/librpc/gen_ndr/echo.h +++ b/librpc/gen_ndr/echo.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #ifndef _HEADER_rpcecho #define _HEADER_rpcecho diff --git a/librpc/gen_ndr/epmapper.h b/librpc/gen_ndr/epmapper.h index e5155a8..ff80fbb 100644 --- a/librpc/gen_ndr/epmapper.h +++ b/librpc/gen_ndr/epmapper.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/misc.h" #ifndef _HEADER_epmapper #define _HEADER_epmapper diff --git a/librpc/gen_ndr/eventlog.h b/librpc/gen_ndr/eventlog.h index 2a9b824..b6e792f 100644 --- a/librpc/gen_ndr/eventlog.h +++ b/librpc/gen_ndr/eventlog.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/lsa.h" #include "librpc/gen_ndr/security.h" #ifndef _HEADER_eventlog diff --git a/librpc/gen_ndr/initshutdown.h b/librpc/gen_ndr/initshutdown.h index 014e2fe..913eb8f 100644 --- a/librpc/gen_ndr/initshutdown.h +++ b/librpc/gen_ndr/initshutdown.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/lsa.h" #ifndef _HEADER_initshutdown #define _HEADER_initshutdown diff --git a/librpc/gen_ndr/krb5pac.h b/librpc/gen_ndr/krb5pac.h index 73bd0d9..03b23bd 100644 --- a/librpc/gen_ndr/krb5pac.h +++ b/librpc/gen_ndr/krb5pac.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/security.h" #include "librpc/gen_ndr/netlogon.h" #include "librpc/gen_ndr/samr.h" diff --git a/librpc/gen_ndr/lsa.h b/librpc/gen_ndr/lsa.h index 03a0464..a6da7a6 100644 --- a/librpc/gen_ndr/lsa.h +++ b/librpc/gen_ndr/lsa.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/misc.h" #include "librpc/gen_ndr/security.h" #ifndef _HEADER_lsarpc diff --git a/librpc/gen_ndr/misc.h b/librpc/gen_ndr/misc.h index e000cb0..824483d 100644 --- a/librpc/gen_ndr/misc.h +++ b/librpc/gen_ndr/misc.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #ifndef _HEADER_misc #define _HEADER_misc diff --git a/librpc/gen_ndr/named_pipe_auth.h b/librpc/gen_ndr/named_pipe_auth.h index 7ca7444..e35c221 100644 --- a/librpc/gen_ndr/named_pipe_auth.h +++ b/librpc/gen_ndr/named_pipe_auth.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/netlogon.h" #ifndef _HEADER_named_pipe_auth #define _HEADER_named_pipe_auth diff --git a/librpc/gen_ndr/nbt.h b/librpc/gen_ndr/nbt.h index 1f3ad37..affbeff 100644 --- a/librpc/gen_ndr/nbt.h +++ b/librpc/gen_ndr/nbt.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/misc.h" #include "librpc/gen_ndr/security.h" #include "librpc/gen_ndr/svcctl.h" diff --git a/librpc/gen_ndr/netlogon.h b/librpc/gen_ndr/netlogon.h index d1038d7..892e770 100644 --- a/librpc/gen_ndr/netlogon.h +++ b/librpc/gen_ndr/netlogon.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/misc.h" #include "librpc/gen_ndr/lsa.h" #include "librpc/gen_ndr/samr.h" diff --git a/librpc/gen_ndr/ntsvcs.h b/librpc/gen_ndr/ntsvcs.h index 5021aa2..804c452 100644 --- a/librpc/gen_ndr/ntsvcs.h +++ b/librpc/gen_ndr/ntsvcs.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/winreg.h" #ifndef _HEADER_ntsvcs #define _HEADER_ntsvcs diff --git a/librpc/gen_ndr/samr.h b/librpc/gen_ndr/samr.h index 782987d..0447564 100644 --- a/librpc/gen_ndr/samr.h +++ b/librpc/gen_ndr/samr.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/misc.h" #include "librpc/gen_ndr/lsa.h" #include "librpc/gen_ndr/security.h" diff --git a/librpc/gen_ndr/security.h b/librpc/gen_ndr/security.h index 4fa9a80..32ea2ea 100644 --- a/librpc/gen_ndr/security.h +++ b/librpc/gen_ndr/security.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/misc.h" #define dom_sid2 dom_sid #define dom_sid28 dom_sid diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h index ff2eb1b..4ecb2a7 100644 --- a/librpc/gen_ndr/spoolss.h +++ b/librpc/gen_ndr/spoolss.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/misc.h" #include "librpc/gen_ndr/security.h" #include "librpc/gen_ndr/winreg.h" diff --git a/librpc/gen_ndr/srvsvc.h b/librpc/gen_ndr/srvsvc.h index 6467f72..4a8fd05 100644 --- a/librpc/gen_ndr/srvsvc.h +++ b/librpc/gen_ndr/srvsvc.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/security.h" #include "librpc/gen_ndr/svcctl.h" #ifndef _HEADER_srvsvc diff --git a/librpc/gen_ndr/svcctl.h b/librpc/gen_ndr/svcctl.h index 328d8ab..6ba0e4f 100644 --- a/librpc/gen_ndr/svcctl.h +++ b/librpc/gen_ndr/svcctl.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/misc.h" #include "librpc/gen_ndr/security.h" #ifndef _HEADER_svcctl diff --git a/librpc/gen_ndr/winreg.h b/librpc/gen_ndr/winreg.h index 79cf33e..e0300fd 100644 --- a/librpc/gen_ndr/winreg.h +++ b/librpc/gen_ndr/winreg.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/lsa.h" #include "librpc/gen_ndr/security.h" #ifndef _HEADER_winreg diff --git a/librpc/gen_ndr/wkssvc.h b/librpc/gen_ndr/wkssvc.h index dc12fe2..19aa126 100644 --- a/librpc/gen_ndr/wkssvc.h +++ b/librpc/gen_ndr/wkssvc.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/srvsvc.h" #include "librpc/gen_ndr/lsa.h" #ifndef _HEADER_wkssvc diff --git a/librpc/gen_ndr/xattr.h b/librpc/gen_ndr/xattr.h index 1148a0a..1ce58f7 100644 --- a/librpc/gen_ndr/xattr.h +++ b/librpc/gen_ndr/xattr.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include "libcli/util/ntstatus.h" + #include "librpc/gen_ndr/security.h" #ifndef _HEADER_xattr #define _HEADER_xattr diff --git a/pidl/lib/Parse/Pidl/Samba4/Header.pm b/pidl/lib/Parse/Pidl/Samba4/Header.pm index 0411466..5315957 100644 --- a/pidl/lib/Parse/Pidl/Samba4/Header.pm +++ b/pidl/lib/Parse/Pidl/Samba4/Header.pm @@ -407,6 +407,9 @@ sub Parse($) } pidl "#include <stdint.h>\n"; pidl "\n"; + # FIXME: Include this only if NTSTATUS was actually used + pidl choose_header("libcli/util/ntstatus.h", "core/ntstatus.h") . "\n"; + pidl "\n"; foreach (@{$ndr}) { ($_->{TYPE} eq "CPP_QUOTE") && HeaderQuote($_); diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index af6885f..0e4a7e2 100644 --- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -2548,7 +2548,9 @@ sub GenerateIncludes($) if (is_intree()) { $self->pidl("#include \"includes.h\""); } else { + $self->pidl("#ifndef _GNU_SOURCE"); $self->pidl("#define _GNU_SOURCE"); + $self->pidl("#endif"); $self->pidl("#include <stdint.h>"); $self->pidl("#include <stdlib.h>"); $self->pidl("#include <stdio.h>"); -- Samba Shared Repository