lib: make asn1_util a private library

this prevents symbol duplication of the asn1 symbols in the service
and ntvfs subsystems

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

9 files changed, 23 insertions, 22 deletions

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 19ccb5c4f7..11bb40a45a 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -33,10 +33,11 @@ if bld.env._SAMBA_BUILD_ == 4:
                       )
 
 
-bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
-                    source='asn1.c',
-                    deps='talloc',
-                    local_include=False)
+bld.SAMBA_LIBRARY('asn1util',
+                  source='asn1.c',
+                  deps='talloc samba-util-common',
+                  private_library=True,
+                  local_include=False)
 
 
 bld.SAMBA_SUBSYSTEM('UNIX_PRIVS',
diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index 0f0e22ba91..436ca61b7f 100644
--- a/libcli/auth/wscript_build
+++ b/libcli/auth/wscript_build
@@ -37,4 +37,4 @@ bld.SAMBA_SUBSYSTEM('PAM_ERRORS',
 
 bld.SAMBA_SUBSYSTEM('SPNEGO_PARSE',
                     source='spnego_parse.c',
-                    deps='ASN1_UTIL')
+                    deps='asn1util')
diff --git a/libcli/ldap/wscript_build b/libcli/ldap/wscript_build
index 5efb683833..feab6510b9 100644
--- a/libcli/ldap/wscript_build
+++ b/libcli/ldap/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_MESSAGE',
 	source='ldap_message.c',
 	public_deps='errors talloc ldb',
 	public_headers='ldap_message.h ldap_errors.h',
-	deps='samba-util ASN1_UTIL'
+	deps='samba-util asn1util'
 	)
 
 
