diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-24 20:14:17 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-24 20:14:17 +0200 |
| commit | eba7f1032d79fe5dcbc1902e3af1087399f67a5a (patch) | |
| tree | 1dc910d68153243e1ab7a5c7e455a6e2daec5cc4 /source3/printing/print_cups.c | |
| parent | b39b6099a44ef40fc79fc68c9df740e0ef722d19 (diff) | |
| parent | 9cf1a68977d56d342ca7dbe8f07c725221dc1148 (diff) | |
| download | samba-eba7f1032d79fe5dcbc1902e3af1087399f67a5a.tar.gz samba-eba7f1032d79fe5dcbc1902e3af1087399f67a5a.tar.bz2 samba-eba7f1032d79fe5dcbc1902e3af1087399f67a5a.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/printing/print_cups.c')
| -rw-r--r-- | source3/printing/print_cups.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |