Changeset 480 for trunk/server/source3/param/loadparm.c

Timestamp:

Aug 2, 2010, 8:16:45 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: trunk update to 3.5.4

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/param/loadparm.c (modified) (3 diffs)

trunk/server/source3/param/loadparm.c

@@ -4678 +4678 @@
                         string_set(&pService->szPrintcommand, "lpr.exe -b -s %i -p %p %s & cmd.exe /c del %s");
                         break;
-#endif          
+#endif
 
                 case PRINT_LPRNG:
@@ -4976 +4976 @@
            characters - default to system codepage */
         string_set(&Globals.display_charset, OS2CodePageStr);
-#endif  
+#endif
 
 #else
@@ -5636 +5636 @@
 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)