Changeset 140 for branches/samba-3.0/source/rpc_server/srv_spoolss_nt.c

Timestamp:

07/11/08 01:13:42 (5 months ago)

Author:

psmedley

Message:

Update branch to 3.0.31 release

Files:

• branches/samba-3.0/source/rpc_server/srv_spoolss_nt.c (modified) (37 diffs)

branches/samba-3.0/source/rpc_server/srv_spoolss_nt.c

@@ -74 +74 @@
 };
 
+/********************************************************************
+ * Canonicalize servername.
+ ********************************************************************/
+
+static const char *canon_servername(const char *servername)
+{
+        const char *pservername = servername;
+        while (*pservername == '\\') {
+                pservername++;
+        }
+        return pservername;
+}
 
 /* translate between internal status numbers and NT status numbers */
@@ -445 +457 @@
         aprinter = handlename;
         if ( *handlename == '\\' ) {
-                servername = handlename + 2;
-                if ( (aprinter = strchr_m( handlename+2, '\\' )) != NULL ) {
+                servername = canon_servername(handlename);
+                if ( (aprinter = strchr_m( servername, '\\' )) != NULL ) {
                         *aprinter = '\0';
                         aprinter++;
                 }
-        }
-        else {
+        } else {
                 servername = "";
         }
@@ -4640 +4651 @@
  ********************************************************************/
 
-static WERROR enumprinters_level2( uint32 flags, fstring servername,
+static WERROR enumprinters_level2( uint32 flags, const char *servername,
                                  RPC_BUFFER *buffer, uint32 offered,
                                  uint32 *needed, uint32 *returned)
 {
-        char *s = servername;
-
         if (flags & PRINTER_ENUM_LOCAL) {
                         return enum_all_printers_info_2(buffer, offered, needed, returned);
@@ -4651 +4660 @@
 
         if (flags & PRINTER_ENUM_NAME) {
-                if ((servername[0] == '\\') && (servername[1] == '\\'))
-                        s = servername + 2;
-                if (is_myname_or_ipaddr(s))
+                if (is_myname_or_ipaddr(canon_servername(servername)))
                         return enum_all_printers_info_2(buffer, offered, needed, returned);
                 else
@@ -4669 +4676 @@
  ********************************************************************/
 
-static WERROR enumprinters_level5( uint32 flags, fstring servername,
+static WERROR enumprinters_level5( uint32 flags, const char *servername,
                                  RPC_BUFFER *buffer, uint32 offered,
                                  uint32 *needed, uint32 *returned)
@@ -5047 +5054 @@
  ********************************************************************/
 
-static void fill_printer_driver_info_1(DRIVER_INFO_1 *info, NT_PRINTER_DRIVER_INFO_LEVEL driver, fstring servername, fstring architecture)
+static void fill_printer_driver_info_1(DRIVER_INFO_1 *info, NT_PRINTER_DRIVER_INFO_LEVEL driver, const char *servername, fstring architecture)
 {
         init_unistr( &info->name, driver.info_3->name);
@@ -5056 +5063 @@
  ********************************************************************/
 
-static WERROR construct_printer_driver_info_1(DRIVER_INFO_1 *info, int snum, fstring servername, fstring architecture, uint32 version)
+static WERROR construct_printer_driver_info_1(DRIVER_INFO_1 *info, int snum, const char *servername, fstring architecture, uint32 version)
 {       
         NT_PRINTER_INFO_LEVEL *printer = NULL;
@@ -5083 +5090 @@
  ********************************************************************/
 
-static void fill_printer_driver_info_2(DRIVER_INFO_2 *info, NT_PRINTER_DRIVER_INFO_LEVEL driver, fstring servername)
+static void fill_printer_driver_info_2(DRIVER_INFO_2 *info, NT_PRINTER_DRIVER_INFO_LEVEL driver, const char *servername)
 {
         pstring temp;
+        const char *cservername = canon_servername(servername);
 
         info->version=driver.info_3->cversion;
@@ -5094 +5102 @@
 
     if (strlen(driver.info_3->driverpath)) {
-                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", servername, driver.info_3->driverpath);
+                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", cservername, driver.info_3->driverpath);
                 init_unistr( &info->driverpath, temp );
     } else
@@ -5100 +5108 @@
 
         if (strlen(driver.info_3->datafile)) {
-                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", servername, driver.info_3->datafile);
+                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", cservername, driver.info_3->datafile);
                 init_unistr( &info->datafile, temp );
         } else
@@ -5106 +5114 @@
         
         if (strlen(driver.info_3->configfile)) {
-                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", servername, driver.info_3->configfile);
+                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", cservername, driver.info_3->configfile);
                 init_unistr( &info->configfile, temp ); 
         } else
@@ -5117 +5125 @@
  ********************************************************************/
 
-static WERROR construct_printer_driver_info_2(DRIVER_INFO_2 *info, int snum, fstring servername, fstring architecture, uint32 version)
+static WERROR construct_printer_driver_info_2(DRIVER_INFO_2 *info, int snum, const char *servername, fstring architecture, uint32 version)
 {
         NT_PRINTER_INFO_LEVEL *printer = NULL;
@@ -5171 +5179 @@
                    
                 if ( servername )
-                        slprintf( line, sizeof(line)-1, "\\\\%s%s", servername, v );
+                        slprintf( line, sizeof(line)-1, "\\\\%s%s", canon_servername(servername), v );
                 else
                         pstrcpy( line, v );
@@ -5210 +5218 @@
  ********************************************************************/
 
-static void fill_printer_driver_info_3(DRIVER_INFO_3 *info, NT_PRINTER_DRIVER_INFO_LEVEL driver, fstring servername)
+static void fill_printer_driver_info_3(DRIVER_INFO_3 *info, NT_PRINTER_DRIVER_INFO_LEVEL driver, const char *servername)
 {
         pstring temp;
+        const char *cservername = canon_servername(servername);
 
         ZERO_STRUCTP(info);
@@ -5222 +5231 @@
 
         if (strlen(driver.info_3->driverpath)) {
-                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", servername, driver.info_3->driverpath);              
+                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", cservername, driver.info_3->driverpath);             
                 init_unistr( &info->driverpath, temp );
         } else
@@ -5228 +5237 @@
     
         if (strlen(driver.info_3->datafile)) {
-                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", servername, driver.info_3->datafile);
+                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", cservername, driver.info_3->datafile);
                 init_unistr( &info->datafile, temp );
         } else
@@ -5234 +5243 @@
 
         if (strlen(driver.info_3->configfile)) {
-                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", servername, driver.info_3->configfile);
+                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", cservername, driver.info_3->configfile);
                 init_unistr( &info->configfile, temp ); 
         } else
@@ -5240 +5249 @@
 
         if (strlen(driver.info_3->helpfile)) {
-                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", servername, driver.info_3->helpfile);
+                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", cservername, driver.info_3->helpfile);
                 init_unistr( &info->helpfile, temp );
         } else
@@ -5249 +5258 @@
 
         info->dependentfiles=NULL;
-        init_unistr_array(&info->dependentfiles, driver.info_3->dependentfiles, servername);
+        init_unistr_array(&info->dependentfiles, driver.info_3->dependentfiles, cservername);
 }
 
@@ -5257 +5266 @@
  ********************************************************************/
 
-static WERROR construct_printer_driver_info_3(DRIVER_INFO_3 *info, int snum, fstring servername, fstring architecture, uint32 version)
+static WERROR construct_printer_driver_info_3(DRIVER_INFO_3 *info, int snum, const char *servername, fstring architecture, uint32 version)
 {       
         NT_PRINTER_INFO_LEVEL *printer = NULL;
@@ -5316 +5325 @@
  ********************************************************************/
 
-static void fill_printer_driver_info_6(DRIVER_INFO_6 *info, NT_PRINTER_DRIVER_INFO_LEVEL driver, fstring servername)
+static void fill_printer_driver_info_6(DRIVER_INFO_6 *info, NT_PRINTER_DRIVER_INFO_LEVEL driver, const char *servername)
 {
         pstring temp;
         fstring nullstr;
+        const char *cservername = canon_servername(servername);
 
         ZERO_STRUCTP(info);
@@ -5330 +5340 @@
 
         if (strlen(driver.info_3->driverpath)) {
-                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", servername, driver.info_3->driverpath);              
+                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", cservername, driver.info_3->driverpath);             
                 init_unistr( &info->driverpath, temp );
         } else
@@ -5336 +5346 @@
 
         if (strlen(driver.info_3->datafile)) {
-                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", servername, driver.info_3->datafile);
+                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", cservername, driver.info_3->datafile);
                 init_unistr( &info->datafile, temp );
         } else
@@ -5342 +5352 @@
 
         if (strlen(driver.info_3->configfile)) {
-                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", servername, driver.info_3->configfile);
+                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", cservername, driver.info_3->configfile);
                 init_unistr( &info->configfile, temp ); 
         } else
@@ -5348 +5358 @@
 
         if (strlen(driver.info_3->helpfile)) {
-                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", servername, driver.info_3->helpfile);
+                slprintf(temp, sizeof(temp)-1, "\\\\%s%s", cservername, driver.info_3->helpfile);
                 init_unistr( &info->helpfile, temp );
         } else
@@ -5380 +5390 @@
 
 static WERROR construct_printer_driver_info_6(DRIVER_INFO_6 *info, int snum, 
-              fstring servername, fstring architecture, uint32 version)
+              const char *servername, fstring architecture, uint32 version)
 {       
         NT_PRINTER_INFO_LEVEL           *printer = NULL;
@@ -5447 +5457 @@
 ****************************************************************************/
 
-static WERROR getprinterdriver2_level1(fstring servername, fstring architecture, uint32 version, int snum, RPC_BUFFER *buffer, uint32 offered, uint32 *needed)
+static WERROR getprinterdriver2_level1(const char *servername, fstring architecture, uint32 version, int snum, RPC_BUFFER *buffer, uint32 offered, uint32 *needed)
 {
         DRIVER_INFO_1 *info=NULL;
@@ -5485 +5495 @@
 ****************************************************************************/
 
-static WERROR getprinterdriver2_level2(fstring servername, fstring architecture, uint32 version, int snum, RPC_BUFFER *buffer, uint32 offered, uint32 *needed)
+static WERROR getprinterdriver2_level2(const char *servername, fstring architecture, uint32 version, int snum, RPC_BUFFER *buffer, uint32 offered, uint32 *needed)
 {
         DRIVER_INFO_2 *info=NULL;
@@ -5523 +5533 @@
 ****************************************************************************/
 
-static WERROR getprinterdriver2_level3(fstring servername, fstring architecture, uint32 version, int snum, RPC_BUFFER *buffer, uint32 offered, uint32 *needed)
+static WERROR getprinterdriver2_level3(const char *servername, fstring architecture, uint32 version, int snum, RPC_BUFFER *buffer, uint32 offered, uint32 *needed)
 {
         DRIVER_INFO_3 info;
@@ -5559 +5569 @@
 ****************************************************************************/
 
-static WERROR getprinterdriver2_level6(fstring servername, fstring architecture, uint32 version, int snum, RPC_BUFFER *buffer, uint32 offered, uint32 *needed)
+static WERROR getprinterdriver2_level6(const char *servername, fstring architecture, uint32 version, int snum, RPC_BUFFER *buffer, uint32 offered, uint32 *needed)
 {
         DRIVER_INFO_6 info;
@@ -6788 +6798 @@
 ****************************************************************************/
 
-static WERROR enumprinterdrivers_level1(fstring servername, fstring architecture, RPC_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
+static WERROR enumprinterdrivers_level1(const char *servername, fstring architecture, RPC_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
 {
         int i;
@@ -6872 +6882 @@
 ****************************************************************************/
 
-static WERROR enumprinterdrivers_level2(fstring servername, fstring architecture, RPC_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
+static WERROR enumprinterdrivers_level2(const char *servername, fstring architecture, RPC_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
 {
         int i;
@@ -6957 +6967 @@
 ****************************************************************************/
 
-static WERROR enumprinterdrivers_level3(fstring servername, fstring architecture, RPC_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
+static WERROR enumprinterdrivers_level3(const char *servername, fstring architecture, RPC_BUFFER *buffer, uint32 offered, uint32 *needed, uint32 *returned)
 {
         int i;
@@ -7053 +7063 @@
         uint32 *needed = &r_u->needed;
         uint32 *returned = &r_u->returned;
-
+        const char *cservername;
         fstring servername;
         fstring architecture;
@@ -7074 +7084 @@
         unistr2_to_ascii(servername, &q_u->name, sizeof(servername)-1);
 
-        if ( !is_myname_or_ipaddr( servername ) )
+        cservername = canon_servername(servername);
+
+        if (!is_myname_or_ipaddr(cservername))
                 return WERR_UNKNOWN_PRINTER_DRIVER;
 
         switch (level) {
         case 1:
-                return enumprinterdrivers_level1(servername, architecture, buffer, offered, needed, returned);
+                return enumprinterdrivers_level1(cservername, architecture, buffer, offered, needed, returned);
         case 2:
-                return enumprinterdrivers_level2(servername, architecture, buffer, offered, needed, returned);
+                return enumprinterdrivers_level2(cservername, architecture, buffer, offered, needed, returned);
         case 3:
-                return enumprinterdrivers_level3(servername, architecture, buffer, offered, needed, returned);
+                return enumprinterdrivers_level3(cservername, architecture, buffer, offered, needed, returned);
         default:
                 return WERR_UNKNOWN_LEVEL;
@@ -7853 +7865 @@
         pstring long_archi;
         fstring servername;
-        char *pservername; 
+        const char *pservername; 
         const char *short_archi;
         DRIVER_DIRECTORY_1 *info=NULL;
@@ -7861 +7873 @@
         unistr2_to_ascii(long_archi, uni_environment, sizeof(long_archi)-1);
 
-        /* check for beginning double '\'s and that the server
-           long enough */
-
-        pservername = servername;
-        if ( *pservername == '\\' && strlen(servername)>2 ) {
-                pservername += 2;
-        } 
+        pservername = canon_servername(servername);
         
         if ( !is_myname_or_ipaddr( pservername ) )