summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorKarolin Seeger <kseeger@samba.org>2008-09-23 16:54:05 -0700
committerKarolin Seeger <kseeger@samba.org>2008-09-23 16:57:58 -0700
commit765e5d2282959770ea9648e0f2b72e51e5b4cdd8 (patch)
treebf59bcd16948792db4fad6e8fad5be03f13fd286 /source3/include
parent61a45c85dec8e65ba9782c3ec4af0e9a42895eb3 (diff)
downloadsamba-765e5d2282959770ea9648e0f2b72e51e5b4cdd8.tar.gz
samba-765e5d2282959770ea9648e0f2b72e51e5b4cdd8.tar.bz2
samba-765e5d2282959770ea9648e0f2b72e51e5b4cdd8.zip
printing: Add new parameter "cups timeout".
The default timeout for connections to CUPS servers is set to 5 minutes in the CUPS libraries. The smbd hangs on startup until the timeout is reached if the CUPS server is unreachable. This parameter makes the timeout configurable. The default value is set to 30 seconds. Karolin
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/printing.h1
-rw-r--r--source3/include/proto.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/source3/include/printing.h b/source3/include/printing.h
index 2788143cc5..04e30a011b 100644
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -77,6 +77,7 @@ extern struct printif iprint_printif;
#define NEXT_JOBID(j) ((j+1) % PRINT_MAX_JOBID > 0 ? (j+1) % PRINT_MAX_JOBID : 1)
#define MAX_CACHE_VALID_TIME 3600
+#define CUPS_DEFAULT_TIMEOUT 30
#ifndef PRINT_SPOOL_PREFIX
#define PRINT_SPOOL_PREFIX "smbprn."
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9ee3fc9071..6eac9d1129 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5936,6 +5936,7 @@ const char **lp_svcctl_list(void);
char *lp_cups_options(int );
char *lp_cups_server(void);
char *lp_iprint_server(void);
+int lp_cups_timeout(void);
const char *lp_ctdbd_socket(void);
const char **lp_cluster_addresses(void);
bool lp_clustering(void);