diff options
| -rw-r--r-- | source4/headermap.txt | 46 | ||||
| -rw-r--r-- | source4/lib/registry/config.mk | 2 | ||||
| -rw-r--r-- | source4/rpc_server/config.mk | 2 | ||||
| -rw-r--r-- | source4/torture/torture.h | 2 | ||||
| -rw-r--r-- | source4/torture/ui.h | 1 |
5 files changed, 21 insertions, 32 deletions
diff --git a/source4/headermap.txt b/source4/headermap.txt index 0984dae1d9..d08807fbdc 100644 --- a/source4/headermap.txt +++ b/source4/headermap.txt @@ -31,9 +31,7 @@ auth/gensec/gensec.h: gensec.h gtk/common/gtk-smb.h: gtk-smb.h gtk/common/select.h: gtk/select.h librpc/ndr/libndr.h: ndr.h -lib/registry/registry.h: registry/registry.h -lib/registry/hive.h: registry/hive.h -lib/registry/patchfile.h: registry/patchfile.h +lib/registry/registry.h: registry.h libcli/util/werror.h: core/werror.h libcli/util/doserr.h: core/doserr.h libcli/util/ntstatus.h: core/ntstatus.h @@ -43,20 +41,20 @@ librpc/gen_ndr/dcerpc.h: gen_ndr/dcerpc.h librpc/gen_ndr/netlogon.h: gen_ndr/netlogon.h librpc/gen_ndr/ndr_misc.h: gen_ndr/ndr_misc.h librpc/gen_ndr/ndr_dcerpc.h: gen_ndr/ndr_dcerpc.h -librpc/gen_ndr/mgmt.h: dcerpc/mgmt.h -librpc/gen_ndr/ndr_mgmt.h: dcerpc/ndr_mgmt.h -librpc/gen_ndr/ndr_mgmt_c.h: dcerpc/ndr_mgmt_c.h -librpc/gen_ndr/epmapper.h: dcerpc/epmapper.h -librpc/gen_ndr/ndr_epmapper.h: dcerpc/ndr_epmapper.h -librpc/gen_ndr/ndr_epmapper_c.h: dcerpc/ndr_epmapper_c.h -librpc/gen_ndr/ndr_atsvc.h: dcerpc/ndr_atsvc.h -librpc/gen_ndr/atsvc.h: dcerpc/atsvc.h -librpc/gen_ndr/ndr_atsvc_c.h: dcerpc/ndr_atsvc_c.h +librpc/gen_ndr/mgmt.h: gen_ndr/mgmt.h +librpc/gen_ndr/ndr_mgmt.h: gen_ndr/ndr_mgmt.h +librpc/gen_ndr/ndr_mgmt_c.h: gen_ndr/ndr_mgmt_c.h +librpc/gen_ndr/epmapper.h: gen_ndr/epmapper.h +librpc/gen_ndr/ndr_epmapper.h: gen_ndr/ndr_epmapper.h +librpc/gen_ndr/ndr_epmapper_c.h: gen_ndr/ndr_epmapper_c.h +librpc/gen_ndr/ndr_atsvc.h: gen_ndr/ndr_atsvc.h +librpc/gen_ndr/atsvc.h: gen_ndr/atsvc.h +librpc/gen_ndr/ndr_atsvc_c.h: gen_ndr/ndr_atsvc_c.h librpc/gen_ndr/misc.h: gen_ndr/misc.h librpc/gen_ndr/lsa.h: gen_ndr/lsa.h -librpc/gen_ndr/samr.h: dcerpc/samr.h -librpc/gen_ndr/ndr_samr.h: dcerpc/ndr_samr.h -librpc/gen_ndr/ndr_samr_c.h: dcerpc/ndr_samr_c.h +librpc/gen_ndr/samr.h: gen_ndr/samr.h +librpc/gen_ndr/ndr_samr.h: gen_ndr/ndr_samr.h +librpc/gen_ndr/ndr_samr_c.h: gen_ndr/ndr_samr_c.h librpc/gen_ndr/security.h: gen_ndr/security.h auth/credentials/credentials.h: credentials.h auth/credentials/credentials_krb5.h: credentials/krb5.h @@ -69,32 +67,26 @@ libcli/auth/credentials.h: domain_credentials.h lib/charset/charset.h: charset.h libcli/ldap/ldap.h: ldap.h torture/torture.h: torture.h -torture/util.h: torture/util.h libcli/libcli.h: client.h librpc/gen_ndr/nbt.h: gen_ndr/nbt.h -librpc/gen_ndr/svcctl.h: dcerpc/svcctl.h -librpc/gen_ndr/ndr_svcctl.h: dcerpc/ndr_svcctl.h -librpc/gen_ndr/ndr_svcctl_c.h: dcerpc/ndr_svcctl_c.h +librpc/gen_ndr/svcctl.h: gen_ndr/svcctl.h +librpc/gen_ndr/ndr_svcctl.h: gen_ndr/ndr_svcctl.h +librpc/gen_ndr/ndr_svcctl_c.h: gen_ndr/ndr_svcctl_c.h lib/cmdline/popt_common.h: samba/popt.h lib/util/dlinklist.h: dlinklist.h lib/util/data_blob.h: util/data_blob.h lib/util/time.h: util/time.h version.h: samba/version.h param/param.h: param.h -dsdb/samdb/samdb.h: samdb.h -dsdb/schema/schema.h: samdb/schema.h lib/util/asn1.h: samba/asn1.h libcli/util/error.h: core/error.h lib/tdb_wrap.h: tdb_wrap.h lib/ldb_wrap.h: ldb_wrap.h torture/ui.h: torture/ui.h -torture/torture.h: torture/torture.h -librpc/gen_ndr/winbind.h: winbind.h -param/share.h: param/share.h +librpc/gen_ndr/winbind.h: gen_ndr/winbind.h +param/share.h: share.h lib/util/util_tdb.h: util_tdb.h lib/util/util_ldb.h: util_ldb.h lib/util/wrap_xattr.h: wrap_xattr.h -lib/events/events.h: events/events.h -lib/events/events_internal.h: events/events_internal.h -libcli/ldap/ldap_ndr.h: ldb/ldap_ndr.h +libcli/ldap/ldap_ndr.h: ldap_ndr.h lib/gencache/gencache.h: gencache.h diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 1deac1dd46..77b4ece552 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -39,7 +39,7 @@ PUBLIC_DEPENDENCIES = \ # End MODULE registry_ldb ################################################ -PUBLIC_HEADERS += $(addprefix lib/registry/, registry.h hive.h) +PUBLIC_HEADERS += lib/registry/registry.h [SUBSYSTEM::registry_common] PUBLIC_DEPENDENCIES = registry diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk index c2cf0e355a..1d1c51cc6e 100644 --- a/source4/rpc_server/config.mk +++ b/source4/rpc_server/config.mk @@ -11,8 +11,6 @@ OBJ_FILES = \ # End SUBSYSTEM DCERPC_COMMON ################################################ -PUBLIC_HEADERS += rpc_server/common/common.h - ################################################ # Start MODULE dcerpc_rpcecho [MODULE::dcerpc_rpcecho] diff --git a/source4/torture/torture.h b/source4/torture/torture.h index a5a6bc1cbf..26ecdb567b 100644 --- a/source4/torture/torture.h +++ b/source4/torture/torture.h @@ -36,6 +36,6 @@ extern int torture_numasync; struct torture_test; int torture_init(void); bool torture_register_suite(struct torture_suite *suite); -#include "torture/ui.h" + #endif /* __TORTURE_H__ */ diff --git a/source4/torture/ui.h b/source4/torture/ui.h index a90af21d4a..6645d9b012 100644 --- a/source4/torture/ui.h +++ b/source4/torture/ui.h @@ -384,5 +384,4 @@ bool torture_suite_init_tcase(struct torture_suite *suite, struct torture_context *torture_context_init(TALLOC_CTX *mem_ctx, const struct torture_ui_ops *ui_ops); - #endif /* __TORTURE_UI_H__ */ |