diff options
| author | Michael Adam <obnox@samba.org> | 2015-07-22 16:22:40 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-07-31 01:55:30 +0200 |
| commit | 4ae289c27127c2af1f77108863862990419ff7f8 (patch) | |
| tree | c5b6e8315e63a6a0e26c151054c92ff021fffc98 /source3 | |
| parent | 5c18d0013575acc0d8a4d5d75da78583c84668c8 (diff) | |
| download | samba-4ae289c27127c2af1f77108863862990419ff7f8.tar.gz | |
param: turn 'cups encrypt' into a generated function
Move the special stuff of the hand-written lp_cups_encrypt()
function into a handler that is called once at load time.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 54a24067382..4c9cd19ee6d 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -75,10 +75,6 @@ #include <sys/sysctl.h> #endif -#ifdef HAVE_HTTPCONNECTENCRYPT -#include <cups/http.h> -#endif - bool bLoaded = false; extern userdom_struct current_user_info; @@ -1030,25 +1026,6 @@ int lp_winbind_max_domain_connections(void) return MAX(1, lp__winbind_max_domain_connections()); } -int lp_cups_encrypt(void) -{ - int result = 0; -#ifdef HAVE_HTTPCONNECTENCRYPT - switch (Globals.cups_encrypt) { - case Auto: - result = HTTP_ENCRYPT_REQUIRED; - break; - case true: - result = HTTP_ENCRYPT_ALWAYS; - break; - case false: - result = HTTP_ENCRYPT_NEVER; - break; - } -#endif - return result; -} - /* These functions remain in source3/param for now */ #include "lib/param/param_functions.c" |