diff options
| -rw-r--r-- | docs-xml/smbdotconf/printing/cupstimeout.xml | 17 | ||||
| -rw-r--r-- | source3/include/printing.h | 2 | ||||
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 10 | ||||
| -rw-r--r-- | source3/printing/print_cups.c | 2 |
5 files changed, 8 insertions, 25 deletions
diff --git a/docs-xml/smbdotconf/printing/cupstimeout.xml b/docs-xml/smbdotconf/printing/cupstimeout.xml deleted file mode 100644 index 727ccce67b..0000000000 --- a/docs-xml/smbdotconf/printing/cupstimeout.xml +++ /dev/null @@ -1,17 +0,0 @@ -<samba:parameter name="cups timeout" - context="G" - type="integer" - print="1" - advanced="1" - xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> - -<description> - <para> - This parameter determines the timeout for connections to a CUPS server - in seconds. - </para> -</description> - -<value type="default">30</value> -<value type="example">cups timeout = 10</value> -</samba:parameter> diff --git a/source3/include/printing.h b/source3/include/printing.h index 04e30a011b..d91917b528 100644 --- a/source3/include/printing.h +++ b/source3/include/printing.h @@ -77,7 +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 +#define CUPS_DEFAULT_CONNECTION_TIMEOUT 30 #ifndef PRINT_SPOOL_PREFIX #define PRINT_SPOOL_PREFIX "smbprn." diff --git a/source3/include/proto.h b/source3/include/proto.h index b1c4d2e5d9..2ccf3b15f7 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5824,7 +5824,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); +int lp_cups_connection_timeout(void); const char *lp_ctdbd_socket(void); const char **lp_cluster_addresses(void); bool lp_clustering(void); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index db9e990e64..87af7a3411 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -341,7 +341,7 @@ struct global { int iKeepalive; int iminreceivefile; struct param_opt_struct *param_opt; - int cups_timeout; + int cups_connection_timeout; }; static struct global Globals; @@ -2597,10 +2597,10 @@ static struct parm_struct parm_table[] = { .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, }, { - .label = "cups timeout", + .label = "cups connection timeout", .type = P_INTEGER, .p_class = P_GLOBAL, - .ptr = &Globals.cups_timeout, + .ptr = &Globals.cups_connection_timeout, .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, @@ -4805,7 +4805,7 @@ static void init_globals(bool first_time_only) * to never expire, though, when this runs out the afs client will * forget the token. Set to 0 to get NEVERDATE.*/ Globals.iAfsTokenLifetime = 604800; - Globals.cups_timeout = CUPS_DEFAULT_TIMEOUT; + Globals.cups_connection_timeout = CUPS_DEFAULT_CONNECTION_TIMEOUT; /* these parameters are set to defaults that are more appropriate for the increasing samba install base: @@ -5247,7 +5247,7 @@ FN_GLOBAL_LIST(lp_svcctl_list, &Globals.szServicesList) FN_LOCAL_STRING(lp_cups_options, szCupsOptions) FN_GLOBAL_STRING(lp_cups_server, &Globals.szCupsServer) FN_GLOBAL_STRING(lp_iprint_server, &Globals.szIPrintServer) -FN_GLOBAL_INTEGER(lp_cups_timeout, &Globals.cups_timeout) +FN_GLOBAL_INTEGER(lp_cups_connection_timeout, &Globals.cups_connection_timeout) FN_GLOBAL_CONST_STRING(lp_ctdbd_socket, &Globals.ctdbdSocket) FN_GLOBAL_LIST(lp_cluster_addresses, &Globals.szClusterAddresses) FN_GLOBAL_BOOL(lp_clustering, &Globals.clustering) diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index 2b2cf159fb..f9568f0a54 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -56,7 +56,7 @@ static http_t *cups_connect(void) http_t *http; char *server, *p; int port; - int timeout = lp_cups_timeout(); + int timeout = lp_cups_connection_timeout(); gotalarm = 0; |