diff -r 30113bfbe723 -r b3afb9f1e801 daemon/Makefile.in
--- a/daemon/Makefile.in	Sun Jan 20 00:12:17 2008 +0100
+++ b/daemon/Makefile.in	Sun Jan 20 00:22:09 2008 +0100
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -46,10 +46,9 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -58,12 +57,15 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 CC = @CC@
-CDBPROGS = @CDBPROGS@
-CDBSCRIPTS = @CDBSCRIPTS@
 CXX = @CXX@
+HAVE_LIB = @HAVE_LIB@
 HTML2TXT = @HTML2TXT@
+LIB = @LIB@
 LN = @LN@
+LTLIB = @LTLIB@
 LYNX = @LYNX@
 MAKEINFO = @MAKEINFO@
 MKDIR = @MKDIR@
@@ -91,12 +93,11 @@
 
 EXTRA_DIST = $(man_MANS) $(noinst_HTMLS) $(noinst_PODS)
 
-CXXLINK = $(CC) $(CXXFLAGS) $(LDFLAGS) -o $@
 INCLUDES = -I../lib
 
-vmailmgrd_SOURCES = daemon.h 	adduser2.cc 	autoresponse.cc 	chattr.cc 	check.cc 	command.h command.cc 	deluser.cc 	dispatch.cc 	listdomain.cc 	log.h log.cc 	lookup.cc 	main.cc 	state.h state.cc
+vmailmgrd_SOURCES = daemon.h 	adduser.cc 	autoresponse.cc 	chattr.cc 	check.cc 	command.h command.cc 	deluser.cc 	dispatch.cc 	listdomain.cc 	log.h log.cc 	lookup.cc 	main.cc 	stat.cc 	state.h state.cc
 
-vmailmgrd_LDADD = ../lib/libvmailmgr.a ../lib/cli/libcli.a
+vmailmgrd_LDADD = ../lib/libvmailmgr.a ../lib/cli++/libcli++.a
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -107,14 +108,14 @@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-vmailmgrd_OBJECTS =  adduser2.o autoresponse.o chattr.o check.o \
-command.o deluser.o dispatch.o listdomain.o log.o lookup.o main.o \
-state.o
-vmailmgrd_DEPENDENCIES =  ../lib/libvmailmgr.a ../lib/cli/libcli.a
+vmailmgrd_OBJECTS =  adduser.o autoresponse.o chattr.o check.o command.o \
+deluser.o dispatch.o listdomain.o log.o lookup.o main.o stat.o state.o
+vmailmgrd_DEPENDENCIES =  ../lib/libvmailmgr.a ../lib/cli++/libcli++.a
 vmailmgrd_LDFLAGS = 
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -128,7 +129,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(vmailmgrd_SOURCES)
 OBJECTS = $(vmailmgrd_OBJECTS)
@@ -158,8 +159,8 @@
 	$(mkinstalldirs) $(DESTDIR)$(sbindir)
 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
@@ -278,26 +279,7 @@
 	  fi; \
 	done
 	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-addalias.o: addalias.cc ../config.h daemon.h ../lib/mystring/mystring.h \
-	../lib/fdbuf/fdbuf.h ../lib/misc/pwentry.h \
-	../lib/config/configrc.h ../lib/misc/strlist.h \
-	../lib/vpw/vpwentry.h ../lib/misc/pwcrypt.h ../lib/misc/itoa.h \
-	state.h ../lib/misc/vdomain.h ../lib/vpw/vpwtable.h \
-	../lib/misc/response.h command.h log.h
-addaliasp.o: addaliasp.cc ../config.h daemon.h \
-	../lib/mystring/mystring.h ../lib/fdbuf/fdbuf.h \
-	../lib/misc/pwentry.h ../lib/config/configrc.h \
-	../lib/misc/strlist.h ../lib/vpw/vpwentry.h \
-	../lib/misc/pwcrypt.h ../lib/misc/itoa.h state.h \
-	../lib/misc/vdomain.h ../lib/vpw/vpwtable.h \
-	../lib/misc/response.h command.h log.h
 adduser.o: adduser.cc ../config.h daemon.h ../lib/mystring/mystring.h \
