Changeset 478 for vendor/current/source3/param/loadparm.c

Timestamp:

Aug 2, 2010, 6:40:21 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5: vendor update to 3.5.4

File:

• vendor/current/source3/param/loadparm.c (modified) (1 diff)

vendor/current/source3/param/loadparm.c

@@ -5597 +5597 @@
 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)