diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-03-31 13:59:56 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-03-31 13:59:56 +1100 |
| commit | 046b7a35bed76f5d92a1e5f658478e25ffadf9ac (patch) | |
| tree | 1500a19e70a4f90b5c3057d753aa1ae0a6e04788 /source3/printing | |
| parent | 84547b8dba3c0cf4e20b3c50d9386081d475df6b (diff) | |
| parent | 9be2e2fdce9f0823f428afd492c066eb5e097f59 (diff) | |
| download | samba-046b7a35bed76f5d92a1e5f658478e25ffadf9ac.tar.gz samba-046b7a35bed76f5d92a1e5f658478e25ffadf9ac.tar.bz2 samba-046b7a35bed76f5d92a1e5f658478e25ffadf9ac.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/print_cups.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index 8e792a944a..7edfb5edbe 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -93,7 +93,12 @@ static http_t *cups_connect(TALLOC_CTX *frame) alarm(timeout); } +#ifdef HAVE_HTTPCONNECTENCRYPT + http = httpConnectEncrypt(server, port, lp_cups_encrypt()); +#else http = httpConnect(server, port); +#endif + CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN); alarm(0); |