a fairly big change in spoolss.

got rid of the forms, drivers and printers files in the nt drivers
directory and instead use a single tdb

note that this is _not_ all finished.
(This used to be commit 4fef181af3964311f45e77bdd43d6fb4e546127f)

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 6bac7256585b8f19873b7fc5b7fd86273fde9802..4a9c0d2645197a9174852641a0202a9c3f90f6c3 100644 (file)
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -42,7 +42,9 @@ return the length of a UNISTR string.
 static uint32 str_len_uni(UNISTR *source)
 {
        uint32 i=0;
-       
+
+       if (!source->buffer) return 0;
+
        while (source->buffer[i]!=0x0000)
        {
         i++;
@@ -2354,8 +2356,9 @@ uint32 spoolss_size_printer_driver_info_3(DRIVER_INFO_3 *info)
        size+=size_of_relative_string( &info->defaultdatatype );
        
        string=info->dependentfiles;
-       
-       for (i=0; (string[i]!=0x0000) || (string[i+1]!=0x0000); i++);
+       if (string) {
+               for (i=0; (string[i]!=0x0000) || (string[i+1]!=0x0000); i++);
+       }
 
        i=i+2; /* to count all chars including the leading zero */
        i=2*i; /* because we need the value in bytes */
@@ -3305,6 +3308,7 @@ BOOL spool_io_printer_info_level_2(char *desc, SPOOL_PRINTER_INFO_LEVEL_2 *il, p
                return False;
        if(!prs_uint32("portname_ptr", ps, depth, &il->portname_ptr))
                return False;
+
        if(!prs_uint32("drivername_ptr", ps, depth, &il->drivername_ptr))
                return False;
        if(!prs_uint32("comment_ptr", ps, depth, &il->comment_ptr))
@@ -3723,56 +3727,24 @@ BOOL spool_io_printer_driver_info_level_6(char *desc, SPOOL_PRINTER_DRIVER_INFO_
  dynamically allocate memory
  
 ********************************************************************/  
-static BOOL uniarray_2_dosarray(BUFFER5 *buf5, char ***ar)
+static BOOL uniarray_2_dosarray(BUFFER5 *buf5, fstring **ar)
 {
-       char **array;
-       char *string;
-       char *destend;
-       char *dest;
-       uint32 n;
-       uint32 i;
-
-       uint16 *src;
+       fstring f;
+       int n = 0;
+       char *src;
 
        if (buf5==NULL) return False;
 
-       array=NULL;
-       n=0;
-       i=0;
-       src=buf5->buffer;
-
-       string=(char *)malloc(sizeof(char)*buf5->buf_len);
-       if(string == NULL)
-               return False;
+       src = (char *)buf5->buffer;
+       *ar = NULL;
 
-       destend = string + buf5->buf_len;
-       dest=string;
-
-       while (dest < destend)
-       {
-               dest += unicode_to_dos_char(dest, (smb_ucs2_t)*(src++));
+       while (src < ((char *)buf5->buffer) + buf5->buf_len*2) {
+               unistr_to_dos(f, src, sizeof(f)-1);
+               src = skip_unibuf(src, 2*buf5->buf_len - PTR_DIFF(src,buf5->buffer));
+               *ar = (fstring *)Realloc(*ar, sizeof(fstring)*(n+2));
+               fstrcpy((*ar)[n], f);
        }
-               
-       /* that ugly for the first one but that's working */
-       array=(char **)Realloc(array, sizeof(char *)*(i+1));
-       if(array == NULL)
-               return False;
-       array[i++]=string;
-       
-       while ( n < buf5->buf_len )
-       {
-               if ( *(string++) == '\0' )
-               {
-                       array=(char **)Realloc(array, sizeof(char *)*(i+1));
-                       if(array == NULL)
-                               return False;
-                       array[i++]=string;                      
-               }
-               n++;
-       }               
-       *ar=array;
-       
-       DEBUG(10,("Number of dependent files: [%d]\n", i-1));
+       fstrcpy((*ar)[n], "");
 
        return True;
 }
@@ -4001,9 +3973,8 @@ BOOL uni_2_asc_printer_info_2(const SPOOL_PRINTER_INFO_LEVEL_2 *uni,
 
        unix_to_nt_time(&time_nt, time_unix);
        d->changeid=time_nt.low;
-       
        d->c_setprinter++;
-
+       
        unistr2_to_ascii(d->servername, &uni->servername, sizeof(d->servername)-1);
        unistr2_to_ascii(d->printername, &uni->printername, sizeof(d->printername)-1);
        unistr2_to_ascii(d->sharename, &uni->sharename, sizeof(d->sharename)-1);