diff --git a/librpc/wscript_build b/librpc/wscript_build
index b71a3ae5d9..d6f0f6dd41 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -282,7 +282,7 @@ bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
 
 bld.SAMBA_SUBSYSTEM('NDR_DRSUAPI',
 	source='ndr/ndr_drsuapi.c gen_ndr/ndr_drsuapi.c',
-	public_deps='ndr NDR_COMPRESSION NDR_SECURITY ndr-standard ASN1_UTIL'
+	public_deps='ndr NDR_COMPRESSION NDR_SECURITY ndr-standard asn1util'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_DRSBLOBS',
diff --git a/source3/pam_smbpass/wscript_build b/source3/pam_smbpass/wscript_build
index 80aa0fb770..0d200c6fd2 100644
--- a/source3/pam_smbpass/wscript_build
+++ b/source3/pam_smbpass/wscript_build
@@ -6,7 +6,7 @@ if bld.CONFIG_SET('WITH_PAM_MODULES'):
                   pam_smb_passwd.c
                   pam_smb_acct.c
                   support.c''',
-        deps='''tdb talloc pam PAM_ERRORS wbclient cap ASN1_UTIL param LIB_NONSMBD passdb SMBLDAP
+        deps='''tdb talloc pam PAM_ERRORS wbclient cap asn1util param LIB_NONSMBD passdb SMBLDAP
                 LIBNTLMSSP LIBTSOCKET''',
         cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
         realname='pam_smbpass.so',
diff --git a/source3/wscript_build b/source3/wscript_build
index 6db9c86dc5..8685268478 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -720,7 +720,7 @@ bld.SAMBA3_SUBSYSTEM('GROUPDB',
 
 bld.SAMBA3_SUBSYSTEM('TLDAP',
                     source=TLDAP_SRC,
-                    deps='ASN1_UTIL LIBTSOCKET')
+                    deps='asn1util LIBTSOCKET')
 
 bld.SAMBA3_LIBRARY('passdb',
                    source=PASSDB_SRC,
@@ -1090,13 +1090,13 @@ bld.SAMBA3_BINARY('profiles',
 bld.SAMBA3_BINARY('smbspool',
                  source=CUPS_SRC,
                  deps='''talloc tdb tevent resolv cap wbclient POPT_SAMBA3 param LIBSMB LIB_NONSMBD samba3core
-                 KRBCLIENT ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
+                 KRBCLIENT asn1util LIBTSOCKET NDR_SAMR NDR_LSA''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('testparm',
                  source=TESTPARM_SRC,
                  deps='''talloc tevent ldap cap 
-                 wbclient ASN1_UTIL LIBTSOCKET passdb param LIB_NONSMBD
+                 wbclient asn1util LIBTSOCKET passdb param LIB_NONSMBD
                  LIBSMB_ERR POPT_SAMBA3''',
                  vars=locals())
 
@@ -1151,7 +1151,7 @@ bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3,
 bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
                  source=SMBTORTURE_SRC,
                  deps='''talloc tdb tevent cap resolv wbclient param LIBSMB KRBCLIENT TLDAP
-                 LIB_NONSMBD POPT_SAMBA3 ASN1_UTIL LIBTSOCKET NDR_LSA msrpc3 LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''',
+                 LIB_NONSMBD POPT_SAMBA3 asn1util LIBTSOCKET NDR_LSA msrpc3 LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('smbconftort',
@@ -1167,7 +1167,7 @@ bld.SAMBA3_BINARY('replacetort',
 bld.SAMBA3_BINARY('masktest' + bld.env.suffix3,
                  source=MASKTEST_SRC,
                  deps='''talloc tdb cap resolv wbclient param LIB_NONSMBD LIBSMB KRBCLIENT
-                 ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
+                 asn1util LIBTSOCKET NDR_SAMR NDR_LSA''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('msgtest',
@@ -1203,7 +1203,7 @@ bld.SAMBA3_BINARY('sharesec',
 bld.SAMBA3_BINARY('locktest' + bld.env.suffix3,
                  source=LOCKTEST_SRC,
                  deps='''talloc tdb tevent cap resolv wbclient param KRBCLIENT LIBSMB LIB_NONSMBD
-                 ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
+                 asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('pdbtest',
@@ -1230,7 +1230,7 @@ bld.SAMBA3_BINARY('log2pcap',
 bld.SAMBA3_BINARY('locktest2',
                  source=LOCKTEST2_SRC,
                  deps='''talloc tdb tevent cap resolv wbclient param KRBCLIENT LIBSMB LIB_NONSMBD
-                 ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
+                 asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('debug2html',
@@ -1240,7 +1240,7 @@ bld.SAMBA3_BINARY('debug2html',
 
 bld.SAMBA3_BINARY('smbfilter',
                  source=SMBFILTER_SRC,
-                 deps='''talloc tevent cap resolv wbclient param LIBSMB LIB_NONSMBD KRBCLIENT ASN1_UTIL LIBTSOCKET
+                 deps='''talloc tevent cap resolv wbclient param LIBSMB LIB_NONSMBD KRBCLIENT asn1util LIBTSOCKET
                  NDR_SAMR NDR_LSA''',
                  vars=locals())
 
@@ -1252,14 +1252,14 @@ bld.SAMBA3_BINARY('versiontest',
 bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3,
                  source=WBINFO_SRC,
                  deps='''talloc wbclient tevent cap
-                 ASN1_UTIL LIBTSOCKET passdb ldap param LIB_NONSMBD
+                 asn1util LIBTSOCKET passdb ldap param LIB_NONSMBD
                  LIBNTLMSSP POPT_SAMBA3 LIBAFS_SETTOKEN''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
                  source=NTLM_AUTH_SRC,
                  deps='''tdb talloc cap resolv krb5 k5crypto com_err wbclient param LIB_NONSMBD
-                 samba3core LIBNTLMSSP POPT_SAMBA3 ASN1_UTIL LIBTSOCKET
+                 samba3core LIBNTLMSSP POPT_SAMBA3 asn1util LIBTSOCKET
                  passdb SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER
                  NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''',
                  vars=locals())
@@ -1271,7 +1271,7 @@ bld.SAMBA3_BINARY('timelimit',
 bld.SAMBA3_BINARY('rpc_open_tcp',
                  source=RPC_OPEN_TCP_SRC,
                  deps='''talloc tdb tevent resolv cap wbclient KRBCLIENT param samba3core LIBSMB LIB_NONSMBD
-                 LIBSMB_ERR ASN1_UTIL LIBTSOCKET LIBMSRPC_GEN msrpc3''',
+                 LIBSMB_ERR asn1util LIBTSOCKET LIBMSRPC_GEN msrpc3''',
                  vars=locals())
 
 bld.SAMBA3_BINARY('test_lp_load',
diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index 8f8a6e84c7..42d7dc5fd4 100644
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -41,7 +41,7 @@ bld.SAMBA_MODULE('gensec_spnego',
 	autoproto='spnego_proto.h',
 	subsystem='gensec',
 	init_function='gensec_spnego_init',
-	deps='ASN1_UTIL credentials SPNEGO_PARSE'
+	deps='asn1util credentials SPNEGO_PARSE'
 	)
 
 
diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build
index 5d29f6a619..1b4804e7cc 100644
--- a/source4/auth/kerberos/wscript_build
+++ b/source4/auth/kerberos/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('authkrb5',
                   source='kerberos.c clikrb5.c kerberos_heimdal.c kerberos_pac.c gssapi_parse.c krb5_init_context.c keytab_copy.c',
                   autoproto='proto.h',
                   public_deps='krb5 ndr-krb5pac samba_socket LIBCLI_RESOLVE com_err asn1',
-                  deps='ASN1_UTIL auth_sam_reply tevent LIBPACKET ndr ldb',
+                  deps='asn1util auth_sam_reply tevent LIBPACKET ndr ldb',
                   private_library=True
                   )
 
diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build
index 90b6b2f5f0..51dd098caf 100644
--- a/source4/torture/drs/wscript_build
+++ b/source4/torture/drs/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_MODULE('TORTURE_DRS',
 	autoproto='proto.h',
 	subsystem='smbtorture',
 	init_function='torture_drs_init',
-	deps='samba-util ldb POPT_SAMBA errors torture ldbsamba talloc dcerpc ndr NDR_DRSUAPI gensec samba-hostconfig RPC_NDR_DRSUAPI DSDB_MODULE_HELPERS ASN1_UTIL samdb NDR_DRSBLOBS credentials samdb-common LIBCLI_RESOLVE LP_RESOLVE torturemain',
+	deps='samba-util ldb POPT_SAMBA errors torture ldbsamba talloc dcerpc ndr NDR_DRSUAPI gensec samba-hostconfig RPC_NDR_DRSUAPI DSDB_MODULE_HELPERS asn1util samdb NDR_DRSBLOBS credentials samdb-common LIBCLI_RESOLVE LP_RESOLVE torturemain',
 	internal_module=True
 	)