build: rename security → samba-security

there is a libsecurity on OSF1 which clasheѕ with our security lib. see bug #9023.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Björn Jacke <bj@sernet.de>
Autobuild-Date(master): Fri Aug 10 14:22:21 CEST 2012 on sn-devel-104

diff --git a/auth/credentials/wscript_build b/auth/credentials/wscript_build
index 0b2aec21899025fe4c48734d50f7e7654cecf9c7..06d58a77b234b807839f302b83d50281ad62f67a 100755 (executable)
--- a/auth/credentials/wscript_build
+++ b/auth/credentials/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_LIBRARY('samba-credentials',
        autoproto='credentials_proto.h',
        public_headers='credentials.h',
        pc_files='samba-credentials.pc',
-       deps='LIBCRYPTO errors events LIBCLI_AUTH security CREDENTIALS_SECRETS CREDENTIALS_KRB5',
+       deps='LIBCRYPTO errors events LIBCLI_AUTH samba-security CREDENTIALS_SECRETS CREDENTIALS_KRB5',
        vnum='0.0.1'
        )
 

diff --git a/auth/wscript_build b/auth/wscript_build
index 01948151a142ad4907954334b7a02ae95e48cbbb..57f12702cba40dd982f064ddbaf3587e724c507f 100644 (file)
--- a/auth/wscript_build
+++ b/auth/wscript_build
@@ -2,7 +2,7 @@
 
 bld.SAMBA_LIBRARY('auth_sam_reply',
                   source='auth_sam_reply.c',
-                  deps='talloc security samba-util',
+                  deps='talloc samba-security samba-util',
                   autoproto='auth_sam_reply.h',
                   private_library=True
                   )

diff --git a/lib/ldb-samba/wscript_build b/lib/ldb-samba/wscript_build
index b0d2dcaa3030cf9ac9bce8651aa71872546e41e1..63ff5b11b7f82f79f1a9228646afa2fe6e077848 100644 (file)
--- a/lib/ldb-samba/wscript_build
+++ b/lib/ldb-samba/wscript_build
@@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('ldbsamba',
                   source='ldif_handlers.c',
                   autoproto='ldif_handlers_proto.h',
                   public_deps='ldb',
-                  deps='security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-common SAMDB_SCHEMA tdb pyldb-util errors',
+                  deps='samba-security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-common SAMDB_SCHEMA tdb pyldb-util errors',
                   private_library=True
                   )
 

