summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2012-01-30 10:53:18 +0100
committerAndreas Schneider <asn@cryptomilk.org>2012-02-01 21:54:21 +0100
commit8080dbad78edbc26c8ece8ae7f1abc27f0d7afd4 (patch)
tree2761fe7d45b1864f21f3d4d8dadca0337b99b05d /source3/libsmb
parent8c66c8c756bde8654a3c1d07082b0ca5d357dc29 (diff)
downloadsamba-8080dbad78edbc26c8ece8ae7f1abc27f0d7afd4.tar.gz
samba-8080dbad78edbc26c8ece8ae7f1abc27f0d7afd4.tar.bz2
samba-8080dbad78edbc26c8ece8ae7f1abc27f0d7afd4.zip
s3-lib: Fix util_cmdline which doesn't use popt.
This creates its own header file for util_cmdline so it doesn't need to link against popt. This should fix linking on FreeBSD.
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/cliconnect.c2
-rw-r--r--source3/libsmb/libsmb_dir.c2
-rw-r--r--source3/libsmb/proto.h1
3 files changed, 3 insertions, 2 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 76e32565e4..146fc3d3b4 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -22,7 +22,7 @@
#include "includes.h"
#include "libsmb/libsmb.h"
-#include "popt_common.h"
+#include "auth_info.h"
#include "../libcli/auth/libcli_auth.h"
#include "../libcli/auth/spnego.h"
#include "smb_krb5.h"
diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index 8d3d12d86a..ef93dd064b 100644
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -24,7 +24,7 @@
#include "includes.h"
#include "libsmb/libsmb.h"
-#include "popt_common.h"
+#include "auth_info.h"
#include "libsmbclient.h"
#include "libsmb_internal.h"
#include "rpc_client/cli_pipe.h"
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 8dac82358b..9e03ec4798 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -27,6 +27,7 @@
#define _LIBSMB_PROTO_H_
#include "ads.h"
+#include "auth_info.h"
struct smb_trans_enc_state;