summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source4/dsdb/config.mk3
-rw-r--r--source4/headermap.txt4
-rw-r--r--source4/include/includes.h4
-rw-r--r--source4/lib/util/util.h1
-rw-r--r--source4/libcli/auth/config.mk3
-rw-r--r--source4/libcli/auth/credentials.c1
-rw-r--r--source4/libcli/auth/session.c1
-rw-r--r--source4/libcli/auth/smbdes.c (renamed from source4/libcli/util/smbdes.c)0
-rw-r--r--source4/libcli/config.mk17
-rw-r--r--source4/libcli/ldap/config.mk4
-rw-r--r--source4/libcli/ldap/ldap.h1
-rw-r--r--source4/libcli/util/asn_1.h2
-rw-r--r--source4/libcli/util/error.h27
-rw-r--r--source4/librpc/config.mk2
14 files changed, 54 insertions, 16 deletions
diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index ba8da697e8..b0ab2cda62 100644
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -5,7 +5,8 @@ include samdb/ldb_modules/config.mk
################################################
# Start SUBSYSTEM SAMDB
[SUBSYSTEM::SAMDB]
-PRIVATE_PROTO_HEADER = samdb/samdb_proto.h
+PUBLIC_PROTO_HEADER = samdb/samdb_proto.h
+PUBLIC_HEADERS = samdb/samdb.h
REQUIRED_SUBSYSTEMS = DB_WRAP LIBCLI_LDAP
OBJ_FILES = \
samdb/samdb.o \
diff --git a/source4/headermap.txt b/source4/headermap.txt
index 4bce3fb688..5861c3a3c3 100644
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -77,3 +77,7 @@ include/dlinklist.h: dlinklist.h
version.h: samba/version.h
param/proto.h: param/proto.h
param/param.h: param.h
+dsdb/samdb/samdb.h: samdb.h
+dsdb/samdb/samdb_proto.h: samdb/proto.h
+libcli/util/asn_1.h: samba/asn1.h
+libcli/util/asn1_proto.h: samba/asn1/proto.h
diff --git a/source4/include/includes.h b/source4/include/includes.h
index b87e6acff7..b8aebf2f14 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -104,12 +104,10 @@ _PUBLIC_ void smb_panic(const char *why) NORETURN_ATTRIBUTE;
#include "charset/charset.h"
#include "util/util.h"
#include "param/param.h"
-#include "libcli/util/nterr.h"
-#include "libcli/util/doserr.h"
#include "librpc/gen_ndr/misc.h"
struct smbcli_tree;
-#include "libcli/util/proto.h"
+#include "libcli/util/error.h"
/* String routines */
#include "util/safe_string.h"
diff --git a/source4/lib/util/util.h b/source4/lib/util/util.h
index 1b48bafc94..8a2a9163d6 100644
--- a/source4/lib/util/util.h
+++ b/source4/lib/util/util.h
@@ -33,7 +33,6 @@
*/
struct substitute_context;
-struct asn1_data;
struct smbsrv_tcon;
extern const char *logfile;
diff --git a/source4/libcli/auth/config.mk b/source4/libcli/auth/config.mk
index 26e6913c18..3f036fbfd4 100644
--- a/source4/libcli/auth/config.mk
+++ b/source4/libcli/auth/config.mk
@@ -5,7 +5,8 @@ PUBLIC_HEADERS = credentials.h
PRIVATE_PROTO_HEADER = proto.h
OBJ_FILES = credentials.o \
session.o \
- smbencrypt.o
+ smbencrypt.o \
+ smbdes.o
REQUIRED_SUBSYSTEMS = \
auth SCHANNELDB MSRPC_PARSE
# End SUBSYSTEM LIBCLI_AUTH
diff --git a/source4/libcli/auth/credentials.c b/source4/libcli/auth/credentials.c
index 3f055a657d..5bae30f580 100644
--- a/source4/libcli/auth/credentials.c
+++ b/source4/libcli/auth/credentials.c
@@ -25,6 +25,7 @@
#include "system/time.h"
#include "auth/auth.h"
#include "lib/crypto/crypto.h"
+#include "libcli/auth/libcli_auth.h"
/*
initialise the credentials state for old-style 64 bit session keys
diff --git a/source4/libcli/auth/session.c b/source4/libcli/auth/session.c
index 22146cbfb3..afa7afbd0f 100644
--- a/source4/libcli/auth/session.c
+++ b/source4/libcli/auth/session.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "libcli/auth/libcli_auth.h"
/*
encrypt or decrypt a blob of data using the user session key
diff --git a/source4/libcli/util/smbdes.c b/source4/libcli/auth/smbdes.c
index d392109b1e..d392109b1e 100644
--- a/source4/libcli/util/smbdes.c
+++ b/source4/libcli/auth/smbdes.c
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index dbeae51807..380beac287 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -2,15 +2,18 @@ include auth/config.mk
include ldap/config.mk
include security/config.mk
-[SUBSYSTEM::LIBCLI_UTILS]
-PRIVATE_PROTO_HEADER = util/proto.h
-PUBLIC_HEADERS = util/nterr.h util/doserr.h util/nt_status.h
-OBJ_FILES = util/asn1.o \
- util/doserr.o \
+[SUBSYSTEM::LIBSAMBA-ERRORS]
+PUBLIC_PROTO_HEADER = util/proto.h
+PUBLIC_HEADERS = util/error.h util/nterr.h util/doserr.h util/nt_status.h
+OBJ_FILES = util/doserr.o \
util/errormap.o \
util/clierror.o \
util/nterr.o \
- util/smbdes.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
@@ -100,7 +103,7 @@ PUBLIC_HEADERS = libcli.h
VERSION = 0.0.1
SO_VERSION = 0
DESCRIPTION = SMB/CIFS client library
-REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH \
+REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIB_SECURITY LIBCLI_RESOLVE \
LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index 624b2603ec..f59da733eb 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -10,7 +10,7 @@ OBJ_FILES = ldap.o \
ldap_ndr.o \
ldap_ildap.o \
ldap_controls.o
-REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBEVENTS gensec SOCKET NDR_SAMR LIBTLS \
- LIBPACKET
+REQUIRED_SUBSYSTEMS = LIBSAMBA-ERRORS LIBEVENTS gensec SOCKET NDR_SAMR LIBTLS \
+ LIBPACKET ASN1_UTIL
# End SUBSYSTEM LIBCLI_LDAP
#################################
diff --git a/source4/libcli/ldap/ldap.h b/source4/libcli/ldap/ldap.h
index ba0f801832..30c5acc6fb 100644
--- a/source4/libcli/ldap/ldap.h
+++ b/source4/libcli/ldap/ldap.h
@@ -250,6 +250,7 @@ struct ldap_message {
struct event_context;
struct cli_credentials;
struct dom_sid;
+struct asn1_data;
#include "libcli/ldap/ldap_proto.h"
diff --git a/source4/libcli/util/asn_1.h b/source4/libcli/util/asn_1.h
index 2dc9bef06d..7033f92a7f 100644
--- a/source4/libcli/util/asn_1.h
+++ b/source4/libcli/util/asn_1.h
@@ -50,4 +50,6 @@ struct asn1_data {
#define ASN1_MAX_OIDS 20
+#include "libcli/util/asn1_proto.h"
+
#endif /* _ASN_1_H */
diff --git a/source4/libcli/util/error.h b/source4/libcli/util/error.h
new file mode 100644
index 0000000000..4aa1ff6a40
--- /dev/null
+++ b/source4/libcli/util/error.h
@@ -0,0 +1,27 @@
+/*
+ Unix SMB/CIFS implementation.
+ Error handling code
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef _SAMBA_ERROR_H_
+#define _SAMBA_ERROR_H_
+
+#include "libcli/util/nterr.h"
+#include "libcli/util/doserr.h"
+#include "libcli/util/proto.h"
+
+#endif /* _SAMBA_ERROR_H */
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index eb8039c126..e02937bead 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -11,7 +11,7 @@ OBJ_FILES = \
ndr/ndr_basic.o \
ndr/ndr_string.o \
ndr/ndr_misc.o
-REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBTALLOC LIBSAMBA-UTIL
+REQUIRED_SUBSYSTEMS = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL
# End SUBSYSTEM LIBNDR
################################################
generated by cgit (git 2.34.1) at 2024-06-03 08:06:39 +0000