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

Timestamp:

Jun 4, 2010, 3:11:43 PM (16 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

File:

• trunk/server/source3/param/loadparm.c (modified) (2 diffs)

trunk/server/source3/param/loadparm.c

@@ -4665 +4665 @@
                 case PRINT_AIX:
                 case PRINT_LPRNT:
+
                 case PRINT_LPROS2:
+
                         string_set(&pService->szLpqcommand, "lpq -P'%p'");
                         string_set(&pService->szLprmcommand, "lprm -P'%p' %j");
                         string_set(&pService->szPrintcommand, "lpr -r -P'%p' %s");
                         break;
+
+
+
+
+
+
+
 
                 case PRINT_LPRNG:
@@ -4938 +4947 @@
         string_set(&Globals.szGuestaccount, GUEST_ACCOUNT);
 
+
+
+
+
+
+
+
+
+
+
+
+
         /* using UTF8 by default allows us to support all chars */
         string_set(&Globals.unix_charset, DEFAULT_UNIX_CHARSET);
+
+
+
+
+
 
 #if defined(HAVE_NL_LANGINFO) && defined(CODESET)
         /* If the system supports nl_langinfo(), try to grab the value
            from the user's locale */
+
         string_set(&Globals.display_charset, "LOCALE");
+
+
+
+
+
+
 #else
         string_set(&Globals.display_charset, DEFAULT_DISPLAY_CHARSET);
 #endif
 
+
         /* Use codepage 850 as a default for the dos character set */
         string_set(&Globals.dos_charset, DEFAULT_DOS_CHARSET);
+
+
+
+
+
 
         /*