sqlite3-using idmap (sans conversions)

exception_lists/cstyle

@@ -104,6 +104,7 @@ usr/src/common/bzip2/decompress.c
 usr/src/common/bzip2/bzlib_private.h
 usr/src/common/bzip2/huffman.c
 usr/src/common/crypto/chacha/chacha.c
+usr/src/common/sqlite3
 usr/src/contrib/
 usr/src/grub/grub-0.97/grub/asmstub.c
 usr/src/grub/grub-0.97/stage2/bios.c
@@ -1273,6 +1274,7 @@ usr/src/uts/intel/sys/vmm.h
 usr/src/uts/intel/sys/vmm_dev.h
 usr/src/lib/lib9p/common/*
 usr/src/cmd/sendmail/*
+usr/src/cmd/sqlite/*
 usr/src/cmd/cmd-inet/usr.bin/pppd/*
 
 # loader UEFI headers

exception_lists/hdrchk

@@ -30,6 +30,7 @@ usr/src/cmd/pools/poold/libjpool/jpool.h
 usr/src/cmd/pools/poold/libjsyslog/jsyslog.h
 usr/src/common/ficl/ficltokens.h
 usr/src/contrib
+usr/src/common/sqlite3
 usr/src/grub/grub-0.97/stage2/shared.h
 usr/src/lib/libadt_jni/com/sun/audit/AuditSession.h
 usr/src/lib/libdtrace_jni/java/native/LocalConsumer.h

exception_lists/interface_check

@@ -94,6 +94,7 @@ NOVERDEF	^usr/sadm/admin/dhcpmgr/dhcpmgr\.so\.1$
 # Objects that are allowed to deviate from our standard version
 # names.
 NONSTD_VERNAME	^MACH(lib)/libsqlite-sys\.so\.
+NONSTD_VERNAME	^MACH(lib)/libsqlite3-sys\.so\.
 NONSTD_VERNAME	^usr/MACH(lib)/libtecla\.so\.1$
 
 # These libc variants have an SONAME of libc\.so\.1$

exception_lists/keywords

@@ -29,6 +29,7 @@ syntax: glob
 usr/src/cmd/boot/common/bblk_einfo.c
 usr/src/cmd/zonestat/zonestat/zonestat.c
 usr/src/contrib/*
+usr/src/common/sqlite3/*
 usr/src/data/locale/data/zh_CN.UTF-8.src
 usr/src/data/locale/data/zh_HK.UTF-8.src
 usr/src/data/locale/data/zh_MO.UTF-8.src

exception_lists/packaging

@@ -480,6 +480,9 @@ usr/include/sys/ilstr.h
 #
 usr/include/sqlite-sys
 lib/libsqlite-sys.so
+lib/libsqlite3-sys.so
+lib/amd64/libsqlite3-sys.so	i386
+
 #
 # Private/Internal kiconv header files. Do not ship.
 #

exception_lists/wscheck

@@ -39,6 +39,7 @@ usr/src/uts/common/io/igc/core/*
 usr/src/uts/common/io/ixgbe/core/*
 usr/src/uts/common/sys/scsi/adapters/mpi/*
 usr/src/contrib/*
+usr/src/common/sqlite3/*
 usr/src/cmd/ast/libshell/misc/shell_styleguide.docbook
 
 usr/src/data/ucode/amd/*

usr/src/cmd/idmap/idmapd/Makefile

@@ -44,15 +44,17 @@ SERVEROBJS =				\
 	server.o			\
 	wksids.o
 
+# ilstr is not generated, but similarly exempt  from gettext
 GENOBJS =				\
 	adspriv_srv.o			\
+	ilstr.o				\
 	rpc_svc.o
 
 SERVERSRCS =	$(SERVEROBJS:%.o=%.c)
 GENSRCS =	$(GENOBJS:%.o=%.c)
 OBJS =		$(SERVEROBJS) $(GENOBJS)
 SRCS =		$(SERVERSRCS)
-POFILES =	$(OBJS:%.o=%.po)
+POFILES =	$(SERVEROBJS:%.o=%.po)
 
 all :=		TARGET = all
 install :=	TARGET = install
@@ -82,14 +84,21 @@ RPC_MSGOUT_OPT = -DRPC_MSGOUT=idmap_rpc_msgout
 
 ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)
 $(ROOTMANIFEST) := FILEMODE= 444
+
+ROOTIDMAPDIR = $(ROOTSHLIB)/idmap
+ROOTSCHEMADIR = $(ROOTIDMAPDIR)/schema
+ROOTCACHESCHEMA = $(ROOTSCHEMADIR)/cache
+ROOTDBSCHEMA = $(ROOTSCHEMADIR)/db
+
 RPCSVC= ../../../uts/common/rpcsvc
 ADS_CMN=../../../lib/libads/common
 
-INCS += -I. -I../../../lib/libidmap/common \
-	 -I../../../lib/libsldap/common \
-	 -I../../../lib/libadutils/common \
-	 -I $(ADS_CMN) \
-	 -I../../../lib/smbsrv/libsmb/common
+INCS += -I. -I../../../lib/libidmap/common	\
+	 -I../../../lib/libsldap/common		\
+	 -I../../../lib/libadutils/common	\
+	 -I $(ADS_CMN)				\
+	 -I../../../lib/smbsrv/libsmb/common	\
+	-I$(SRC)/common/sqlite3/
 
 # Should not have to do this, but the Kerberos includes are a mess.
 INCS += -I $(ROOT)/usr/include/kerberosv5
@@ -100,7 +109,7 @@ $(POFILE) := CPPFLAGS += $(INCS)
 CFLAGS += $(CCVERBOSE)
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DIDMAPD_DEBUG
 LDLIBS +=				\
-	-lsqlite-sys			\
+	-lsqlite3-sys			\
 	-lsecdb				\
 	-lsocket			\
 	-lnsl				\
@@ -139,7 +148,8 @@ $(POFILE): $(POFILES)
 	$(RM) $(POFILE)
 	cat $(POFILES) > $(POFILE)
 
-install: all $(ROOTLIBPROG) $(ROOTMANIFEST)
+install: all $(ROOTLIBPROG) $(ROOTMANIFEST) $(ROOTCACHESCHEMA)/1_cache.sql \
+	$(ROOTDBSCHEMA)/1_db.sql
 
 check: $(CHKMANIFEST)
 
@@ -150,12 +160,30 @@ RPCGENFLAGS = -CMN
 
 adspriv_srv.o : adspriv_srv.c
 
-adspriv_srv.c:
+adspriv_srv.c: $(ADS_CMN)/ads_priv.x
 	$(RPCGEN) $(RPCGENFLAGS) -m $(ADS_CMN)/ads_priv.x > $@
 
+ilstr.o: $(SRC)/common/ilstr/ilstr.c
+	$(COMPILE.c) $(SRC)/common/ilstr/ilstr.c -o $@
+	$(CTFCONVERT_O)
+
 rpc_svc.o : rpc_svc.c
 
 rpc_svc.c : $(RPCSVC)/idmap_prot.x
 	$(RPCGEN) $(RPCGENFLAGS) -m $(RPCSVC)/idmap_prot.x > $@
 
+$(ROOTDBSCHEMA):
+	$(INS.dir)
+$(ROOTCACHESCHEMA):
+	$(INS.dir)
+
+$(ROOTDBSCHEMA)/% := FILEMODE = 0444
+$(ROOTCACHESCHEMA)/% := FILEMODE = 0444
+
+$(ROOTDBSCHEMA)/%: schema/db/% $(ROOTDBSCHEMA)
+	$(INS.file)
+
+$(ROOTCACHESCHEMA)/%: schema/cache/% $(ROOTCACHESCHEMA)
+	$(INS.file)
+
 include ../../Makefile.targ