4634017 Lpadmin's new printer limit needs to be increased.

4941143 lpsched leaks memory in freeprinter()
6480891 lpsched fixes unused files
6486772 in.lpd should use libpapi
6486967 print-svc refers to /usr/sbin/cut
6487898 lpadmin doesn't add remote access
6488443 printmr/lpadmin should prefer IPP support when it's available
6490445 psm-lpd has incorrect mime type in it's translation table
6490453 lpr uses the wrong default mime type
6491971 in.lpd and the ipp listener should detect cycles
6491978 libhttp-core should build when -DDEBUG is specified
6492414 lpstat -o -l should report on requested form when available

--HG--
rename : usr/src/cmd/lp/cmd/adaptor/Makefile => deleted_files/usr/src/cmd/lp/cmd/adaptor/Makefile
rename : usr/src/cmd/lp/cmd/adaptor/cancel_job.c => deleted_files/usr/src/cmd/lp/cmd/adaptor/cancel_job.c
rename : usr/src/cmd/lp/cmd/adaptor/misc.c => deleted_files/usr/src/cmd/lp/cmd/adaptor/misc.c
rename : usr/src/cmd/lp/cmd/adaptor/misc.h => deleted_files/usr/src/cmd/lp/cmd/adaptor/misc.h
rename : usr/src/cmd/lp/cmd/adaptor/show_queue.c => deleted_files/usr/src/cmd/lp/cmd/adaptor/show_queue.c
rename : usr/src/cmd/lp/cmd/adaptor/submit_job.c => deleted_files/usr/src/cmd/lp/cmd/adaptor/submit_job.c
rename : usr/src/cmd/print/gateway/Makefile => deleted_files/usr/src/cmd/print/gateway/Makefile
rename : usr/src/cmd/print/gateway/adaptor.c => deleted_files/usr/src/cmd/print/gateway/adaptor.c
rename : usr/src/cmd/print/gateway/adaptor.h => deleted_files/usr/src/cmd/print/gateway/adaptor.h
rename : usr/src/cmd/print/gateway/cleanup.xml => deleted_files/usr/src/cmd/print/gateway/cleanup.xml
rename : usr/src/cmd/print/gateway/main.c => deleted_files/usr/src/cmd/print/gateway/main.c
rename : usr/src/cmd/print/gateway/print-cleanup => deleted_files/usr/src/cmd/print/gateway/print-cleanup
rename : usr/src/cmd/print/gateway/printd.c => deleted_files/usr/src/cmd/print/gateway/printd.c
rename : usr/src/cmd/print/gateway/translators/Makefile => deleted_files/usr/src/cmd/print/gateway/translators/Makefile
rename : usr/src/cmd/print/gateway/translators/cascade/Makefile => deleted_files/usr/src/cmd/print/gateway/translators/cascade/Makefile
rename : usr/src/cmd/print/gateway/translators/cascade/cascade.c => deleted_files/usr/src/cmd/print/gateway/translators/cascade/cascade.c
rename : usr/src/cmd/print/gateway/translators/test/Makefile => deleted_files/usr/src/cmd/print/gateway/translators/test/Makefile
rename : usr/src/cmd/print/gateway/translators/test/README => deleted_files/usr/src/cmd/print/gateway/translators/test/README
rename : usr/src/cmd/print/gateway/translators/test/test.c => deleted_files/usr/src/cmd/print/gateway/translators/test/test.c
rename : usr/src/cmd/print/gateway/rfc1179.xml => usr/src/cmd/print/bsd-sysv-commands/rfc1179.xml

1 files changed, 13 insertions, 39 deletions

diff --git a/usr/src/cmd/print/bsd-sysv-commands/lp.c b/usr/src/cmd/print/bsd-sysv-commands/lp.c
index 3b6631fe6a..5abe7ae7e8 100644
--- a/usr/src/cmd/print/bsd-sysv-commands/lp.c
+++ b/usr/src/cmd/print/bsd-sysv-commands/lp.c
@@ -62,41 +62,6 @@ usage(char *program)
 	exit(1);
 }
 
-static struct {
-	char *mime_type;
-	char *lp_type;
-} type_map[] = {
-	{ "text/plain", "simple" },
-	{ "application/octet-stream", "raw" },
-	{ "application/octet-stream", "any" },
-	{ "application/postscript", "postscript" },
-	{ "application/postscript", "ps" },
-	{ "application/x-cif", "cif" },
-	{ "application/x-dvi", "dvi" },
-	{ "application/x-plot", "plot" },
-	{ "application/x-ditroff", "troff" },
-	{ "application/x-troff", "otroff" },
-	{ "application/x-pr", "pr" },
-	{ "application/x-fortran", "fortran" },
-	{ "application/x-raster", "raster" },
-	{ NULL, NULL}
-};
-
-static char *
-lp_type_to_mime_type(char *lp_type)
-{
-	int i;
-
-	if (lp_type == NULL)
-		return ("application/octet-stream");
-
-	for (i = 0; type_map[i].lp_type != NULL; i++)
-		if (strcasecmp(type_map[i].lp_type, lp_type) == 0)
-			return (type_map[i].mime_type);
-
-	return (lp_type);
-}
-
 int
 main(int ac, char *av[])
 {
@@ -161,7 +126,7 @@ main(int ac, char *av[])
 			break;
 		case 'f':	/* form */
 			papiAttributeListAddString(&list, PAPI_ATTR_EXCL,
-					"media", optarg);
+					"form", optarg);
 			break;
 		case 'i':	/* modify job */
 			if ((get_printer_id(optarg, &printer, &modify) < 0) ||
@@ -250,19 +215,22 @@ main(int ac, char *av[])
 		optind = ac;
 
 	if (modify == -1) {
-		char *document_format = "application/octet-stream";
+		char *document_format = "text/plain";
 
-#ifdef MAGIC_MIME
 		if (optind != ac) {
 			/* get the mime type of the file data */
+#ifdef MAGIC_MIME
 			magic_t ms = NULL;
 
 			if ((ms = magic_open(MAGIC_MIME)) != NULL) {
 				document_format = magic_file(ms, av[optind]);
 				magic_close(ms);
 			}
-		}
+#else
+			if (is_postscript(av[optind]) == 1)
+				document_format = "application/postscript";
 #endif
+		}
 
 		papiAttributeListAddInteger(&list, PAPI_ATTR_EXCL, "copies", 1);
 		papiAttributeListAddString(&list, PAPI_ATTR_EXCL,
@@ -280,6 +248,12 @@ main(int ac, char *av[])
 		exit(1);
 	}
 
+	if (dump != 0) {
+		printf("requesting attributes:\n");
+		papiAttributeListPrint(stdout, list, "\t");
+		printf("\n");
+	}
+
 	if (modify != -1)
 		status = papiJobModify(svc, printer, modify, list, &job);
 	else if (optind == ac)	/* no file list, use stdin */