summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilco Baan Hofman <wilco@baanhofman.nl>2010-04-23 11:58:26 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-06-20 17:19:10 +0200
commita1fceac844a0a7690ab985fa08e6a08127e770bf (patch)
tree8fdb1099e708147d0fcd6173dcba122a30665598
parentb02571541998f2698a92be8729f4f0da869a0f99 (diff)
downloadsamba-a1fceac844a0a7690ab985fa08e6a08127e770bf.tar.gz
samba-a1fceac844a0a7690ab985fa08e6a08127e770bf.tar.bz2
samba-a1fceac844a0a7690ab985fa08e6a08127e770bf.zip
Rename files to reflect the libpolicy naming convention. Also fix the GNU make build.
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
-rw-r--r--source4/configure.ac1
-rw-r--r--source4/lib/policy/config.mk4
-rw-r--r--source4/lib/policy/gp_ldap.c (renamed from source4/lib/policy/gpo_ldap.c)2
-rw-r--r--source4/lib/policy/policy.h (renamed from source4/lib/policy/gpo.h)0
-rw-r--r--source4/lib/policy/wscript_build4
-rw-r--r--source4/main.mk2
-rw-r--r--source4/utils/net/net_gpo.c2
7 files changed, 9 insertions, 6 deletions
diff --git a/source4/configure.ac b/source4/configure.ac
index acc0a8a3ed..91d7a3be34 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -34,6 +34,7 @@ m4_include(../nsswitch/nsstest.m4)
m4_include(../pidl/config.m4)
AC_CONFIG_FILES(lib/registry/registry.pc)
+AC_CONFIG_FILES(lib/policy/policy.pc)
AC_CONFIG_FILES(librpc/dcerpc.pc)
AC_CONFIG_FILES(../librpc/ndr.pc)
AC_CONFIG_FILES(../librpc/ndr_standard.pc)
diff --git a/source4/lib/policy/config.mk b/source4/lib/policy/config.mk
index 831f8012e3..01bd1f4f28 100644
--- a/source4/lib/policy/config.mk
+++ b/source4/lib/policy/config.mk
@@ -1,4 +1,6 @@
[SUBSYSTEM::policy]
PRIVATE_DEPENDENCIES = LIBLDB LIBSAMBA-NET
-policy_OBJ_FILES = $(policydir)/gpo_ldap.o
+policy_OBJ_FILES = $(policydir)/gp_ldap.o
+
+PC_FILES += $(policydir)/policy.pc
diff --git a/source4/lib/policy/gpo_ldap.c b/source4/lib/policy/gp_ldap.c
index 4c44e83cb9..ee3da9d239 100644
--- a/source4/lib/policy/gpo_ldap.c
+++ b/source4/lib/policy/gp_ldap.c
@@ -29,7 +29,7 @@
#include "../libcli/security/dom_sid.h"
#include "libcli/security/security.h"
#include "../lib/talloc/talloc.h"
-#include "gpo.h"
+#include "policy.h"
struct gpo_stringmap {
const char *str;
diff --git a/source4/lib/policy/gpo.h b/source4/lib/policy/policy.h
index 2e58094608..2e58094608 100644
--- a/source4/lib/policy/gpo.h
+++ b/source4/lib/policy/policy.h
diff --git a/source4/lib/policy/wscript_build b/source4/lib/policy/wscript_build
index eef9683dc7..8575f902dd 100644
--- a/source4/lib/policy/wscript_build
+++ b/source4/lib/policy/wscript_build
@@ -1,9 +1,9 @@
#!/usr/bin/env python
bld.SAMBA_LIBRARY('policy',
- source='gpo_ldap.c',
+ source='gp_ldap.c',
pc_files='policy.pc',
public_deps='LIBLDB LIBSAMBA-NET',
- public_headers='gpo.h',
+ public_headers='policy.h',
vnum='0.0.1'
)
diff --git a/source4/main.mk b/source4/main.mk
index fc085c90bb..d57fad3854 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -60,5 +60,5 @@ mkinclude ../libcli/nbt/config.mk
mkinclude ../libcli/auth/config.mk
mkinclude ../libcli/drsuapi/config.mk
mkinclude ../libcli/samsync/config.mk
-mkinclude libgpo/config.mk
+mkinclude lib/policy/config.mk
mkinclude ../libcli/named_pipe_auth/config.mk
diff --git a/source4/utils/net/net_gpo.c b/source4/utils/net/net_gpo.c
index 9cedbe27c0..6301fc2129 100644
--- a/source4/utils/net/net_gpo.c
+++ b/source4/utils/net/net_gpo.c
@@ -26,7 +26,7 @@
#include "lib/ldb/include/ldb.h"
#include "auth/auth.h"
#include "param/param.h"
-#include "libgpo/gpo.h"
+#include "lib/policy/policy.h"
static int net_gpo_list_all_usage(struct net_context *ctx, int argc, const char **argv)
{