From 204ba6577272530edb34ada9389b491c5fd60361 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Fri, 24 Sep 2010 17:18:03 -0700 Subject: [PATCH] s4-waf: rename subsystem NDR_LSAPRC to NDR_LSA. Guenther --- librpc/wscript_build | 4 ++-- source3/wscript_build | 18 +++++++++--------- source4/librpc/wscript_build | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/librpc/wscript_build b/librpc/wscript_build index a9ce14866e4..61546c31ef7 100644 --- a/librpc/wscript_build +++ b/librpc/wscript_build @@ -184,10 +184,10 @@ bld.SAMBA_SUBSYSTEM('NDR_NTPRINTING', bld.SAMBA_SUBSYSTEM('NDR_SAMR', source='../librpc/gen_ndr/ndr_samr.c', - public_deps='LIBNDR NDR_SECURITY NDR_LSARPC' + public_deps='LIBNDR NDR_SECURITY NDR_LSA' ) -bld.SAMBA_SUBSYSTEM('NDR_LSARPC', +bld.SAMBA_SUBSYSTEM('NDR_LSA', source='../librpc/gen_ndr/ndr_lsa.c', public_deps='LIBNDR NDR_SECURITY' ) diff --git a/source3/wscript_build b/source3/wscript_build index badea918b7b..b5b107a2ef3 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1416,7 +1416,7 @@ bld.SAMBA_BINARY('nmbd/nmbd', source=NMBD_SRC, deps='''talloc tdb tevent ZLIB cap resolv libwbclient dl NSS_WRAPPER PASSDB PARAM ldap LIB_NONSMBD LIBSMB - POPT_SAMBA KRBCLIENT NDR_SAMR NDR_LSARPC''', + POPT_SAMBA KRBCLIENT NDR_SAMR NDR_LSA''', install_path='${SBINDIR}', vars=locals()) @@ -1471,7 +1471,7 @@ bld.SAMBA_BINARY('profiles', bld.SAMBA_BINARY('smbspool', source=CUPS_SRC, deps='''talloc tdb tevent resolv cap libwbclient POPT_SAMBA PARAM LIBSMB LIB_NONSMBD LIBS - KRBCLIENT ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC''', + KRBCLIENT ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA_BINARY('testparm', @@ -1530,7 +1530,7 @@ bld.SAMBA_BINARY('nmblookup', bld.SAMBA_BINARY('smbtorture', source=SMBTORTURE_SRC, deps='''talloc tdb tevent cap resolv libwbclient PARAM LIBSMB KRBCLIENT - LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC''', + LIB_NONSMBD POPT_SAMBA ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA_BINARY('smbconftort', @@ -1541,7 +1541,7 @@ bld.SAMBA_BINARY('smbconftort', bld.SAMBA_BINARY('masktest', source=MASKTEST_SRC, deps='''talloc tdb cap resolv libwbclient PARAM LIB_NONSMBD LIBSMB KRBCLIENT - ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC''', + ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA_BINARY('msgtest', @@ -1576,7 +1576,7 @@ bld.SAMBA_BINARY('sharesec', bld.SAMBA_BINARY('locktest', source=LOCKTEST_SRC, deps='''talloc tdb tevent cap resolv libwbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD - ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC LOCKING''', + ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING''', vars=locals()) bld.SAMBA_BINARY('nsstest', @@ -1587,7 +1587,7 @@ bld.SAMBA_BINARY('nsstest', bld.SAMBA_BINARY('pdbtest', source=PDBTEST_SRC, deps='''talloc tdb cap resolv libwbclient PARAM LIBSMB KRBCLIENT LIB_NONSMBD PASSDB GROUPDB - SMBLDAP POPT_SAMBA NDR_SAMR NDR_LSARPC''', + SMBLDAP POPT_SAMBA NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA_BINARY('vfstest', @@ -1608,7 +1608,7 @@ bld.SAMBA_BINARY('log2pcap', bld.SAMBA_BINARY('locktest2', source=LOCKTEST2_SRC, deps='''talloc tdb tevent cap resolv libwbclient PARAM KRBCLIENT LIBSMB LIB_NONSMBD - ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSARPC LOCKING''', + ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING''', vars=locals()) bld.SAMBA_BINARY('debug2html', @@ -1619,7 +1619,7 @@ bld.SAMBA_BINARY('debug2html', bld.SAMBA_BINARY('smbfilter', source=SMBFILTER_SRC, deps='''talloc tevent cap resolv libwbclient PARAM LIBSMB LIB_NONSMBD KRBCLIENT ASN1_UTIL LIBTSOCKET - NDR_SAMR NDR_LSARPC''', + NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA_BINARY('versiontest', @@ -1638,7 +1638,7 @@ bld.SAMBA_BINARY('ntlm_auth', deps='''tdb talloc cap resolv krb5 k5crypto com_err libwbclient PARAM LIB_NONSMBD LIBS LIBSAMBA POPT_SAMBA ASN1_UTIL LIBTSOCKET PASSDB GROUPDB SMBLDAP WBCOMMON LIBINIPARSER LIBADS_SERVER - NDR_SAMR NDR_LSARPC''', + NDR_SAMR NDR_LSA''', vars=locals()) bld.SAMBA_BINARY('timelimit', diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index 967693a8db8..ca36693525d 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -96,7 +96,7 @@ bld.SAMBA_LIBRARY('NDR_STANDARD', source='../../librpc/gen_ndr/ndr_echo.c ../../librpc/ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_dfs.c ../../librpc/gen_ndr/ndr_atsvc.c ../../librpc/gen_ndr/ndr_wkssvc.c ../../librpc/gen_ndr/ndr_srvsvc.c ../../librpc/ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_winreg.c ../../librpc/gen_ndr/ndr_initshutdown.c ../../librpc/gen_ndr/ndr_eventlog.c ../../librpc/gen_ndr/ndr_ntsvcs.c ../../librpc/gen_ndr/ndr_eventlog6.c', vnum='0.0.1', pc_files='../../librpc/ndr_standard.pc', - deps='NDR_SECURITY NDR_LSARPC NDR_SAMR', + deps='NDR_SECURITY NDR_LSA NDR_SAMR', 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' -- 2.34.1