summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/net_ads.c2
-rw-r--r--source3/utils/net_ads_gpo.c1
-rw-r--r--source3/utils/net_proto.h6
-rw-r--r--source3/utils/ntlm_auth.c1
4 files changed, 6 insertions, 4 deletions
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index ef28fc7008..71181990b5 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -25,10 +25,10 @@
#include "librpc/gen_ndr/ndr_krb5pac.h"
#include "../librpc/gen_ndr/cli_spoolss.h"
#include "nsswitch/libwbclient/wbclient.h"
+#include "ads.h"
#include "libads/cldap.h"
#include "libads/dns.h"
#include "../libds/common/flags.h"
-#include "ads.h"
#include "librpc/gen_ndr/libnet_join.h"
#include "libnet/libnet_join.h"
#include "smb_krb5.h"
diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c
index 05c3676160..57396c76e3 100644
--- a/source3/utils/net_ads_gpo.c
+++ b/source3/utils/net_ads_gpo.c
@@ -19,6 +19,7 @@
#include "includes.h"
#include "utils/net.h"
+#include "ads.h"
#include "../libgpo/gpo.h"
#include "libgpo/gpo_proto.h"
#include "../libds/common/flags.h"
diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index 9f3fe155a4..4791223f2d 100644
--- a/source3/utils/net_proto.h
+++ b/source3/utils/net_proto.h
@@ -45,9 +45,9 @@ void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid,
enum netr_SchannelType get_sec_channel_type(const char *param);
/* The following definitions come from utils/net_ads.c */
-
-ADS_STATUS ads_startup(struct net_context *c, bool only_own_domain, ADS_STRUCT **ads);
-ADS_STATUS ads_startup_nobind(struct net_context *c, bool only_own_domain, ADS_STRUCT **ads);
+struct ads_struct;
+ADS_STATUS ads_startup(struct net_context *c, bool only_own_domain, struct ads_struct **ads);
+ADS_STATUS ads_startup_nobind(struct net_context *c, bool only_own_domain, struct ads_struct **ads);
int net_ads_check_our_domain(struct net_context *c);
int net_ads_check(struct net_context *c);
int net_ads_user(struct net_context *c, int argc, const char **argv);
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 971ba96220..1ddc94b8f7 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -31,6 +31,7 @@
#include "smb_krb5.h"
#include <iniparser.h>
#include "../lib/crypto/arcfour.h"
+#include "libads/kerberos_proto.h"
#ifndef PAM_WINBIND_CONFIG_FILE
#define PAM_WINBIND_CONFIG_FILE "/etc/security/pam_winbind.conf"