From 07aa05f678defb69d0d4c6fc9c65750ecaa85bf6 Mon Sep 17 00:00:00 2001 From: Kai Blin Date: Sun, 1 Feb 2009 16:08:45 +0100 Subject: shared: Move dom_sid_* utility functions to top level --- source3/Makefile.in | 4 ++-- source3/samba4.mk | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'source3') diff --git a/source3/Makefile.in b/source3/Makefile.in index fa57db7f3f..bc306229c8 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -279,7 +279,6 @@ LIBNDR_OBJ = ../librpc/ndr/ndr_basic.o \ ../librpc/gen_ndr/ndr_security.o \ ../librpc/ndr/ndr_sec_helper.o \ librpc/ndr/ndr_string.o \ - librpc/ndr/sid.o \ ../librpc/ndr/uuid.o \ librpc/ndr/util.o @@ -364,7 +363,8 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \ lib/ldap_escape.o @CHARSET_STATIC@ \ lib/secdesc.o lib/util_seaccess.o lib/secace.o lib/secacl.o \ libads/krb5_errs.o lib/system_smbd.o lib/audit.o $(LIBNDR_OBJ) \ - lib/file_id.o lib/idmap_cache.o + lib/file_id.o lib/idmap_cache.o \ + ../libcli/security/dom_sid.o LIB_DUMMY_OBJ = lib/dummysmbd.o lib/dummyroot.o LIB_NONSMBD_OBJ = $(LIB_OBJ) $(LIB_DUMMY_OBJ) diff --git a/source3/samba4.mk b/source3/samba4.mk index 715961e4de..b7df7a58da 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -111,6 +111,7 @@ ntptrsrcdir := $(samba4srcdir)/ntptr clientsrcdir := $(samba4srcdir)/client libclisrcdir := $(samba4srcdir)/libcli libclinbtsrcdir := $(samba4srcdir)/../libcli/nbt +libclicommonsrcdir := $(samba4srcdir)/../libcli pyscriptsrcdir := $(samba4srcdir)/scripting/python kdcsrcdir := $(samba4srcdir)/kdc smbreadlinesrcdir := $(samba4srcdir)/lib/smbreadline -- cgit