Jeremy can you check lib/util_unistr.c for codepages support ?

I added 2 UNICODE <-> ASCII functions which _don't_ honor codepage
support.

	J.F.
(This used to be commit b81dc7b7f832cae2e66076398a134fbb6c1f78ca)

diff --git a/source3/lib/util.c b/source3/lib/util.c
index 71f440eae525f26fa6c0b247c41515f19f1d2219..a824887e88b76cb5696fcf436e766b0743472c9c 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1661,6 +1661,18 @@ void *Realloc(void *p,size_t size)
 }
 
 
+/****************************************************************************
+free memory, checks for NULL
+****************************************************************************/
+void safe_free(void *p)
+{
+       if (p != NULL)
+       {
+               free(p);
+       }
+}
+
+
 /****************************************************************************
 get my own name and IP
 ****************************************************************************/

diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index a512f68acc095388581dd2ab7af97b8e9b65e234..2c721aeb473483ed346db4633432e59da1114093 100644 (file)
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -78,6 +78,61 @@ int dos_PutUniCode(char *dst,const char *src, ssize_t len)
        return(ret);
 }
 
+/*******************************************************************
+ Put an ASCII string into a UNICODE array (uint16's).
+
+ Warning: doesn't do any codepage !!! BAD !!!
+ 
+ Help ! Fix Me ! Fix Me !
+********************************************************************/
+
+void ascii_to_unistr(uint16 *dest, const char *src, int maxlen)
+{
+       uint16 *destend = dest + maxlen;
+       register char c;
+
+       while (dest < destend)
+       {
+               c = *(src++);
+               if (c == 0)
+               {
+                       break;
+               }
+
+               *(dest++) = (uint16)c;
+       }
+
+       *dest = 0;
+}
+
+/*******************************************************************
+ Pull an ASCII string out of a UNICODE array (uint16's).
+
+ Warning: doesn't do any codepage !!! BAD !!!
+ 
+ Help ! Fix Me ! Fix Me !
+********************************************************************/
+
+void unistr_to_ascii(char *dest, const uint16 *src, int len)
+{
+       char *destend = dest + len;
+       register uint16 c;
+
+       while (dest < destend)
+       {
+               c = *(src++);
+               if (c == 0)
+               {
+                       break;
+               }
+
+               *(dest++) = (char)c;
+       }
+
+       *dest = 0;
+}
+
+
 /*******************************************************************
  Skip past some unicode strings in a buffer.
 ********************************************************************/
@@ -182,6 +237,48 @@ char *dos_unistr2_to_str(UNISTR2 *str)
        return lbuf;
 }
 
+/*******************************************************************
+ Convert a UNISTR2 structure to an ASCII string
+ Warning: this version does DOS codepage.
+********************************************************************/
+
+void unistr2_to_ascii(char *dest, const UNISTR2 *str, size_t maxlen)
+{
+       char *destend;
+       const uint16 *src;
+       size_t len;
+       register uint16 c;
+
+       src = str->buffer;
+       len = MIN(str->uni_str_len, maxlen);
+       destend = dest + len;
+
+       while (dest < destend)
+       {
+               uint16 ucs2_val;
+               uint16 cp_val;
+
+               c = *(src++);
+               if (c == 0)
+               {
+                       break;
+               }
+               
+               ucs2_val = SVAL(src,0);
+               cp_val = ucs2_to_doscp[ucs2_val];
+                               
+               if (cp_val < 256)
+                       *(dest++) = (char)cp_val;
+               else {
+                       *dest= (cp_val >> 8) & 0xff;
+                       *(dest++) = (cp_val & 0xff);
+               }
+       }
+
+       *dest = 0;
+}
+
+
 /*******************************************************************
 Return a number stored in a buffer
 ********************************************************************/

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 839c9c9e162a053e32b90e1108d7ed91d94d24c1..850824674129063529c53cfd57190988cd36ce1e 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -159,6 +159,8 @@ typedef struct
   char *szAddUserScript;
   char *szDelUserScript;
   char *szWINSHook;
+  char *szNtForms;
+  char *szNtDriverFile;    
 #ifdef WITH_UTMP
   char *szUtmpDir;
 #endif /* WITH_UTMP */
@@ -721,6 +723,8 @@ static struct parm_struct parm_table[] =
   {"printer",          P_STRING,  P_LOCAL,  &sDefault.szPrintername,    NULL,   NULL,  0},
   {"printer driver",   P_STRING,  P_LOCAL,  &sDefault.szPrinterDriver,  NULL,   NULL,  FLAG_PRINT},
   {"printer driver location",   P_STRING,  P_LOCAL,  &sDefault.szPrinterDriverLocation,  NULL,   NULL,  FLAG_PRINT|FLAG_GLOBAL},
+  {"nt forms file",    P_STRING,  P_GLOBAL, &Globals.szNtForms,         NULL,   NULL,  FLAG_GLOBAL},
+  {"nt printer driver",P_STRING,  P_GLOBAL, &Globals.szNtDriverFile,    NULL,   NULL,  FLAG_GLOBAL},
 
 
   {"Filename Handling", P_SEP, P_SEPARATOR},
@@ -908,6 +912,8 @@ static void init_globals(void)
   string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
   string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
   string_set(&Globals.szDriverFile, DRIVERFILE);
+  string_set(&Globals.szNtForms, FORMSFILE);
+  string_set(&Globals.szNtDriverFile, NTDRIVERSDIR);
   string_set(&Globals.szLockDir, LOCKDIR);
   string_set(&Globals.szRootdir, "/");
 #ifdef WITH_UTMP
@@ -1222,6 +1228,9 @@ FN_GLOBAL_STRING(lp_domain_guest_group,&Globals.szDomainGuestGroup)
 FN_GLOBAL_STRING(lp_domain_admin_users,&Globals.szDomainAdminUsers)
 FN_GLOBAL_STRING(lp_domain_guest_users,&Globals.szDomainGuestUsers)
 
+FN_GLOBAL_STRING(lp_nt_forms,&Globals.szNtForms)
+FN_GLOBAL_STRING(lp_nt_drivers_file,&Globals.szNtDriverFile)
+
 #ifdef WITH_LDAP
 FN_GLOBAL_STRING(lp_ldap_server,&Globals.szLdapServer);
 FN_GLOBAL_STRING(lp_ldap_suffix,&Globals.szLdapSuffix);

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 4b344c331852c0d4907865077df8c9e4e674af30..d9ad16e7d3ce4aa93fa833c3f7960fa63150cf30 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -44,6 +44,7 @@ static char *known_nt_pipes[] = {
   "\\lsass",
   "\\lsarpc",
   "\\winreg",
+  "\\spoolss",
   NULL
 };
 

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 44e347b10465adaf8ce4e091543bcdba9258ad0c..d1788678a7cb9ccf3966b06cd21dd6c59f830d85 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -468,6 +468,9 @@ static void init_structs(void )
        /* for LSA handles */
        init_lsa_policy_hnd();
 
+       /* for SPOOLSS handles */
+       init_printer_hnd();
+       
        init_dptrs();
 }
 
@@ -707,8 +710,8 @@ static void usage(char *pname)
                DEBUG( 3, ( "Becoming a daemon.\n" ) );
                become_daemon();
        }
-        
-        check_kernel_oplocks();
+
+       check_kernel_oplocks();
 
        if (!directory_exist(lp_lockdir(), NULL)) {
                mkdir(lp_lockdir(), 0755);