The branch, v4-0-test has been updated via 44e1cfd2d0ef62e4ee541cec00581a7151d951b3 (commit) from df36c78549b40ee5e47d5cc79de2eb79f58c567a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log ----------------------------------------------------------------- commit 44e1cfd2d0ef62e4ee541cec00581a7151d951b3 Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Tue Jan 15 01:04:38 2008 +0100 util: Move asn1 to lib/util to trim down the number of subsystems. ----------------------------------------------------------------------- Summary of changes: source/auth/gensec/spnego_parse.c | 2 +- source/auth/kerberos/gssapi_parse.c | 2 +- source/ldap_server/ldap_server.c | 2 +- source/{libcli => lib}/util/asn1.c | 2 +- source/{libcli/util/asn_1.h => lib/util/asn1.h} | 2 +- source/lib/util/config.mk | 5 +++++ source/libcli/cldap/cldap.h | 2 +- source/libcli/config.mk | 5 ----- source/libcli/ldap/ldap.c | 2 +- source/libcli/ldap/ldap_client.c | 2 +- source/libcli/ldap/ldap_controls.c | 2 +- source/librpc/ndr/ndr_drsuapi.c | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) rename source/{libcli => lib}/util/asn1.c (99%) rename source/{libcli/util/asn_1.h => lib/util/asn1.h} (97%) Changeset truncated at 500 lines: diff --git a/source/auth/gensec/spnego_parse.c b/source/auth/gensec/spnego_parse.c index 37f4f12..8012a83 100644 --- a/source/auth/gensec/spnego_parse.c +++ b/source/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/source/auth/kerberos/gssapi_parse.c b/source/auth/kerberos/gssapi_parse.c index 4b1b178..77e907d 100644 --- a/source/auth/kerberos/gssapi_parse.c +++ b/source/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/source/ldap_server/ldap_server.c b/source/ldap_server/ldap_server.c index fcc9435..8380775 100644 --- a/source/ldap_server/ldap_server.c +++ b/source/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/source/libcli/util/asn1.c b/source/lib/util/asn1.c similarity index 99% rename from source/libcli/util/asn1.c rename to source/lib/util/asn1.c index aad5538..4756c06 100644 --- a/source/libcli/util/asn1.c +++ b/source/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/source/libcli/util/asn_1.h b/source/lib/util/asn1.h similarity index 97% rename from source/libcli/util/asn_1.h rename to source/lib/util/asn1.h index 612a8a9..34aa1e2 100644 --- a/source/libcli/util/asn_1.h +++ b/source/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/source/lib/util/config.mk b/source/lib/util/config.mk index 01ad14a..53a55bf 100644 --- a/source/lib/util/config.mk +++ b/source/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/source/libcli/cldap/cldap.h b/source/libcli/cldap/cldap.h index 8aa98f0..7a222e0 100644 --- a/source/libcli/cldap/cldap.h +++ b/source/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/source/libcli/config.mk b/source/libcli/config.mk index adb51c6..eb3c56c 100644 --- a/source/libcli/config.mk +++ b/source/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/source/libcli/ldap/ldap.c b/source/libcli/ldap/ldap.c index 586f2fa..00a0631 100644 --- a/source/libcli/ldap/ldap.c +++ b/source/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/source/libcli/ldap/ldap_client.c b/source/libcli/ldap/ldap_client.c index 6b8a7a3..d99851e 100644 --- a/source/libcli/ldap/ldap_client.c +++ b/source/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/source/libcli/ldap/ldap_controls.c b/source/libcli/ldap/ldap_controls.c index 34e5ccc..3b94580 100644 --- a/source/libcli/ldap/ldap_controls.c +++ b/source/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/source/librpc/ndr/ndr_drsuapi.c b/source/librpc/ndr/ndr_drsuapi.c index dedcb06..9f755ff 100644 --- a/source/librpc/ndr/ndr_drsuapi.c +++ b/source/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) -- Samba Shared Repository