summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/auth/gensec/spnego_parse.c2
-rw-r--r--source4/auth/kerberos/gssapi_parse.c2
-rw-r--r--source4/ldap_server/ldap_server.c2
-rw-r--r--source4/lib/util/asn1.c (renamed from source4/libcli/util/asn1.c)2
-rw-r--r--source4/lib/util/asn1.h (renamed from source4/libcli/util/asn_1.h)2
-rw-r--r--source4/lib/util/config.mk5
-rw-r--r--source4/libcli/cldap/cldap.h2
-rw-r--r--source4/libcli/config.mk5
-rw-r--r--source4/libcli/ldap/ldap.c2
-rw-r--r--source4/libcli/ldap/ldap_client.c2
-rw-r--r--source4/libcli/ldap/ldap_controls.c2
-rw-r--r--source4/librpc/ndr/ndr_drsuapi.c2
12 files changed, 15 insertions, 15 deletions
diff --git a/source4/auth/gensec/spnego_parse.c b/source4/auth/gensec/spnego_parse.c
index 37f4f12278..8012a83ba8 100644
--- a/source4/auth/gensec/spnego_parse.c
+++ b/source4/auth/gensec/spnego_parse.c
@@ -23,7 +23,7 @@
#include "includes.h"
#include "auth/gensec/spnego.h"
#include "auth/gensec/gensec.h"
-#include "libcli/util/asn_1.h"
+#include "lib/util/asn1.h"
static bool read_negTokenInit(struct asn1_data *asn1, TALLOC_CTX *mem_ctx,
struct spnego_negTokenInit *token)
diff --git a/source4/auth/kerberos/gssapi_parse.c b/source4/auth/kerberos/gssapi_parse.c
index 4b1b178238..77e907d3fa 100644
--- a/source4/auth/kerberos/gssapi_parse.c
+++ b/source4/auth/kerberos/gssapi_parse.c
@@ -22,7 +22,7 @@
*/
#include "includes.h"
-#include "libcli/util/asn_1.h"
+#include "lib/util/asn1.h"
#include "auth/gensec/gensec.h"
/*
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index fcc9435ead..8380775c28 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -27,7 +27,7 @@
#include "auth/credentials/credentials.h"
#include "librpc/gen_ndr/ndr_samr.h"
#include "lib/util/dlinklist.h"
-#include "libcli/util/asn_1.h"
+#include "lib/util/asn1.h"
#include "ldap_server/ldap_server.h"
#include "smbd/service_task.h"
#include "smbd/service_stream.h"
diff --git a/source4/libcli/util/asn1.c b/source4/lib/util/asn1.c
index aad55382d9..4756c0640d 100644
--- a/source4/libcli/util/asn1.c
+++ b/source4/lib/util/asn1.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include "libcli/util/asn_1.h"
+#include "lib/util/asn1.h"
/* allocate an asn1 structure */
struct asn1_data *asn1_init(TALLOC_CTX *mem_ctx)
diff --git a/source4/libcli/util/asn_1.h b/source4/lib/util/asn1.h
index 612a8a932f..34aa1e2cb9 100644
--- a/source4/libcli/util/asn_1.h
+++ b/source4/lib/util/asn1.h
@@ -49,6 +49,6 @@ struct asn1_data {
#define ASN1_MAX_OIDS 20
-#include "libcli/util/asn1_proto.h"
+#include "lib/util/asn1_proto.h"
#endif /* _ASN_1_H */
diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 01ad14aa95..53a55bf7af 100644
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -34,6 +34,11 @@ PUBLIC_DEPENDENCIES = \
SOCKET_WRAPPER EXT_NSL \
CHARSET EXECINFO
+[SUBSYSTEM::ASN1_UTIL]
+PUBLIC_PROTO_HEADER = asn1_proto.h
+PUBLIC_HEADERS = asn1.h
+OBJ_FILES = asn1.o
+
[SUBSYSTEM::UNIX_PRIVS]
PRIVATE_PROTO_HEADER = unix_privs.h
OBJ_FILES = unix_privs.o
diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h
index 8aa98f0331..7a222e0652 100644
--- a/source4/libcli/cldap/cldap.h
+++ b/source4/libcli/cldap/cldap.h
@@ -19,7 +19,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "libcli/util/asn_1.h"
+#include "lib/util/asn1.h"
#include "librpc/gen_ndr/nbt.h"
struct ldap_message;
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index adb51c6c9a..eb3c56cf7f 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -8,11 +8,6 @@ OBJ_FILES = util/doserr.o \
util/errormap.o \
util/nterr.o \
-[SUBSYSTEM::ASN1_UTIL]
-PUBLIC_PROTO_HEADER = util/asn1_proto.h
-PUBLIC_HEADERS = util/asn_1.h
-OBJ_FILES = util/asn1.o
-
[SUBSYSTEM::LIBCLI_LSA]
PRIVATE_PROTO_HEADER = util/clilsa.h
OBJ_FILES = util/clilsa.o
diff --git a/source4/libcli/ldap/ldap.c b/source4/libcli/ldap/ldap.c
index 586f2fa653..00a0631753 100644
--- a/source4/libcli/ldap/ldap.c
+++ b/source4/libcli/ldap/ldap.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-#include "libcli/util/asn_1.h"
+#include "lib/util/asn1.h"
#include "libcli/ldap/ldap.h"
diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 6b8a7a3f28..d99851ee15 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-#include "libcli/util/asn_1.h"
+#include "lib/util/asn1.h"
#include "lib/util/dlinklist.h"
#include "lib/events/events.h"
#include "lib/socket/socket.h"
diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c
index 34e5cccf75..3b94580033 100644
--- a/source4/libcli/ldap/ldap_controls.c
+++ b/source4/libcli/ldap/ldap_controls.c
@@ -20,7 +20,7 @@
*/
#include "includes.h"
-#include "libcli/util/asn_1.h"
+#include "lib/util/asn1.h"
#include "libcli/ldap/ldap.h"
#include "lib/ldb/include/ldb.h"
diff --git a/source4/librpc/ndr/ndr_drsuapi.c b/source4/librpc/ndr/ndr_drsuapi.c
index dedcb0601d..9f755ffaab 100644
--- a/source4/librpc/ndr/ndr_drsuapi.c
+++ b/source4/librpc/ndr/ndr_drsuapi.c
@@ -23,7 +23,7 @@
#include "includes.h"
#include "librpc/gen_ndr/ndr_drsuapi.h"
#include "librpc/gen_ndr/ndr_misc.h"
-#include "libcli/util/asn_1.h"
+#include "lib/util/asn1.h"
void ndr_print_drsuapi_DsReplicaObjectListItem(struct ndr_print *ndr, const char *name,
const struct drsuapi_DsReplicaObjectListItem *r)