diff options
| author | Günther Deschner <gd@samba.org> | 2010-05-10 00:07:10 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-17 21:07:17 +0200 |
| commit | 3d5972c43f536b94122100e1e30f92a4f8441768 (patch) | |
| tree | 6bcc3f43474d06653ff2a067ffcdb5f878bdd5b2 /libgpo | |
| parent | ed8a98f6f4547fed6045a4b6793e9a91edd6597c (diff) | |
| download | samba-3d5972c43f536b94122100e1e30f92a4f8441768.tar.gz samba-3d5972c43f536b94122100e1e30f92a4f8441768.tar.bz2 samba-3d5972c43f536b94122100e1e30f92a4f8441768.zip | |
s3-libgpo: move group policy protos to where they belong.
Guenther
Diffstat (limited to 'libgpo')
| -rw-r--r-- | libgpo/gpext/gpext.c | 4 | ||||
| -rw-r--r-- | libgpo/gpo_fetch.c | 2 | ||||
| -rw-r--r-- | libgpo/gpo_ldap.c | 2 | ||||
| -rw-r--r-- | libgpo/gpo_sec.c | 2 | ||||
| -rw-r--r-- | libgpo/gpo_util.c | 2 |
5 files changed, 9 insertions, 3 deletions
diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c index b6cc410eec..5465774eb1 100644 --- a/libgpo/gpext/gpext.c +++ b/libgpo/gpext/gpext.c @@ -18,9 +18,13 @@ */ #include "includes.h" +#include "../libgpo/gpo.h" #include "../libgpo/gpext/gpext.h" #include "librpc/gen_ndr/ndr_misc.h" #include "lib/util/dlinklist.h" +#if _SAMBA_BUILD_ == 3 +#include "libgpo/gpo_proto.h" +#endif static struct gp_extension *extensions = NULL; diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c index 06c730cfa3..2a7cb9d858 100644 --- a/libgpo/gpo_fetch.c +++ b/libgpo/gpo_fetch.c @@ -32,6 +32,8 @@ #include "libgpo/ads_convenience.h" #include "libgpo/gpo_s4.h" #include "lib/util/util.h" +#else +#include "libgpo/gpo_proto.h" #endif /**************************************************************** diff --git a/libgpo/gpo_ldap.c b/libgpo/gpo_ldap.c index a884198ed5..2976826f1a 100644 --- a/libgpo/gpo_ldap.c +++ b/libgpo/gpo_ldap.c @@ -18,8 +18,8 @@ */ #include "includes.h" -#if _SAMBA_BUILD_ == 4 #include "libgpo/gpo.h" +#if _SAMBA_BUILD_ == 4 #include "libgpo/gpo_s4.h" #include "source4/libgpo/ads_convenience.h" #endif diff --git a/libgpo/gpo_sec.c b/libgpo/gpo_sec.c index f20746422c..6b5e77f20a 100644 --- a/libgpo/gpo_sec.c +++ b/libgpo/gpo_sec.c @@ -19,12 +19,12 @@ #include "includes.h" #include "libcli/security/dom_sid.h" +#include "../libgpo/gpo.h" #if _SAMBA_BUILD_ == 4 #include "libgpo/ads_convenience.h" #include "librpc/gen_ndr/security.h" #include "librpc/gen_ndr/ndr_misc.h" #include "../libcli/security/secace.h" -#include "../libgpo/gpo.h" #endif /**************************************************************** diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c index fdf4c6d1af..ef16329504 100644 --- a/libgpo/gpo_util.c +++ b/libgpo/gpo_util.c @@ -19,10 +19,10 @@ #define TALLOC_DEPRECATED 1 #include "includes.h" #include "librpc/gen_ndr/ndr_misc.h" +#include "../libgpo/gpo.h" #if _SAMBA_BUILD_ == 4 #include "system/filesys.h" #include "auth/auth.h" -#include "../libgpo/gpo.h" #include "../lib/talloc/talloc.h" #include "source4/libgpo/ads_convenience.h" #endif |