1 files changed, 14 insertions, 26 deletions

diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c
index dd7164b06a5..3ffedcf1858 100644
--- a/source/printing/nt_printing.c
+++ b/source/printing/nt_printing.c
@@ -593,8 +593,7 @@ BOOL add_a_form(nt_forms_struct **list, const FORM *form, int *count)
 	
 	unistr2_to_ascii(form_name, &form->name, sizeof(form_name)-1);
 	for (n=0; n<*count; n++) {
-		if (!strncmp((*list)[n].name, form_name, strlen(form_name))) {
-			DEBUG(103, ("NT workaround, [%s] already exists\n", form_name));
+		if ( strequal((*list)[n].name, form_name) ) {
 			update=True;
 			break;
 		}
@@ -618,6 +617,9 @@ BOOL add_a_form(nt_forms_struct **list, const FORM *form, int *count)
 	(*list)[n].right=form->right;
 	(*list)[n].bottom=form->bottom;
 
+	DEBUG(6,("add_a_form: Successfully %s form [%s]\n", 
+		update ? "updated" : "added", form_name));
+
 	return True;
 }
 
@@ -2711,9 +2713,12 @@ static WERROR nt_printer_publish_ads(ADS_STRUCT *ads,
 	            printer->info_2->sharename);
 
 	/* publish it */
-	ads_rc = ads_add_printer_entry(ads, prt_dn, ctx, &mods);
-	if (LDAP_ALREADY_EXISTS == ads_rc.err.rc)
-		ads_rc = ads_mod_printer_entry(ads, prt_dn, ctx, &mods);
+	ads_rc = ads_mod_printer_entry(ads, prt_dn, ctx, &mods);
+	if (ads_rc.err.rc == LDAP_NO_SUCH_OBJECT)
+		ads_rc = ads_add_printer_entry(ads, prt_dn, ctx, &mods);
+
+	if (!ADS_ERR_OK(ads_rc))
+		DEBUG(3, ("error publishing %s: %s\n", printer->info_2->sharename, ads_errstr(ads_rc)));
 	
 	talloc_destroy(ctx);
 
@@ -2835,11 +2840,9 @@ WERROR check_published_printers(void)
 {
 	ADS_STATUS ads_rc;
 	ADS_STRUCT *ads = NULL;
-	void *res = NULL;
 	int snum;
 	int n_services = lp_numservices();
 	NT_PRINTER_INFO_LEVEL *printer = NULL;
-	WERROR win_rc;
 
 	ads = ads_init(NULL, NULL, NULL);
 	if (!ads) {
@@ -2863,27 +2866,12 @@ WERROR check_published_printers(void)
 		if (!(lp_snum_ok(snum) && lp_print_ok(snum)))
 			continue;
 
-		if (!W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2,
-		                                 lp_servicename(snum))) ||
-		    !(printer->info_2->attributes & PRINTER_ATTRIBUTE_PUBLISHED))
-			goto next;
-
-		DEBUG(5, ("checking directory for printer %s\n", printer->info_2->printername));
-		ads_rc = ads_find_printer_on_server(ads, &res,
-				printer->info_2->sharename, global_myname());
-		if (ADS_ERR_OK(ads_rc) && ads_count_replies(ads, res)) {
-			DEBUG(5, ("printer %s is in directory\n", printer->info_2->printername));
-			goto next;
-		}
+		if (W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2,
+		                                lp_servicename(snum))) &&
+		    (printer->info_2->attributes & PRINTER_ATTRIBUTE_PUBLISHED))
+			nt_printer_publish_ads(ads, printer);
 
-		win_rc = nt_printer_publish_ads(ads, printer);
-		if (!W_ERROR_IS_OK(win_rc))
-			DEBUG(3, ("error publishing %s: %s\n", printer->info_2->sharename, dos_errstr(win_rc)));
-
-	next:
 		free_a_printer(&printer, 2);
-		ads_msgfree(ads, res);
-		res = NULL;
 	}
 
 	ads_destroy(&ads);