svn commit: samba r8618 - in trunk/source/rpc_server: .

[jra at samba.org]

Author: jra
Date: 2005-07-19 21:41:44 +0000 (Tue, 19 Jul 2005)
New Revision: 8618

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

Log:
Be very explicit if addprinterex is called that the "addprinter command"
must be defined in smb.conf.
Jeremy.

Modified:
   trunk/source/rpc_server/srv_spoolss_nt.c


Changeset:
Modified: trunk/source/rpc_server/srv_spoolss_nt.c
===================================================================
--- trunk/source/rpc_server/srv_spoolss_nt.c	2005-07-19 21:41:41 UTC (rev 8617)
+++ trunk/source/rpc_server/srv_spoolss_nt.c	2005-07-19 21:41:44 UTC (rev 8618)
@@ -7492,7 +7492,7 @@
 	/* check to see if the printer already exists */
 
 	if ((snum = print_queue_snum(printer->info_2->sharename)) != -1) {
-		DEBUG(5, ("_spoolss_addprinterex: Attempted to add a printer named [%s] when one already existed!\n", 
+		DEBUG(5, ("spoolss_addprinterex_level_2: Attempted to add a printer named [%s] when one already existed!\n", 
 			printer->info_2->sharename));
 		free_a_printer(&printer, 2);
 		return WERR_PRINTER_ALREADY_EXISTS;
@@ -7505,8 +7505,13 @@
 		if ( !add_printer_hook(p->pipe_user.nt_user_token, printer) ) {
 			free_a_printer(&printer,2);
 			return WERR_ACCESS_DENIED;
+		}
+	} else {
+		DEBUG(0,("spoolss_addprinterex_level_2: add printer for printer %s called and no"
+			"smb.conf parameter \"addprinter command\" is defined. This"
+			"parameter must exist for this call to succeed\n",
+			printer->info_2->sharename ));
 	}
-	}
 
 	/* use our primary netbios name since get_a_printer() will convert 
 	   it to what the client expects on a case by case basis */