svn commit: samba r3649 - branches/SAMBA_3_0/source/rpcclient trunk/source/rpcclient

[gd at samba.org]

Author: gd
Date: 2004-11-10 02:09:13 +0000 (Wed, 10 Nov 2004)
New Revision: 3649

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3649

Log:
Fix a couple of rpcclient spoolss commands (setprinter, setprintername,
getdriver) w.r.t to printer-naming scheme.

Guenther

Modified:
   branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c
   trunk/source/rpcclient/cmd_spoolss.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c
===================================================================
--- branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c	2004-11-10 01:21:58 UTC (rev 3648)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_spoolss.c	2004-11-10 02:09:13 UTC (rev 3649)
@@ -521,7 +521,7 @@
 
 	slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
 	strupper_m(servername);
-	fstrcpy(printername, argv[1]);
+	slprintf(printername, sizeof(servername)-1, "%s\\%s", servername, argv[1]);
 	fstrcpy(user, cli->user_name);
 
 	/* get a printer handle */
@@ -591,7 +591,7 @@
 
 	slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
 	strupper_m(servername);
-	fstrcpy(printername, argv[1]);
+	slprintf(printername, sizeof(printername)-1, "%s\\%s", servername, argv[1]);
 	fstrcpy(user, cli->user_name);
 
 	/* get a printer handle */
@@ -1036,7 +1036,7 @@
 	slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
 	strupper_m(servername);
 	fstrcpy(user, cli->user_name);
-	fstrcpy(printername, argv[1]);
+	slprintf(printername, sizeof(servername)-1, "%s\\%s", servername, argv[1]);
 	if (argc == 3)
 		info_level = atoi(argv[2]);
 

Modified: trunk/source/rpcclient/cmd_spoolss.c
===================================================================
--- trunk/source/rpcclient/cmd_spoolss.c	2004-11-10 01:21:58 UTC (rev 3648)
+++ trunk/source/rpcclient/cmd_spoolss.c	2004-11-10 02:09:13 UTC (rev 3649)
@@ -521,7 +521,7 @@
 
 	slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
 	strupper_m(servername);
-	fstrcpy(printername, argv[1]);
+	slprintf(printername, sizeof(servername)-1, "%s\\%s", servername, argv[1]);
 	fstrcpy(user, cli->user_name);
 
 	/* get a printer handle */
@@ -591,7 +591,7 @@
 
 	slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
 	strupper_m(servername);
-	fstrcpy(printername, argv[1]);
+	slprintf(printername, sizeof(printername)-1, "%s\\%s", servername, argv[1]);
 	fstrcpy(user, cli->user_name);
 
 	/* get a printer handle */
@@ -1036,7 +1036,7 @@
 	slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
 	strupper_m(servername);
 	fstrcpy(user, cli->user_name);
-	fstrcpy(printername, argv[1]);
+	slprintf(printername, sizeof(servername)-1, "%s\\%s", servername, argv[1]);
 	if (argc == 3)
 		info_level = atoi(argv[2]);