Writable string const fixes.

Jeremy.
(This used to be commit 60b0cfc8a5b6275d3460ebc6bf17d0f08e25b67e)

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 62b94761ad8ba087f546d8794aa5fd1d8a6e5aa4..18ce5e4bd9b3ea1e74c2f579b55df522e324deef 100644 (file)
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -1263,7 +1263,7 @@ BOOL get_dc_list(const char *domain, struct in_addr **ip_list, int *count, int *
        /* If it's our domain then use the 'password server' parameter. */
 
        if (strequal(domain, lp_workgroup())) {
-               char *p;
+               const char *p;
                char *pserver = lp_passwordserver(); /* UNIX charset. */
                fstring name;
                int num_addresses = 0;

diff --git a/source3/printing/lpq_parse.c b/source3/printing/lpq_parse.c
index 4b91b8ac9a1cdf945c0825c0de032980e3374a7b..0b4ce4b4ca65fea65ce83e2b1a5846b4e60486b0 100644 (file)
--- a/source3/printing/lpq_parse.c
+++ b/source3/printing/lpq_parse.c
@@ -592,7 +592,7 @@ static BOOL parse_lpq_qnx(char *line,print_queue_struct *buf,BOOL first)
 {
   fstring tok[7];
   int count=0;
-  const char *cline;
+  const char *cline = line;
 
   DEBUG(4,("antes [%s]\n", line));
 

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 4c454ef111bc4d7c4f5cbec8ab727fefcf0db22e..6df2c6b4457462d9b4bbfb9705428a99ab8df1e2 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -1075,6 +1075,7 @@ static uint32 get_correct_cversion(fstring architecture, fstring driverpath_in,
        NTSTATUS          nt_status;
        pstring           driverpath;
        DATA_BLOB         null_pw;
+       fstring           res_type;
        files_struct      *fsp = NULL;
        BOOL              bad_path;
        SMB_STRUCT_STAT   st;
@@ -1098,8 +1099,9 @@ static uint32 get_correct_cversion(fstring architecture, fstring driverpath_in,
 
        /* Null password is ok - we are already an authenticated user... */
        null_pw = data_blob(NULL, 0);
+       fstrcpy(res_type, "A:");
        become_root();
-       conn = make_connection_with_chdir("print$", null_pw, "A:", user->vuid, &nt_status);
+       conn = make_connection_with_chdir("print$", null_pw, res_type, user->vuid, &nt_status);
        unbecome_root();
 
        if (conn == NULL) {
@@ -1389,6 +1391,7 @@ BOOL move_driver_to_download_area(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract,
        NTSTATUS nt_status;
        pstring inbuf;
        pstring outbuf;
+       fstring res_type;
        int ver = 0;
        int i;
 
@@ -1413,9 +1416,10 @@ BOOL move_driver_to_download_area(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract,
         * Note we must be root to do this.
         */
 
-       become_root();
        null_pw = data_blob(NULL, 0);
-       conn = make_connection_with_chdir("print$", null_pw, "A:", user->vuid, &nt_status);
+       fstrcpy(res_type, "A:");
+       become_root();
+       conn = make_connection_with_chdir("print$", null_pw, res_type, user->vuid, &nt_status);
        unbecome_root();
 
        if (conn == NULL) {
@@ -4308,7 +4312,8 @@ static BOOL delete_driver_files( NT_PRINTER_DRIVER_INFO_LEVEL_3 *info_3, struct
        connection_struct *conn;
        DATA_BLOB null_pw;
        NTSTATUS nt_status;
-       
+       fstring res_type;
+
        if ( !info_3 )
                return False;
                
@@ -4320,9 +4325,10 @@ static BOOL delete_driver_files( NT_PRINTER_DRIVER_INFO_LEVEL_3 *info_3, struct
         * do this.
         */
         
-       become_root();
        null_pw = data_blob( NULL, 0 );
-        conn = make_connection_with_chdir( "print$", null_pw, "A:", user->vuid, &nt_status );
+       fstrcpy(res_type, "A:");
+       become_root();
+        conn = make_connection_with_chdir( "print$", null_pw, res_type, user->vuid, &nt_status );
        unbecome_root();
        
        if ( !conn ) {