summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libcli/security/wscript_build2
-rw-r--r--nsswitch/wscript_build2
-rw-r--r--source3/wscript_build2
-rw-r--r--source4/auth/credentials/wscript_build2
-rw-r--r--source4/auth/ntlm/wscript_build10
-rw-r--r--source4/auth/wscript_build2
-rw-r--r--source4/dsdb/samdb/ldb_modules/wscript_build18
-rw-r--r--source4/lib/ldb-samba/wscript_build2
-rw-r--r--source4/libcli/security/wscript_build12
-rw-r--r--source4/libcli/wscript_build6
-rwxr-xr-xsource4/librpc/wscript_build2
-rw-r--r--source4/rpc_server/wscript_build6
12 files changed, 33 insertions, 33 deletions
diff --git a/libcli/security/wscript_build b/libcli/security/wscript_build
index 97c678546d..ddf679c141 100644
--- a/libcli/security/wscript_build
+++ b/libcli/security/wscript_build
@@ -1,7 +1,7 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('LIBSECURITY',
+bld.SAMBA_LIBRARY('libsecurity',
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',
private_library=True,
deps='talloc LIBNDR NDR_SECURITY'
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 2252537186..e367cc726c 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -16,7 +16,7 @@ bld.SAMBA_BINARY('nsstest',
bld.SAMBA_BINARY('wbinfo',
source='wbinfo.c',
- deps='LIBSAMBA-UTIL LIBCLI_AUTH popt POPT_SAMBA libwinbind-client LIBWBCLIENT tevent UTIL_TEVENT LIBASYNC_REQ LIBSECURITY LIBNDR NDR_SECURITY'
+ deps='LIBSAMBA-UTIL LIBCLI_AUTH popt POPT_SAMBA libwinbind-client LIBWBCLIENT tevent UTIL_TEVENT LIBASYNC_REQ libsecurity LIBNDR NDR_SECURITY'
)
bld.SAMBA_LIBRARY('nss_winbind',
diff --git a/source3/wscript_build b/source3/wscript_build
index 649b30ece0..5f8df0cf05 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1049,7 +1049,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
bld.SAMBA_SUBSYSTEM('LIBS',
source=LIB_SRC,
- deps='iconv LIBCRYPTO LIBNDR LIBSECURITY NDR_SECURITY charset NDR_MESSAGING',
+ deps='iconv LIBCRYPTO LIBNDR libsecurity NDR_SECURITY charset NDR_MESSAGING',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
diff --git a/source4/auth/credentials/wscript_build b/source4/auth/credentials/wscript_build
index be004a87c6..2e962267c2 100644
--- a/source4/auth/credentials/wscript_build
+++ b/source4/auth/credentials/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_SUBSYSTEM('CREDENTIALS',
source='credentials.c',
autoproto='credentials_proto.h',
public_headers='credentials.h',
- deps='LIBCRYPTO LIBSAMBA-ERRORS libevents LIBCLI_AUTH LIBSECURITY',
+ deps='LIBCRYPTO LIBSAMBA-ERRORS libevents LIBCLI_AUTH libsecurity',
)
bld.SAMBA_SUBSYSTEM('CREDENTIALS_KRB5',
diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index 20d914c8f9..12bf184a8e 100644
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -53,11 +53,11 @@ bld.SAMBA_SUBSYSTEM('PAM_ERRORS',
bld.SAMBA_LIBRARY('auth',
- source='auth.c auth_util.c auth_simple.c',
- autoproto='auth_proto.h',
- deps='LIBSAMBA-UTIL LIBSECURITY SAMDB CREDENTIALS UTIL_TEVENT',
- private_library=True
- )
+ source='auth.c auth_util.c auth_simple.c',
+ autoproto='auth_proto.h',
+ deps='LIBSAMBA-UTIL libsecurity SAMDB CREDENTIALS UTIL_TEVENT',
+ private_library=True
+ )
bld.SAMBA_MODULE('auth_server_service',
source='auth_server_service.c',
diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build
index e44a0324f9..03812f5185 100644
--- a/source4/auth/wscript_build
+++ b/source4/auth/wscript_build
@@ -33,7 +33,7 @@ bld.SAMBA_SUBSYSTEM('auth_system_session',
bld.SAMBA_SUBSYSTEM('auth_sam',
source='sam.c',
autoproto='auth_sam.h',
- public_deps='SAMDB LIBSECURITY ldb tevent',
+ public_deps='SAMDB libsecurity ldb tevent',
deps=''
)
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index c41eabdc1e..f303e0f212 100644
--- 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 LIBNDR samdb_common LIBSECURITY_SESSION'
+ deps='ldb LIBNDR samdb_common libsecurity_session'
)
bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_RIDALLOC',
@@ -56,7 +56,7 @@ bld.SAMBA_MODULE('ldb_repl_meta_data',
subsystem='ldb',
init_function='LDB_MODULE(repl_meta_data)',
internal_module=False,
- deps='SAMDB talloc libevents LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR DSDB_MODULE_HELPERS LIBSECURITY_SESSION'
+ deps='SAMDB talloc libevents LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR DSDB_MODULE_HELPERS libsecurity_session'
)
@@ -119,7 +119,7 @@ bld.SAMBA_MODULE('ldb_samba3sam',
subsystem='ldb',
init_function='LDB_MODULE(samba3sam)',
internal_module=False,
- deps='talloc libevents ldb SMBPASSWD LIBSECURITY NDR_SECURITY'
+ deps='talloc libevents ldb SMBPASSWD libsecurity NDR_SECURITY'
)
@@ -128,7 +128,7 @@ bld.SAMBA_MODULE('ldb_samba3sid',
subsystem='ldb',
init_function='LDB_MODULE(samba3sid)',
internal_module=False,
- deps='talloc libevents ldb SMBPASSWD LIBSECURITY NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS'
+ deps='talloc libevents ldb SMBPASSWD libsecurity NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS'
)
@@ -147,7 +147,7 @@ bld.SAMBA_MODULE('ldb_rootdse',
subsystem='ldb',
init_function='LDB_MODULE(rootdse)',
internal_module=False,
- deps='talloc libevents SAMDB MESSAGING LIBSECURITY_SESSION DSDB_MODULE_HELPERS'
+ deps='talloc libevents SAMDB MESSAGING libsecurity_session DSDB_MODULE_HELPERS'
)
@@ -238,7 +238,7 @@ bld.SAMBA_MODULE('ldb_objectclass',
subsystem='ldb',
init_function='LDB_MODULE(objectclass)',
internal_module=False,
- deps='talloc libevents LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS LIBSAMBA-UTIL DSDB_MODULE_HELPER_SCHEMA'
+ deps='talloc libevents libsecurity NDR_SECURITY SAMDB DSDB_MODULE_HELPERS LIBSAMBA-UTIL DSDB_MODULE_HELPER_SCHEMA'
)
@@ -319,7 +319,7 @@ bld.SAMBA_MODULE('ldb_descriptor',
subsystem='ldb',
init_function='LDB_MODULE(descriptor)',
internal_module=False,
- deps='talloc libevents LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'
+ deps='talloc libevents libsecurity NDR_SECURITY SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'
)
@@ -337,7 +337,7 @@ bld.SAMBA_MODULE('ldb_acl',
subsystem='ldb',
init_function='LDB_MODULE(acl)',
internal_module=False,
- deps='talloc libevents LIBSECURITY SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'
+ deps='talloc libevents libsecurity SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'
)
@@ -354,7 +354,7 @@ bld.SAMBA_MODULE('ldb_aclread',
subsystem='ldb',
init_function='LDB_MODULE(aclread)',
internal_module=False,
- deps='talloc libevents LIBSECURITY SAMDB DSDB_MODULE_HELPERS',
+ deps='talloc libevents libsecurity SAMDB DSDB_MODULE_HELPERS',
)
bld.SAMBA_MODULE('ldb_simple_dn',
diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build
index a2ac32bdbe..79e2475404 100644
--- a/source4/lib/ldb-samba/wscript_build
+++ b/source4/lib/ldb-samba/wscript_build
@@ -9,7 +9,7 @@ bld.SAMBA_SUBSYSTEM('LDBSAMBA',
autoproto='ldif_handlers_proto.h',
public_deps='ldb',
public_headers='ldb_wrap.h',
- deps='LIBSECURITY LIBNDR NDR_DRSBLOBS CREDENTIALS NDR_DNSP SAMDB'
+ deps='libsecurity LIBNDR NDR_DRSBLOBS CREDENTIALS NDR_DNSP SAMDB'
)
diff --git a/source4/libcli/security/wscript_build b/source4/libcli/security/wscript_build
index 5df9c119a7..a24977c23b 100644
--- a/source4/libcli/security/wscript_build
+++ b/source4/libcli/security/wscript_build
@@ -1,9 +1,9 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('LIBSECURITY_SESSION',
- source='session.c',
- autoproto='session_proto.h',
- public_deps='LIBSECURITY',
- private_library=True
- )
+bld.SAMBA_LIBRARY('libsecurity_session',
+ source='session.c',
+ autoproto='session_proto.h',
+ public_deps='libsecurity',
+ private_library=True
+ )
diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index 45f9d48b62..e11d372d18 100644
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -23,7 +23,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_LSA',
source='util/clilsa.c',
autoproto='util/clilsa.h',
public_deps='RPC_NDR_LSA',
- deps='LIBSECURITY'
+ deps='libsecurity'
)
@@ -79,7 +79,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',
autoproto='libcli_proto.h',
- public_deps='LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
+ public_deps='LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH LIBCLI_SMB_COMPOSITE LIBCLI_NBT libsecurity LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
)
@@ -87,7 +87,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_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 gensec LIBCRYPTO CREDENTIALS LIBCLI_SMB_COMMON',
- deps='LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE LIBSECURITY LIBNDR'
+ deps='LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE libsecurity LIBNDR'
)
bld.RECURSE('smb2')
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 4f07f91f13..0acf4cc3ab 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -98,7 +98,7 @@ bld.SAMBA_LIBRARY('NDR_STANDARD',
pc_files='../../librpc/ndr_standard.pc',
deps='''NDR_SECURITY NDR_LSA NDR_SAMR NDR_NETLOGON NDR_EVENTLOG NDR_DFS
NDR_NTSVCS NDR_SVCCTL NDR_INITSHUTDOWN NDR_WKSSVC NDR_SRVSVC NDR_WINREG
- NDR_ECHO LIBSECURITY NDR_DNS''',
+ NDR_ECHO libsecurity NDR_DNS''',
public_deps='LIBNDR',
public_headers='../../librpc/gen_ndr/samr.h ../../librpc/gen_ndr/ndr_samr.h ../../librpc/gen_ndr/lsa.h ../../librpc/gen_ndr/netlogon.h ../../librpc/gen_ndr/atsvc.h ../../librpc/gen_ndr/ndr_atsvc.h ../../librpc/gen_ndr/ndr_svcctl.h ../../librpc/gen_ndr/svcctl.h',
header_path='gen_ndr'
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 047a2c1107..18d4be30ca 100644
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -77,7 +77,7 @@ bld.SAMBA_MODULE('dcerpc_winreg',
source='winreg/rpc_winreg.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_winreg_init',
- deps='registry NDR_STANDARD LIBSECURITY_SESSION',
+ deps='registry NDR_STANDARD libsecurity_session',
internal_module=True
)
@@ -95,7 +95,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 LIBSECURITY_SESSION'
+ deps='SAMDB DCERPC_COMMON NDR_STANDARD LIBCLI_AUTH NDR_DSSETUP com_err libsecurity_session'
)
@@ -112,7 +112,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 LIBSECURITY_SESSION'
+ deps='SAMDB DCERPC_COMMON NDR_DRSUAPI libsecurity_session'
)