diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-03-31 15:53:17 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-03-31 15:53:17 +1100 |
| commit | 15e6def45d528b10f9ac2ecb917ff13ca6187711 (patch) | |
| tree | b085d7bb56cb8fc1293ecaf71108e223b74e703d /source3/printing | |
| parent | 631e688c821b78d09d77f5940074800525c554aa (diff) | |
| parent | 79b7ba9b106791958cc42d68b11d9dea2a77f6f3 (diff) | |
| download | samba-15e6def45d528b10f9ac2ecb917ff13ca6187711.tar.gz samba-15e6def45d528b10f9ac2ecb917ff13ca6187711.tar.bz2 samba-15e6def45d528b10f9ac2ecb917ff13ca6187711.zip | |
Merge branch 'master' into wspp-schema
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); |