diff options
author | Andreas Schneider <asn@samba.org> | 2010-04-28 17:03:41 +0200 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2010-05-18 15:17:23 +0200 |
commit | 7d363b8922e7ec740858339aaa0052a990b264fa (patch) | |
tree | 8128e8eb834485f922de7c503c84b89b18812c68 | |
parent | a3b81a908c9c866066316b01efe5bb0bc8937a86 (diff) | |
download | samba-7d363b8922e7ec740858339aaa0052a990b264fa.tar.gz samba-7d363b8922e7ec740858339aaa0052a990b264fa.tar.bz2 samba-7d363b8922e7ec740858339aaa0052a990b264fa.zip |
s3-spoolss: Create a spoolss_map_to_os2_driver function.
Signed-off-by: Günther Deschner <gd@samba.org>
-rw-r--r-- | source3/include/proto.h | 1 | ||||
-rw-r--r-- | source3/printing/nt_printing.c | 104 |
2 files changed, 105 insertions, 0 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 1853fa9b8b..c1976082e0 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4746,6 +4746,7 @@ WERROR spoolss_create_default_devmode(TALLOC_CTX *mem_ctx, struct spoolss_DeviceMode **devmode); WERROR spoolss_create_default_secdesc(TALLOC_CTX *mem_ctx, struct spoolss_security_descriptor **secdesc); +WERROR spoolss_map_to_os2_driver(TALLOC_CTX *mem_ctx, const char **pdrivername); int add_new_printer_key( NT_PRINTER_DATA *data, const char *name ); int delete_printer_key( NT_PRINTER_DATA *data, const char *name ); int lookup_printerkey( NT_PRINTER_DATA *data, const char *name ); diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 0519e29775..5b68d0b810 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -3961,6 +3961,110 @@ static void map_to_os2_driver(fstring drivername) TALLOC_FREE(lines); } +/** + * @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; +} + /**************************************************************************** Get a default printer info 2 struct. ****************************************************************************/ |