summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2000-04-16 06:17:59 +0000
committerAndrew Tridgell <tridge@samba.org>2000-04-16 06:17:59 +0000
commit4a12fb79c0498c3094c4e744483925fd802cf171 (patch)
treec790a9e30ba38f797bd6363ecc77a44a08fa3b16 /source3
parentf77d9a2cca25c40456b9d37ede1f10f57454b2a4 (diff)
downloadsamba-4a12fb79c0498c3094c4e744483925fd802cf171.tar.gz
samba-4a12fb79c0498c3094c4e744483925fd802cf171.tar.bz2
samba-4a12fb79c0498c3094c4e744483925fd802cf171.zip
The following series of commits are for the new tdb based printing
backend. This completely replaces our old printing backend. Major changes include: - all print ops are now done in printing/*.c rather than scattered all over the place - system job ids are decoupled from SMB job ids - the lpq parsers don't need to be nearly so smart, they only need to parse the filename, the status and system job id - we can store lots more info about a job, including the full job name - the queue cache control is much better I also added a new utility routine file_lines_load() that loads a text file and parses it into lines. This is used in out lpq parsing and I also want to use it to replace all of our fgets() based code in other places. (This used to be commit 0b686601593bdc05778dcf70c391efd4fe017df7)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in16
-rwxr-xr-xsource3/configure4
-rw-r--r--source3/configure.in4
3 files changed, 13 insertions, 11 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 218ba5feac..2dfaea571f 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -155,21 +155,23 @@ SMBD_OBJ1 = smbd/server.o smbd/files.o smbd/chgpasswd.o smbd/connection.o \
smbd/dfree.o smbd/dir.o smbd/password.o smbd/conn.o smbd/fileio.o \
smbd/ipc.o smbd/mangle.o smbd/negprot.o \
smbd/message.o smbd/nttrans.o smbd/pipes.o \
- smbd/$(QUOTAOBJS) smbd/reply.o smbd/trans2.o smbd/uid.o \
+ smbd/reply.o smbd/trans2.o smbd/uid.o \
smbd/dosmode.o smbd/filename.o smbd/open.o smbd/close.o smbd/blocking.o \
smbd/vfs.o smbd/vfs-wrap.o \
lib/msrpc-client.o lib/msrpc_use.o \
rpc_parse/parse_creds.o \
- smbd/process.o smbd/oplock.o smbd/service.o smbd/error.o printing/nt_printing.o
+ smbd/process.o smbd/oplock.o smbd/service.o smbd/error.o
-PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/printing.o \
- printing/print_cups.o printing/lpq_parse.o
+PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_cups.o printing/load.o
+
+PRINTBACKEND_OBJ = printing/printing.o printing/lpq_parse.o printing/nt_printing.o
MSDFS_OBJ = msdfs/msdfs.o msdfs/msdfs_tdb.o msdfs/parse_dfs_map.o
SMBD_OBJ = $(SMBD_OBJ1) $(MSDFS_OBJ) $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) \
$(RPC_SERVER_OBJ) $(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) \
- $(LOCKING_OBJ) $(PASSDB_OBJ) $(PRINTING_OBJ) $(PROFILE_OBJ) $(LIB_OBJ)
+ $(LOCKING_OBJ) $(PASSDB_OBJ) $(PRINTING_OBJ) $(PROFILE_OBJ) $(LIB_OBJ) \
+ $(PRINTBACKEND_OBJ) $(QUOTAOBJS)
NMBD_OBJ1 = nmbd/asyncdns.o nmbd/nmbd.o nmbd/nmbd_become_dmb.o \
@@ -189,9 +191,9 @@ NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) \
$(LIB_OBJ)
SWAT_OBJ = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
- web/swat.o $(LIBSMB_OBJ) $(LOCKING_OBJ) \
+ web/swat.o $(PRINTING_OBJ) $(LIBSMB_OBJ) $(LOCKING_OBJ) \
$(PARAM_OBJ) $(PASSDB_OBJ) $(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) \
- $(UBIQX_OBJ) $(LIB_OBJ) $(PRINTING_OBJ)
+ $(UBIQX_OBJ) $(LIB_OBJ)
SMBRUN_OBJ = utils/smbrun.o lib/util_sec.o
diff --git a/source3/configure b/source3/configure
index 45c731edff..d99ed5511c 100755
--- a/source3/configure
+++ b/source3/configure
@@ -10355,7 +10355,7 @@ fi
#################################################
# check for experimental disk-quotas support
-QUOTAOBJS=noquotas.o
+QUOTAOBJS=smbd/noquotas.o
echo $ac_n "checking whether to support disk-quotas""... $ac_c" 1>&6
echo "configure:10362: checking whether to support disk-quotas" >&5
@@ -10365,7 +10365,7 @@ if test "${with_quotas+set}" = set; then
case "$withval" in
yes)
echo "$ac_t""yes" 1>&6
- QUOTAOBJS=quotas.o
+ QUOTAOBJS=smbd/quotas.o
;;
*)
echo "$ac_t""no" 1>&6
diff --git a/source3/configure.in b/source3/configure.in
index 665b568f33..2c068650e1 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1414,7 +1414,7 @@ AC_ARG_WITH(netatalk,
#################################################
# check for experimental disk-quotas support
-QUOTAOBJS=noquotas.o
+QUOTAOBJS=smbd/noquotas.o
AC_MSG_CHECKING(whether to support disk-quotas)
AC_ARG_WITH(quotas,
@@ -1423,7 +1423,7 @@ AC_ARG_WITH(quotas,
[ case "$withval" in
yes)
AC_MSG_RESULT(yes)
- QUOTAOBJS=quotas.o
+ QUOTAOBJS=smbd/quotas.o
;;
*)
AC_MSG_RESULT(no)