diff options
| author | Luca Olivetti <luca@wetron.es> | 2010-05-04 15:07:57 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-05-17 09:50:17 +0200 |
| commit | 6b5ab8701ea945874232144915f97ff5d8038b47 (patch) | |
| tree | ba7cbb6be549b15dca3770937e7749be53e40d74 | |
| parent | 23a87705187dd8da4c93d31e1a9c50afe6de5994 (diff) | |
| download | samba-6b5ab8701ea945874232144915f97ff5d8038b47.tar.gz | |
Fix bug #7263 - Unable to print using Samba 3.5.1 and cups-1.1.23-40.46 on SLES10.
Fix cups encryption setting
I had the same problem and it's due to the fact that samba doesn't respect the
"cups encryption" setting since lp_cups_encrypt changes the value: if you set
"cups encryption=no", the first call will change it to HTTP_ENCRYPT_NEVER,
since that is 1 (i.e. true), the next call will change it to
HTTP_ENCRYPT_ALWAYS and after that it'll remain set as HTTP_ENCRYPT_ALWAYS.
This patch fixes this problem.
Don't mix up the HTTP_ENCRYPT_XXX constants up with the
enumeration constants (True, False, Auto) used in the
loadparm code.
(cherry picked from commit a9e008ee36c8fd9ca79b3bdfdc78111939c3e539)
(cherry picked from commit 7f57b627800baba4bc030d9c3748ead9ac53397d)
| -rw-r--r-- | source3/param/loadparm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index f362c9b7cf0..57ea2cd3a8e 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -5596,20 +5596,21 @@ FN_LOCAL_STRING(lp_cups_options, szCupsOptions) FN_GLOBAL_STRING(lp_cups_server, &Globals.szCupsServer) int lp_cups_encrypt(void) { + int result = 0; #ifdef HAVE_HTTPCONNECTENCRYPT switch (Globals.CupsEncrypt) { case Auto: - Globals.CupsEncrypt = HTTP_ENCRYPT_REQUIRED; + result = HTTP_ENCRYPT_REQUIRED; break; case True: - Globals.CupsEncrypt = HTTP_ENCRYPT_ALWAYS; + result = HTTP_ENCRYPT_ALWAYS; break; case False: - Globals.CupsEncrypt = HTTP_ENCRYPT_NEVER; + result = HTTP_ENCRYPT_NEVER; break; } #endif - return Globals.CupsEncrypt; + return result; } FN_GLOBAL_STRING(lp_iprint_server, &Globals.szIPrintServer) FN_GLOBAL_INTEGER(lp_cups_connection_timeout, &Globals.cups_connection_timeout) |