From: Günther Deschner <gd@samba.org>
Date: Wed, 23 Mar 2011 13:57:08 +0000 (+0100)
Subject: s3-passdb: move util_builtin.c out of passdb.
X-Git-Tag: ldb-1.1.0~413
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=a22a53ea44c18378481d3a432fb0e667117da5bd;p=samba.git

s3-passdb: move util_builtin.c out of passdb.

Guenther
---

diff --git a/source3/Makefile.in b/source3/Makefile.in
index e6d2d249bc5..7544cc1d8c3 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -759,7 +759,7 @@ PRIVILEGES_OBJ = lib/privileges.o
 PASSDB_GET_SET_OBJ = passdb/pdb_get_set.o
 
 PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \
-		lib/util_wellknown.o passdb/util_builtin.o passdb/pdb_compat.o \
+		lib/util_wellknown.o lib/util_builtin.o passdb/pdb_compat.o \
 		lib/util_unixsids.o passdb/lookup_sid.o \
 		passdb/login_cache.o @PDB_STATIC@ \
 		passdb/account_pol.o $(PRIVILEGES_OBJ) \
diff --git a/source3/passdb/util_builtin.c b/source3/lib/util_builtin.c
similarity index 99%
rename from source3/passdb/util_builtin.c
rename to source3/lib/util_builtin.c
index d37b8edff4e..e1b990619b4 100644
--- a/source3/passdb/util_builtin.c
+++ b/source3/lib/util_builtin.c
@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    Translate BUILTIN names to SIDs and vice versa
    Copyright (C) Volker Lendecke 2005
@@ -93,7 +93,7 @@ bool lookup_builtin_name(const char *name, uint32 *rid)
 
 /*****************************************************************
  Return the name of the BUILTIN domain
-*****************************************************************/  
+*****************************************************************/
 
 const char *builtin_domain_name(void)
 {
@@ -102,7 +102,7 @@ const char *builtin_domain_name(void)
 
 /*****************************************************************
  Check if the SID is the builtin SID (S-1-5-32).
-*****************************************************************/  
+*****************************************************************/
 
 bool sid_check_is_builtin(const struct dom_sid *sid)
 {
@@ -111,7 +111,7 @@ bool sid_check_is_builtin(const struct dom_sid *sid)
 
 /*****************************************************************
  Check if the SID is one of the builtin SIDs (S-1-5-32-a).
-*****************************************************************/  
+*****************************************************************/
 
 bool sid_check_is_in_builtin(const struct dom_sid *sid)
 {
@@ -122,4 +122,3 @@ bool sid_check_is_in_builtin(const struct dom_sid *sid)
 
 	return sid_check_is_builtin(&dom_sid);
 }
-
diff --git a/source3/wscript_build b/source3/wscript_build
index c03a6737bb4..9a3c88a9e66 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -227,7 +227,7 @@ PRIVILEGES_SRC = '''lib/privileges.c'''
 PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
 
 PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
-                lib/util_wellknown.c passdb/util_builtin.c passdb/pdb_compat.c
+                lib/util_wellknown.c lib/util_builtin.c passdb/pdb_compat.c
                 lib/util_unixsids.c passdb/lookup_sid.c
                 passdb/login_cache.c
                 passdb/account_pol.c ${PRIVILEGES_SRC}