-	../lib/fdbuf/fdbuf.h ../lib/misc/pwentry.h \
-	../lib/config/configrc.h ../lib/misc/strlist.h \
-	../lib/vpw/vpwentry.h ../lib/misc/pwcrypt.h ../lib/misc/itoa.h \
-	state.h ../lib/misc/vdomain.h ../lib/vpw/vpwtable.h \
-	../lib/misc/response.h command.h log.h
-adduser2.o: adduser2.cc ../config.h daemon.h ../lib/mystring/mystring.h \
 	../lib/mystring/rep.h ../lib/mystring/iter.h \
 	../lib/mystring/join.h ../lib/misc/pwentry.h \
 	../lib/config/configrc.h ../lib/misc/strlist.h \
@@ -362,15 +344,6 @@
 	../lib/vpwtable/vpwtable.h ../lib/misc/response.h command.h \
 	log.h ../lib/fdbuf/fdbuf.h ../lib/fdbuf/fdibuf.h \
 	../lib/fdbuf/fdobuf.h ../lib/misc/lookup.h
-fork.o: fork.cc ../config.h daemon.h ../lib/mystring/mystring.h \
-	../lib/mystring/rep.h ../lib/mystring/iter.h \
-	../lib/mystring/join.h ../lib/misc/pwentry.h \
-	../lib/config/configrc.h ../lib/misc/strlist.h \
-	../lib/vpwentry/vpwentry.h ../lib/misc/pwcrypt.h \
-	../lib/misc/itoa.h state.h ../lib/vdomain/vdomain.h \
-	../lib/vpwtable/vpwtable.h ../lib/misc/response.h command.h \
-	log.h ../lib/fdbuf/fdbuf.h ../lib/fdbuf/fdibuf.h \
-	../lib/fdbuf/fdobuf.h ../lib/ac/wait.h
 listdomain.o: listdomain.cc ../config.h daemon.h \
 	../lib/mystring/mystring.h ../lib/mystring/rep.h \
 	../lib/mystring/iter.h ../lib/mystring/join.h \
@@ -400,7 +373,7 @@
 	log.h ../lib/fdbuf/fdbuf.h ../lib/fdbuf/fdibuf.h \
 	../lib/fdbuf/fdobuf.h ../lib/misc/lookup.h \
 	../lib/misc/pwentry_table.h
-main.o: main.cc ../config.h ../lib/cli/cli.h daemon.h \
+main.o: main.cc ../config.h ../lib/cli++/cli++.h daemon.h \
 	../lib/mystring/mystring.h ../lib/mystring/rep.h \
 	../lib/mystring/iter.h ../lib/mystring/join.h \
 	../lib/misc/pwentry.h ../lib/config/configrc.h \
@@ -409,6 +382,16 @@
 	../lib/vdomain/vdomain.h ../lib/vpwtable/vpwtable.h \
 	../lib/misc/response.h command.h log.h ../lib/fdbuf/fdbuf.h \
 	../lib/fdbuf/fdibuf.h ../lib/fdbuf/fdobuf.h
+stat.o: stat.cc ../config.h daemon.h ../lib/mystring/mystring.h \
+	../lib/mystring/rep.h ../lib/mystring/iter.h \
+	../lib/mystring/join.h ../lib/misc/pwentry.h \
+	../lib/config/configrc.h ../lib/misc/strlist.h \
+	../lib/vpwentry/vpwentry.h ../lib/misc/pwcrypt.h \
+	../lib/misc/itoa.h state.h ../lib/vdomain/vdomain.h \
+	../lib/vpwtable/vpwtable.h ../lib/misc/response.h command.h \
+	log.h ../lib/fdbuf/fdbuf.h ../lib/fdbuf/fdibuf.h \
+	../lib/fdbuf/fdobuf.h ../lib/misc/lookup.h ../lib/misc/utoa.h \
+	../lib/misc/stat_fns.h ../lib/ac/dirent.h
 state.o: state.cc state.h ../lib/misc/pwentry.h \
 	../lib/mystring/mystring.h ../lib/mystring/rep.h \
 	../lib/mystring/iter.h ../lib/mystring/join.h \
@@ -438,7 +421,7 @@
 all-am: Makefile $(PROGRAMS) $(MANS)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8
 
@@ -496,8 +479,8 @@
 dist-hook:
 	touch $(distdir)/*.html $(distdir)/*.[123456789]
 
-vmailmgrd.pod: main.cc ../configure.in ../lib/cli/cli2pod.pl
-	perl ../lib/cli/cli2pod.pl $< >$@
+vmailmgrd.pod: main.cc ../configure.in ../lib/cli++/cli++topod.pl
+	perl ../lib/cli++/cli++topod.pl $< >$@
 %.8: %.pod ../configure.in; $(POD2MAN) --section=8 $< >$@
 %.html: %.pod; $(POD2HTML) $< >$@