diff options
author | Karolin Seeger <kseeger@samba.org> | 2008-09-24 09:53:21 -0700 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2008-09-24 11:09:04 -0700 |
commit | 9cf1a68977d56d342ca7dbe8f07c725221dc1148 (patch) | |
tree | dbe727238e78516ddb6ba233247f45f8ee635e99 /source3/include | |
parent | 291ca9384345d8c674a96f3671d44ba09af8b787 (diff) | |
download | samba-9cf1a68977d56d342ca7dbe8f07c725221dc1148.tar.gz samba-9cf1a68977d56d342ca7dbe8f07c725221dc1148.tar.bz2 samba-9cf1a68977d56d342ca7dbe8f07c725221dc1148.zip |
printing: Rename new parameter "cups timeout" to "cups connection timeout".
Karolin
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/printing.h | 2 | ||||
-rw-r--r-- | source3/include/proto.h | 2 |
2 files changed, 2 insertions, 2 deletions
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); |