diff --git a/libcli/security/wscript_build b/libcli/security/wscript_build
index f3b654e9835cc6764ce88b680779191c8f990c58..b529ec86de23010d2068139ab69acf4d73f57fbe 100644 (file)
--- a/libcli/security/wscript_build
+++ b/libcli/security/wscript_build
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 
-bld.SAMBA_LIBRARY('security',
+bld.SAMBA_LIBRARY('samba-security',
                   source='dom_sid.c display_sec.c secace.c secacl.c security_descriptor.c sddl.c privileges.c security_token.c access_check.c object_tree.c create_descriptor.c util_sid.c session.c secdesc.c',
                   private_library=True,
                   deps='talloc ndr NDR_SECURITY'
@@ -9,6 +9,6 @@ bld.SAMBA_LIBRARY('security',
 
 bld.SAMBA_PYTHON('pysecurity',
                  source='pysecurity.c',
-                 deps='security pytalloc-util',
+                 deps='samba-security pytalloc-util',
                  realname='samba/security.so'
                  )

diff --git a/librpc/wscript_build b/librpc/wscript_build
index fbe0223061ed3c6658de0fc8a7264210fe9ca3cf..1dd755eb3081bd80eac738a104fbdd36609e02a5 100644 (file)
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -234,7 +234,7 @@ bld.SAMBA_SUBSYSTEM('NDR_LSA',
 
 bld.SAMBA_SUBSYSTEM('NDR_SECURITY',
     source='gen_ndr/ndr_security.c ndr/ndr_sec_helper.c',
-    deps='ndr security',
+    deps='ndr samba-security',
     public_headers='gen_ndr/security.h',
     header_path='gen_ndr'
     )

diff --git a/source3/wscript_build b/source3/wscript_build
index 2b00a167f853c42314f4ccba0b4f03fd91062d7e..9c6c5aa6b1d5a7bd2f627d467d32abb94b2fd7a4 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -749,7 +749,7 @@ bld.SAMBA3_SUBSYSTEM('REG_API_REGF',
 bld.SAMBA3_LIBRARY('smbregistry',
                    source=REG_BASE_SRC,
                    deps='''smbd_shim tdb-wrap3 NDR_SECURITY util_tdb talloc
-                   replace util_reg samba-util security
+                   replace util_reg samba-util samba-security
                    errors3 dbwrap samba3-util''',
                    allow_undefined_symbols=True,
                    private_library=True)
@@ -782,7 +782,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
 
 bld.SAMBA3_SUBSYSTEM('samba3util',
                    source=LIB_UTIL_SRC,
-                   deps='ndr security NDR_SECURITY samba-util util_tdb ccan-hash',
+                   deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash',
                    vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('samba3core',

diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index f9e39001c05b95ba723b9cdfca84644a6c2ec5f0..50d301deca488113bff864008db4965f8fc7236b 100644 (file)
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -43,7 +43,7 @@ bld.SAMBA_MODULE('auth4_unix',
 bld.SAMBA_LIBRARY('auth4',
        source='auth.c auth_util.c auth_simple.c',
        autoproto='auth_proto.h',
-       deps='samba-util security samdb samba-credentials tevent-util LIBWBCLIENT_OLD auth_unix_token samba-modules KERBEROS_UTIL',
+       deps='samba-util samba-security samdb samba-credentials tevent-util LIBWBCLIENT_OLD auth_unix_token samba-modules KERBEROS_UTIL',
        private_library=True
        )
 

diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build
index 3b43a62b2a3ecdccc8e15f95e31d18b75c84dfd3..6742537294f648452fee01717a8c159cf25479b4 100644 (file)
--- a/source4/auth/wscript_build
+++ b/source4/auth/wscript_build
@@ -38,7 +38,7 @@ bld.SAMBA_SUBSYSTEM('auth_system_session',
 bld.SAMBA_SUBSYSTEM('auth4_sam',
        source='sam.c',
        autoproto='auth_sam.h',
-       public_deps='samdb security ldb tevent',
+       public_deps='samdb samba-security ldb tevent',
        deps=''
        )
 

diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index 98651e5750ccc985313b8d8b6bebace1971cc743..7e45c600fb250645f69a6cad4f683524ac45cccc 100755 (executable)
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -9,7 +9,7 @@ bld.SAMBA_LIBRARY('dsdb-module',
 bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS',
        source='util.c acl_util.c schema_util.c',
        autoproto='util_proto.h',
-       deps='ldb ndr samdb-common security'
+       deps='ldb ndr samdb-common samba-security'
        )
 
 bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_RIDALLOC',

diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build_server b/source4/dsdb/samdb/ldb_modules/wscript_build_server
index f6bb5e6774d9f0d8e4b2543eda4451b31426926f..f44d4827dd65fe43e4801177209237313f27f174 100755 (executable)
--- a/source4/dsdb/samdb/ldb_modules/wscript_build_server
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build_server
@@ -36,7 +36,7 @@ bld.SAMBA_MODULE('ldb_repl_meta_data',
        init_function='ldb_repl_meta_data_module_init',
        module_init_name='ldb_init_module',
        internal_module=False,
-       deps='samdb talloc ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS security'
+       deps='samdb talloc ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS samba-security'
        )
 
 
@@ -76,7 +76,7 @@ bld.SAMBA_MODULE('ldb_samba3sam',
        init_function='ldb_samba3sam_module_init',
        module_init_name='ldb_init_module',
        internal_module=False,
-       deps='talloc ldb smbpasswdparser security NDR_SECURITY'
+       deps='talloc ldb smbpasswdparser samba-security NDR_SECURITY'
        )
 
 
@@ -86,7 +86,7 @@ bld.SAMBA_MODULE('ldb_samba3sid',
        init_function='ldb_samba3sid_module_init',
        module_init_name='ldb_init_module',
        internal_module=False,
-       deps='talloc ldb security NDR_SECURITY ldbsamba DSDB_MODULE_HELPERS'
+       deps='talloc ldb samba-security NDR_SECURITY ldbsamba DSDB_MODULE_HELPERS'
        )
 
 
@@ -106,7 +106,7 @@ bld.SAMBA_MODULE('ldb_rootdse',
        init_function='ldb_rootdse_module_init',
        module_init_name='ldb_init_module',
        internal_module=False,
-       deps='talloc samdb MESSAGING security DSDB_MODULE_HELPERS RPC_NDR_IRPC'
+       deps='talloc samdb MESSAGING samba-security DSDB_MODULE_HELPERS RPC_NDR_IRPC'
        )
 
 
@@ -296,7 +296,7 @@ bld.SAMBA_MODULE('ldb_descriptor',
        init_function='ldb_descriptor_module_init',
        module_init_name='ldb_init_module',
        internal_module=False,
-       deps='talloc security NDR_SECURITY samdb DSDB_MODULE_HELPERS'
+       deps='talloc samba-security NDR_SECURITY samdb DSDB_MODULE_HELPERS'
        )
 
 
@@ -316,7 +316,7 @@ bld.SAMBA_MODULE('ldb_acl',
        init_function='ldb_acl_module_init',
        module_init_name='ldb_init_module',
        internal_module=False,
-       deps='talloc security samdb DSDB_MODULE_HELPERS'
+       deps='talloc samba-security samdb DSDB_MODULE_HELPERS'
        )
 
 
@@ -335,7 +335,7 @@ bld.SAMBA_MODULE('ldb_aclread',
        init_function='ldb_aclread_module_init',
        module_init_name='ldb_init_module',
        internal_module=False,
-       deps='talloc security samdb DSDB_MODULE_HELPERS',
+       deps='talloc samba-security samdb DSDB_MODULE_HELPERS',
        )
 
 bld.SAMBA_MODULE('ldb_simple_dn',
@@ -353,5 +353,5 @@ bld.SAMBA_MODULE('ldb_dirsync',
        init_function='ldb_dirsync_module_init',
        module_init_name='ldb_init_module',
        internal_module=False,
-       deps='talloc security samdb DSDB_MODULE_HELPERS'
+       deps='talloc samba-security samdb DSDB_MODULE_HELPERS'
        )

diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index a2de9a8d0343d675de8c60ad4f80f2fd6d9839b0..600b1f87d016c3b35e10ad540fccfb3de88de7e8 100755 (executable)
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -13,7 +13,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_LSA',
        source='util/clilsa.c',
        autoproto='util/clilsa.h',
        public_deps='RPC_NDR_LSA dcerpc',
-       deps='security'
+       deps='samba-security'
        )
 
 
@@ -76,7 +76,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_FINDDCS',
 bld.SAMBA_SUBSYSTEM('LIBCLI_SMB',
        source='clireadwrite.c cliconnect.c clifile.c clilist.c clitrans2.c climessage.c clideltree.c',
        public_headers='libcli.h:smb_cli.h',
-       public_deps='smbclient-raw errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE cli-nbt security LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
+       public_deps='smbclient-raw errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE cli-nbt samba-security LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
        )
 
 
@@ -84,7 +84,7 @@ bld.SAMBA_LIBRARY('smbclient-raw',
        source='raw/rawfile.c raw/smb_signing.c raw/clisocket.c raw/clitransport.c raw/clisession.c raw/clitree.c raw/clierror.c raw/rawrequest.c raw/rawreadwrite.c raw/rawsearch.c raw/rawsetfileinfo.c raw/raweas.c raw/rawtrans.c raw/clioplock.c raw/rawnegotiate.c raw/rawfsinfo.c raw/rawfileinfo.c raw/rawnotify.c raw/rawioctl.c raw/rawacl.c raw/rawdate.c raw/rawlpq.c raw/rawshadow.c',
        autoproto='raw/raw_proto.h',
        public_deps='samba_socket LIBPACKET LIBCRYPTO',
-       deps='cli_composite LIBCLI_RESOLVE security ndr samba-util errors charset talloc LIBCLI_SMB_COMPOSITE tevent cli_smb_common',
+       deps='cli_composite LIBCLI_RESOLVE samba-security ndr samba-util errors charset talloc LIBCLI_SMB_COMPOSITE tevent cli_smb_common',
        public_headers='raw/request.h:smb_request.h raw/signing.h:smb_raw_signing.h raw/libcliraw.h:smb_cliraw.h raw/interfaces.h:smb_raw_interfaces.h raw/smb.h:smb_raw.h raw/trans2.h:smb_raw_trans2.h',
        private_library=False,
        pc_files='raw/smbclient-raw.pc',

diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index e3a863af49750939e0692d96b0d938dc7fff603d..d94d2e99d4f0dd9303357997f01b95e08a1a3ef8 100755 (executable)
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -105,7 +105,7 @@ bld.SAMBA_MODULE('dcerpc_lsarpc',
        autoproto='lsa/proto.h',
        subsystem='dcerpc_server',
        init_function='dcerpc_server_lsa_init',
-       deps='samdb DCERPC_COMMON ndr-standard LIBCLI_AUTH NDR_DSSETUP com_err security UTIL_LSARPC'
+       deps='samdb DCERPC_COMMON ndr-standard LIBCLI_AUTH NDR_DSSETUP com_err samba-security UTIL_LSARPC'
        )
 
 
@@ -131,7 +131,7 @@ bld.SAMBA_MODULE('dcerpc_drsuapi',
        source='drsuapi/dcesrv_drsuapi.c drsuapi/updaterefs.c drsuapi/getncchanges.c drsuapi/addentry.c drsuapi/writespn.c drsuapi/drsutil.c',
        subsystem='dcerpc_server',
        init_function='dcerpc_server_drsuapi_init',
-       deps='samdb DCERPC_COMMON NDR_DRSUAPI security'
+       deps='samdb DCERPC_COMMON NDR_DRSUAPI samba-security'
        )