s3-printing: move os2 related functions to printing/nt_printing_os2.c.

Guenther

Pair-Programmed-With: David Disseldorp <ddiss@suse.de>

1 files changed, 0 insertions, 142 deletions

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 45d4191ae7..7a9643058d 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -1340,148 +1340,6 @@ WERROR spoolss_create_default_secdesc(TALLOC_CTX *mem_ctx,
 }
 
 /****************************************************************************
- ***************************************************************************/
-
-static char *win_driver;
-static char *os2_driver;
-
-static const char *get_win_driver(void)
-{
-	if (win_driver == NULL) {
-		return "";
-	}
-	return win_driver;
-}
-
-static const char *get_os2_driver(void)
-{
-	if (os2_driver == NULL) {
-		return "";
-	}
-	return os2_driver;
-}
-
-static bool set_driver_mapping(const char *from, const char *to)
-{
-	SAFE_FREE(win_driver);
-	SAFE_FREE(os2_driver);
-
-	win_driver = SMB_STRDUP(from);
-	os2_driver = SMB_STRDUP(to);
-
-	if (win_driver == NULL || os2_driver == NULL) {
-		SAFE_FREE(win_driver);
-		SAFE_FREE(os2_driver);
-		return false;
-	}
-	return true;
-}
-
-/**
- * @internal
- *
- * @brief Map a Windows driver to a OS/2 driver.
- *
- * @param[in]  mem_ctx  The memory context to use.
- *
- * @param[in,out] pdrivername The drivername of Windows to remap.
- *
- * @return              WERR_OK on success, a corresponding WERROR on failure.
- */
-WERROR spoolss_map_to_os2_driver(TALLOC_CTX *mem_ctx, const char **pdrivername)
-{
-	const char *mapfile = lp_os2_driver_map();
-	char **lines = NULL;
-	const char *drivername;
-	int numlines = 0;
-	int i;
-
-	if (pdrivername == NULL || *pdrivername == NULL || *pdrivername[0] == '\0') {
-		return WERR_INVALID_PARAMETER;
-	}
-
-	drivername = *pdrivername;
-
-	if (mapfile[0] == '\0') {
-		return WERR_BADFILE;
-	}
-
-	if (strequal(drivername, get_win_driver())) {
-		DEBUG(3,("Mapped Windows driver %s to OS/2 driver %s\n",
-			drivername, get_os2_driver()));
-		drivername = talloc_strdup(mem_ctx, get_os2_driver());
-		if (drivername == NULL) {
-			return WERR_NOMEM;
-		}
-		*pdrivername = drivername;
-		return WERR_OK;
-	}
-
-	lines = file_lines_load(mapfile, &numlines, 0, NULL);
-	if (numlines == 0 || lines == NULL) {
-		DEBUG(0,("No entries in OS/2 driver map %s\n", mapfile));
-		TALLOC_FREE(lines);
-		return WERR_EMPTY;
-	}
-
-	DEBUG(4,("Scanning OS/2 driver map %s\n",mapfile));
-
-	for( i = 0; i < numlines; i++) {
-		char *nt_name = lines[i];
-		char *os2_name = strchr(nt_name, '=');
-
-		if (os2_name == NULL) {
-			continue;
-		}
-
-		*os2_name++ = '\0';
-
-		while (isspace(*nt_name)) {
-			nt_name++;
-		}
-
-		if (*nt_name == '\0' || strchr("#;", *nt_name)) {
-			continue;
-		}
-
-		{
-			int l = strlen(nt_name);
-			while (l && isspace(nt_name[l - 1])) {
-				nt_name[l - 1] = 0;
-				l--;
-			}
-		}
-
-		while (isspace(*os2_name)) {
-			os2_name++;
-		}
-
-		{
-			int l = strlen(os2_name);
-			while (l && isspace(os2_name[l-1])) {
-				os2_name[l-1] = 0;
-				l--;
-			}
-		}
-
-		if (strequal(nt_name, drivername)) {
-			DEBUG(3,("Mapped Windows driver %s to OS/2 driver %s\n",drivername,os2_name));
-			set_driver_mapping(drivername, os2_name);
-			drivername = talloc_strdup(mem_ctx, os2_name);
-			TALLOC_FREE(lines);
-			if (drivername == NULL) {
-				return WERR_NOMEM;
-			}
-			*pdrivername = drivername;
-			return WERR_OK;
-		}
-	}
-
-	TALLOC_FREE(lines);
-	return WERR_OK;
-}
-
-/****************************************************************************
 ****************************************************************************/
 
 bool driver_info_ctr_to_info8(struct spoolss_AddDriverInfoCtr *r,