s3-spoolss: use enumprinterdrivers_level() for level 2 enum.

Guenther

1 files changed, 6 insertions, 66 deletions

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index e90b1b9116..6457cc0c18 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -6669,6 +6669,10 @@ static WERROR enumprinterdrivers_level(TALLOC_CTX *mem_ctx,
 								   &driver, servername,
 								   architecture);
 				break;
+			case 2:
+				result = fill_printer_driver_info2(info, &info[count+i].info2,
+								   &driver, servername);
+				break;
 			default:
 				result = WERR_UNKNOWN_LEVEL;
 				break;
@@ -6723,72 +6727,8 @@ static WERROR enumprinterdrivers_level2(TALLOC_CTX *mem_ctx,
 					union spoolss_DriverInfo **info_p,
 					uint32_t *count)
 {
-	int i;
-	int ndrivers;
-	uint32_t version;
-	fstring *list = NULL;
-	NT_PRINTER_DRIVER_INFO_LEVEL driver;
-	union spoolss_DriverInfo *info = NULL;
-	WERROR result = WERR_OK;
-
-	*count = 0;
-
-	for (version=0; version<DRIVER_MAX_VERSION; version++) {
-		list = NULL;
-		ndrivers = get_ntdrivers(&list, architecture, version);
-		DEBUGADD(4,("we have:[%d] drivers in environment [%s] and version [%d]\n",
-			ndrivers, architecture, version));
-
-		if (ndrivers == -1) {
-			result = WERR_NOMEM;
-			goto out;
-		}
-
-		if (ndrivers != 0) {
-			info = TALLOC_REALLOC_ARRAY(mem_ctx, info,
-						    union spoolss_DriverInfo,
-						    *count + ndrivers);
-			if (!info) {
-				DEBUG(0,("enumprinterdrivers_level2: "
-					"failed to enlarge driver info buffer!\n"));
-				result = WERR_NOMEM;
-				goto out;
-			}
-		}
-
-		for (i=0; i<ndrivers; i++) {
-			DEBUGADD(5,("\tdriver: [%s]\n", list[i]));
-			ZERO_STRUCT(driver);
-			result = get_a_printer_driver(&driver, 3, list[i],
-						      architecture, version);
-			if (!W_ERROR_IS_OK(result)) {
-				goto out;
-			}
-			result = fill_printer_driver_info2(info, &info[*count+i].info2,
-							   &driver, servername);
-			if (!W_ERROR_IS_OK(result)) {
-				free_a_printer_driver(driver, 3);
-				goto out;
-			}
-			free_a_printer_driver(driver, 3);
-		}
-
-		*count += ndrivers;
-		SAFE_FREE(list);
-	}
-
- out:
-	SAFE_FREE(list);
-
-	if (!W_ERROR_IS_OK(result)) {
-		TALLOC_FREE(info);
-		*count = 0;
-		return result;
-	}
-
-	*info_p = info;
-
-	return WERR_OK;
+	return enumprinterdrivers_level(mem_ctx, servername, architecture, 2,
+					info_p, count);
 }
 
 /****************************************************************************