summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2010-08-05 10:49:53 +0200
committerAndreas Schneider <asn@samba.org>2010-08-05 12:08:31 +0200
commitce2a086119330a0a39e6d7423432c1b2e0da247b (patch)
tree8d40f57f40486b779a0a78b714c9ea309b58b3f9 /source3/include
parentc136b84f0d28d1a88c5918b06f81766a271a3780 (diff)
downloadsamba-ce2a086119330a0a39e6d7423432c1b2e0da247b.tar.gz
samba-ce2a086119330a0a39e6d7423432c1b2e0da247b.tar.bz2
samba-ce2a086119330a0a39e6d7423432c1b2e0da247b.zip
s3-popt: Only include popt-common.h when needed.
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h1
-rw-r--r--source3/include/popt_common.h2
-rw-r--r--source3/include/proto.h4
-rw-r--r--source3/include/smb.h2
4 files changed, 2 insertions, 7 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 318c747d53..fcc6fe0dcc 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -659,7 +659,6 @@ struct ntlmssp_state;
#include "client.h"
#include "session.h"
-#include "popt.h"
#include "mangle.h"
#include "module.h"
#include "nsswitch/winbind_client.h"
diff --git a/source3/include/popt_common.h b/source3/include/popt_common.h
index a6e43d2659..040fae9b21 100644
--- a/source3/include/popt_common.h
+++ b/source3/include/popt_common.h
@@ -58,4 +58,6 @@ struct user_auth_info {
bool use_ccache;
};
+void popt_common_set_auth_info(struct user_auth_info *auth_info);
+
#endif /* _POPT_COMMON_H */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index fe977262b6..2e081aa09a 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -655,10 +655,6 @@ pid_t pidfile_pid(const char *name);
void pidfile_create(const char *program_name);
void pidfile_unlink(void);
-/* The following definitions come from lib/popt_common.c */
-
-void popt_common_set_auth_info(struct user_auth_info *auth_info);
-
/* The following definitions come from lib/privileges.c */
bool get_privileges_for_sids(SE_PRIV *privileges, struct dom_sid *slist, int scount);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 53228ba979..ca71245547 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1859,8 +1859,6 @@ struct unix_error_map {
#define DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH 14
-#include "popt_common.h"
-
#define PORT_NONE 0
#ifndef LDAP_PORT
#define LDAP_PORT 389