From 6df636422047b80f0844d2398fe4124f7bca05df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Matthias=20Dieter=20Walln=C3=B6fer?= Date: Sat, 27 Nov 2010 19:42:31 +0100 Subject: [PATCH] s4:drsuapi RPC server - fix "enum security_user_level" warning on Tru64 --- source4/rpc_server/drsuapi/addentry.c | 4 ++-- source4/rpc_server/drsuapi/dcesrv_drsuapi.c | 2 +- source4/rpc_server/drsuapi/dcesrv_drsuapi.h | 1 - source4/rpc_server/drsuapi/getncchanges.c | 4 ++-- source4/rpc_server/drsuapi/updaterefs.c | 4 ++-- source4/rpc_server/drsuapi/writespn.c | 4 ++-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/source4/rpc_server/drsuapi/addentry.c b/source4/rpc_server/drsuapi/addentry.c index c4f33d7d4f8..5f030a09511 100644 --- a/source4/rpc_server/drsuapi/addentry.c +++ b/source4/rpc_server/drsuapi/addentry.c @@ -25,10 +25,10 @@ #include "dsdb/samdb/samdb.h" #include "dsdb/common/util.h" #include "param/param.h" -#include "rpc_server/drsuapi/dcesrv_drsuapi.h" -#include "librpc/gen_ndr/ndr_drsuapi.h" #include "libcli/security/security.h" #include "libcli/security/session.h" +#include "rpc_server/drsuapi/dcesrv_drsuapi.h" +#include "librpc/gen_ndr/ndr_drsuapi.h" /* add special SPNs needed for DRS replication to machine accounts when diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c index 6829416107b..429fc314377 100644 --- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c +++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c @@ -25,9 +25,9 @@ #include "rpc_server/dcerpc_server.h" #include "rpc_server/common/common.h" #include "dsdb/samdb/samdb.h" -#include "rpc_server/drsuapi/dcesrv_drsuapi.h" #include "libcli/security/security.h" #include "libcli/security/session.h" +#include "rpc_server/drsuapi/dcesrv_drsuapi.h" #include "auth/auth.h" #include "param/param.h" #include "lib/messaging/irpc.h" diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.h b/source4/rpc_server/drsuapi/dcesrv_drsuapi.h index 1a9d8674854..49d1d42a9e7 100644 --- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.h +++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.h @@ -62,7 +62,6 @@ int drsuapi_search_with_extended_dn(struct ldb_context *ldb, const char * const *attrs, const char *filter); -enum security_user_level; WERROR drs_security_level_check(struct dcesrv_call_state *dce_call, const char* call, enum security_user_level minimum_level, const struct dom_sid *domain_sid); diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c index 9be076eec7f..822e628f2ff 100644 --- a/source4/rpc_server/drsuapi/getncchanges.c +++ b/source4/rpc_server/drsuapi/getncchanges.c @@ -27,11 +27,11 @@ #include "librpc/gen_ndr/ndr_drsblobs.h" #include "librpc/gen_ndr/ndr_drsuapi.h" #include "librpc/gen_ndr/ndr_security.h" +#include "libcli/security/security.h" +#include "libcli/security/session.h" #include "rpc_server/drsuapi/dcesrv_drsuapi.h" #include "rpc_server/dcerpc_server_proto.h" #include "../libcli/drsuapi/drsuapi.h" -#include "libcli/security/security.h" -#include "libcli/security/session.h" #include "lib/util/binsearch.h" #include "lib/util/tsort.h" #include "auth/session.h" diff --git a/source4/rpc_server/drsuapi/updaterefs.c b/source4/rpc_server/drsuapi/updaterefs.c index 649980763ea..2d62718f013 100644 --- a/source4/rpc_server/drsuapi/updaterefs.c +++ b/source4/rpc_server/drsuapi/updaterefs.c @@ -22,9 +22,9 @@ #include "includes.h" #include "rpc_server/dcerpc_server.h" #include "dsdb/samdb/samdb.h" -#include "rpc_server/drsuapi/dcesrv_drsuapi.h" -#include "libcli/security/session.h" #include "libcli/security/security.h" +#include "libcli/security/session.h" +#include "rpc_server/drsuapi/dcesrv_drsuapi.h" #include "auth/session.h" #include "librpc/gen_ndr/ndr_drsuapi.h" diff --git a/source4/rpc_server/drsuapi/writespn.c b/source4/rpc_server/drsuapi/writespn.c index 320232dcf91..652fd2c4b9b 100644 --- a/source4/rpc_server/drsuapi/writespn.c +++ b/source4/rpc_server/drsuapi/writespn.c @@ -24,11 +24,11 @@ #include "rpc_server/dcerpc_server.h" #include "dsdb/samdb/samdb.h" #include "dsdb/common/util.h" -#include "rpc_server/drsuapi/dcesrv_drsuapi.h" #include "system/kerberos.h" #include "auth/kerberos/kerberos.h" -#include "libcli/security/session.h" #include "libcli/security/security.h" +#include "libcli/security/session.h" +#include "rpc_server/drsuapi/dcesrv_drsuapi.h" #include "auth/session.h" /* -- 2.34.1