summaryrefslogtreecommitdiff
path: root/source4/include
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-08-12 04:55:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:57:54 -0500
commitfa8d37adae70a5f479262b722e47aa7fc21aaf5c (patch)
tree375b9389b7e6f7d2adc7c133058259595326918c /source4/include
parent5a4845ff8b44ef32cdb6d34ba5fc3359f9e3ef15 (diff)
downloadsamba-fa8d37adae70a5f479262b722e47aa7fc21aaf5c.tar.gz
samba-fa8d37adae70a5f479262b722e47aa7fc21aaf5c.tar.bz2
samba-fa8d37adae70a5f479262b722e47aa7fc21aaf5c.zip
r1756: merge volkers ldap client lib to samba4 for simo to start with the
ldap server code it's not compiled in yet... metze (This used to be commit 48939adca1332ff90f9287311c0e9ff3e2e5917a)
Diffstat (limited to 'source4/include')
-rw-r--r--source4/include/asn_1.h3
-rw-r--r--source4/include/includes.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/include/asn_1.h b/source4/include/asn_1.h
index 78cc340f44..6bd79e3fbe 100644
--- a/source4/include/asn_1.h
+++ b/source4/include/asn_1.h
@@ -35,10 +35,11 @@ typedef struct {
BOOL has_error;
} ASN1_DATA;
-
#define ASN1_APPLICATION(x) ((x)+0x60)
+#define ASN1_APPLICATION_SIMPLE(x) ((x)+0x40)
#define ASN1_SEQUENCE(x) ((x)+0x30)
#define ASN1_CONTEXT(x) ((x)+0xa0)
+#define ASN1_CONTEXT_SIMPLE(x) ((x)+0x80)
#define ASN1_GENERAL_STRING 0x1b
#define ASN1_OCTET_STRING 0x4
#define ASN1_OID 0x6
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 1e6cc0e5a4..3821269f2b 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -641,6 +641,7 @@ extern int errno;
#include "rewrite.h"
#include "smb.h"
#include "ads.h"
+#include "libcli/ldap/ldap.h"
#include "nameserv.h"
#include "secrets.h"