merge from 2.2

(This used to be commit 25fb4a8d110bcdcbe7822a833cab9cfdec8a1fb2)

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 754390b7b69a2230f4c32230e675f470ffd57d78..86efc2fb94fb45551158fbd27ec4fbb0f97dc5d7 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -1105,7 +1105,7 @@ static BOOL getprinterdata_printer_server(TALLOC_CTX *ctx, fstring value, uint32
                *type = 0x4;
                if((*data = (uint8 *)talloc(ctx, 4*sizeof(uint8) )) == NULL)
                        return False;
-               SIVAL(*data, 0, 0x01);
+               SIVAL(*data, 0, 0x00);
                *needed = 0x4;                  
                return True;
        }
@@ -1114,7 +1114,8 @@ static BOOL getprinterdata_printer_server(TALLOC_CTX *ctx, fstring value, uint32
                *type = 0x4;
                if((*data = (uint8 *)talloc(ctx, 4*sizeof(uint8) )) == NULL)
                        return False;
-               SIVAL(*data, 0, 0x1B);
+               /* formally was 0x1b */
+               SIVAL(*data, 0, 0x0);
                *needed = 0x4;                  
                return True;
        }
@@ -1123,7 +1124,7 @@ static BOOL getprinterdata_printer_server(TALLOC_CTX *ctx, fstring value, uint32
                *type = 0x4;
                if((*data = (uint8 *)talloc(ctx, 4*sizeof(uint8) )) == NULL)
                        return False;
-               SIVAL(*data, 0, 0x01);
+               SIVAL(*data, 0, 0x00);
                *needed = 0x4;
                return True;
        }
@@ -1137,8 +1138,10 @@ static BOOL getprinterdata_printer_server(TALLOC_CTX *ctx, fstring value, uint32
                return True;
        }
 
-   if (!strcmp(value, "DefaultSpoolDirectory")) {
-               pstring string="You are using a Samba server";
+       if (!strcmp(value, "DefaultSpoolDirectory")) {
+               fstring string;
+
+               fstrcpy(string, string_truncate(lp_serverstring(), MAX_SERVER_STRING_LENGTH));
                *type = 0x1;                    
                *needed = 2*(strlen(string)+1);         
                if((*data  = (uint8 *)talloc(ctx, ((*needed > in_size) ? *needed:in_size) *sizeof(uint8))) == NULL)