diff --git a/cups-lspp.patch b/cups-lspp.patch new file mode 100644 index 0000000..1f919f0 --- /dev/null +++ b/cups-lspp.patch @@ -0,0 +1,1961 @@ +--- /dev/null 2006-07-21 09:48:40.571484750 +0100 ++++ cups-1.2.2/config-scripts/cups-lspp.m4 2006-07-21 12:42:40.000000000 +0100 +@@ -0,0 +1,36 @@ ++dnl ++dnl LSPP code for the Common UNIX Printing System (CUPS). ++dnl ++dnl Copyright 2005-2006 by Hewlett-Packard Development Company, L.P. ++dnl ++dnl This program is free software; you can redistribute it and/or modify ++dnl it under the terms of the GNU General Public License as published by ++dnl the Free Software Foundation; version 2. ++dnl ++dnl This program is distributed in the hope that it will be useful, but ++dnl WITHOUT ANY WARRANTY; without even the implied warranty of ++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++dnl General Public License for more details. ++dnl ++dnl You should have received a copy of the GNU General Public License ++dnl along with this program; if not, write to the Free Software Foundation, ++dnl Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301 USA ++dnl ++ ++dnl Are we trying to meet LSPP requirements ++AC_ARG_ENABLE(lspp, [ --enable-lspp turn on auditing and label support, default=no]) ++ ++if test x"$enable_lspp" != xno; then ++ case "$uname" in ++ Linux) ++ AC_CHECK_LIB(audit,audit_log_user_message, [LIBAUDIT="-laudit" AC_SUBST(LIBAUDIT)]) ++ AC_CHECK_HEADER(libaudit.h) ++ AC_CHECK_LIB(selinux,getpeercon, [LIBSELINUX="-lselinux" AC_SUBST(LIBSELINUX)]) ++ AC_CHECK_HEADER(selinux/selinux.h) ++ AC_DEFINE(WITH_LSPP) ++ ;; ++ *) ++ # All others ++ ;; ++ esac ++fi +--- cups-1.2.2/configure.in.lspp 2006-05-30 21:31:10.000000000 +0100 ++++ cups-1.2.2/configure.in 2006-07-21 12:42:40.000000000 +0100 +@@ -47,6 +47,8 @@ + sinclude(config-scripts/cups-pdf.m4) + sinclude(config-scripts/cups-scripting.m4) + ++sinclude(config-scripts/cups-lspp.m4) ++ + INSTALL_LANGUAGES="" + UNINSTALL_LANGUAGES="" + LANGFILES="" +--- cups-1.2.2/Makedefs.in.lspp 2006-07-21 12:42:35.000000000 +0100 ++++ cups-1.2.2/Makedefs.in 2006-07-21 12:42:40.000000000 +0100 +@@ -135,7 +135,7 @@ + @LDFLAGS@ @RELROFLAG@ @PIEFLAGS@ $(OPTIM) + LINKCUPS = @LINKCUPS@ $(SSLLIBS) + LINKCUPSIMAGE = @LINKCUPSIMAGE@ +-LIBS = $(LINKCUPS) $(COMMONLIBS) ++LIBS = $(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@ + OPTIM = @OPTIM@ + OPTIONS = + PAMLIBS = @PAMLIBS@ +--- /dev/null 2006-07-21 09:48:40.571484750 +0100 ++++ cups-1.2.2/data/mls 2006-07-21 12:42:40.000000000 +0100 +@@ -0,0 +1,277 @@ ++%!PS-Adobe-3.0 ++%%BoundingBox: 0 0 612 792 ++%%Pages: 1 ++%%LanguageLevel: 1 ++%%DocumentData: Clean7Bit ++%%DocumentSuppliedResources: procset bannerprint/1.0 ++%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman ++%%Creator: Michael Sweet, Easy Software Products ++%%CreationDate: May 10, 2000 ++%%Title: Test Page ++%%EndComments ++%%BeginProlog ++%%BeginResource procset bannerprint 1.1 0 ++% ++% PostScript banner page for the Common UNIX Printing System ("CUPS"). ++% ++% Copyright 1993-2005 by Easy Software Products ++% ++% These coded instructions, statements, and computer programs are the ++% property of Easy Software Products and are protected by Federal ++% copyright law. Distribution and use rights are outlined in the file ++% "LICENSE.txt" which should have been included with this file. If this ++% file is missing or damaged please contact Easy Software Products ++% at: ++% ++% Attn: CUPS Licensing Information ++% Easy Software Products ++% 44141 Airport View Drive, Suite 204 ++% Hollywood, Maryland 20636 USA ++% ++% Voice: (301) 373-9600 ++% EMail: cups-info@cups.org ++% WWW: http://www.cups.org ++% ++/CENTER { % Draw centered text ++ % (name) CENTER - ++ dup stringwidth pop % Get the width of the string ++ 0.5 mul neg 0 rmoveto % Shift left 1/2 of the distance ++ show % Show the string ++} bind def ++/RIGHT { % Draw right-justified text ++ % (name) RIGHT - ++ dup stringwidth pop % Get the width of the string ++ neg 0 rmoveto % Shift left the entire distance ++ show % Show the string ++} bind def ++/NUMBER { % Draw a number ++ % power n NUMBER - ++ 1 index 1 eq { % power == 1? ++ round cvi exch pop % Convert "n" to integer ++ } { ++ 1 index mul round exch div % Truncate extra decimal places ++ } ifelse ++ 100 string cvs show % Convert to a string and show it... ++} bind def ++/CUPSLOGO { % Draw the CUPS logo ++ % height CUPSLOGO ++ % Start with a big C... ++ /Helvetica findfont 1 index scalefont setfont ++ 0 setgray ++ 0 0 moveto ++ (C) show ++ ++ % Then "UNIX Printing System" much smaller... ++ /Helvetica-Bold findfont 1 index 9 div scalefont setfont ++ 0.25 mul ++ dup dup 2.0 mul moveto ++ (UNIX) show ++ dup dup 1.6 mul moveto ++ (Printing) show ++ dup 1.2 mul moveto ++ (System) show ++} bind def ++/ESPLOGO { % Draw the ESP logo ++ % height ESPLOGO ++ % Compute the size of the logo... ++ 0 0 ++ 2 index 1.5 mul 3 index ++ ++ % Do the "metallic" fill from 10% black to 40% black... ++ 1 -0.001 0 { ++ dup % loopval ++ -0.15 mul % loopval * -0.15 ++ 0.9 add % 0.9 - loopval * 0.15 ++ setgray % set gray shade ++ ++ 0 % x ++ 1 index neg % loopval ++ 1 add % 1 - loopval ++ 3 index % height ++ mul % height * (1 - loopval) ++ moveto % starting point ++ ++ dup % loopval ++ 3 index % width ++ mul % loopval * width ++ 2 index % height ++ lineto % Next point ++ ++ 0 % x ++ 2 index % height ++ lineto % Next point ++ ++ closepath ++ fill ++ ++ dup % loopval ++ 0.15 mul % loopval * 0.15 ++ 0.6 add % 0.6 + loopval * 0.15 ++ setgray ++ ++ dup % loopval ++ neg 1 add % 1 - loopval ++ 3 index % width ++ mul % (1 - loopval) * width ++ 0 % y ++ moveto % Starting point ++ ++ 2 index % width ++ exch % loopval ++ 2 index % height ++ mul % loopval * height ++ lineto % Next point ++ ++ 1 index % width ++ 0 % y ++ lineto % Next point ++ ++ closepath ++ fill ++ } for ++ ++ 0 setgray rectstroke ++ ++ /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont ++ dup 40 div ++ ++ dup 4 mul 1 index 25 mul moveto (E) show ++ dup 10 mul 1 index 15 mul moveto (S) show ++ dup 16 mul 1 index 5 mul moveto (P) show ++ ++ /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont ++ dup 14 mul 1 index 29 mul moveto (asy) show ++ dup 20 mul 1 index 19 mul moveto (oftware) show ++ dup 26 mul 1 index 9 mul moveto (roducts) show ++ ++ pop ++} bind def ++%%EndResource ++%%EndProlog ++%%Page: 1 1 ++gsave ++ ++ % Determine the imageable area and device resolution... ++ initclip newpath clippath pathbbox % Get bounding rectangle ++ 72 div /pageTop exch def % Get top margin in inches ++ 72 div /pageRight exch def % Get right margin in inches ++ 72 div /pageBottom exch def % Get bottom margin in inches ++ 72 div /pageLeft exch def % Get left margin in inches ++ ++ /pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft ++ /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom ++ ++ /boxWidth % width of text box ++ pageWidth pageHeight lt ++ { pageWidth 54 mul } ++ { pageHeight 42 mul } ++ ifelse def ++ ++ newpath % Clear bounding path ++ ++ % Create fonts... ++ /bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold ++ pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33) ++ ++ /mediumFont /Helvetica findfont % mediumFont = Helvetica ++ pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5) ++ ++ % Offset page to account for lower-left margin... ++ pageLeft 72 mul ++ pageBottom 72 mul ++ translate ++ ++ % Draw the label at the top and bottom... ++ 0 setgray % Color ++ ++ pageWidth 36 mul % Center of page ++ pageHeight 72 mul % Top of page ++ pageWidth -7 mul add % - 2 lines ++ moveto % Position text ++ bigFont setfont % Font ++ ({mls-label}) CENTER % Show text centered ++ ++ pageWidth 36 mul % Center of page ++ pageHeight 6 mul % Bottom of page ++ moveto % Position text ++ bigFont setfont % Font ++ ({mls-label}) CENTER % Show text centered ++ ++ % Job information box... ++ pageWidth 36 mul 9 add % x = pageWidth * 1/2 * 72 + 9 ++ boxWidth 0.5 mul sub % x-= 1/2 box width ++ pageHeight 30 mul 9 sub % y = pageHeight * 1/2 * 72 - 9 ++ boxWidth % w = box width ++ pageHeight 14 mul % h = pageHeight * 1/2 * 72 ++ 0.5 setgray rectfill % Draw a shadow ++ ++ pageWidth 36 mul % x = pageWidth * 1/2 * 72 ++ boxWidth 0.5 mul sub % x-= 1/2 box width ++ pageHeight 30 mul % y = pageHeight * 1/4 * 72 ++ boxWidth % w = box width ++ pageHeight 14 mul % h = pageHeight * 1/2 * 72 ++ ++ 4 copy 1 setgray rectfill % Clear the box to white ++ 0 setgray rectstroke % Draw a black box around it... ++ ++ % Job information text... ++ mediumFont setfont % Medium sized font ++ ++ pageWidth 36 mul % x = pageWidth * 1/2 * 72 ++ pageHeight 36 mul % y = pageHeight * 1/2 * 72 ++ pageHeight 5 mul add % y += 2 lines ++ 2 copy % Copy X & Y ++ moveto ++ (Job ID: ) RIGHT ++ moveto ++ ({printer-name}-{job-id}) show ++ ++ pageWidth 36 mul % x = pageWidth * 1/2 * 72 ++ pageHeight 36 mul % y = pageHeight * 1/2 * 72 ++ pageHeight 2 mul add % y += 1 line ++ 2 copy % Copy X & Y ++ moveto ++ (Title: ) RIGHT ++ moveto ++ ({job-name}) show ++ ++ pageWidth 36 mul % x = pageWidth * 1/2 * 72 ++ pageHeight 36 mul % y = pageHeight * 1/2 * 72 ++ pageHeight -1 mul add % y -= 1 line ++ 2 copy % Copy X & Y ++ moveto ++ (Requesting User: ) RIGHT ++ moveto ++ ({job-originating-user-name}) show ++ ++ pageWidth 36 mul % x = pageWidth * 1/2 * 72 ++ pageHeight 36 mul % y = pageHeight * 1/2 * 72 ++ pageHeight -4 mul add % y -= 2 lines ++ 2 copy % Copy X & Y ++ moveto ++ (Billing Info: ) RIGHT ++ moveto ++ ({?job-billing}) show ++ ++ % Then the CUPS logo.... ++ gsave ++ pageWidth 4 mul ++ pageWidth 6 mul ++ translate ++ pageWidth 9 mul CUPSLOGO ++ grestore ++ ++ % And the ESP logo.... ++ gsave ++ pageWidth 59 mul ++ pageWidth 6 mul ++ translate ++ pageWidth 6 mul ESPLOGO ++ grestore ++% Show the page... ++grestore ++showpage ++% ++% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $". ++% ++%%EOF +--- /dev/null 2006-07-21 09:48:40.571484750 +0100 ++++ cups-1.2.2/data/selinux 2006-07-21 12:42:40.000000000 +0100 +@@ -0,0 +1,277 @@ ++%!PS-Adobe-3.0 ++%%BoundingBox: 0 0 612 792 ++%%Pages: 1 ++%%LanguageLevel: 1 ++%%DocumentData: Clean7Bit ++%%DocumentSuppliedResources: procset bannerprint/1.0 ++%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman ++%%Creator: Michael Sweet, Easy Software Products ++%%CreationDate: May 10, 2000 ++%%Title: Test Page ++%%EndComments ++%%BeginProlog ++%%BeginResource procset bannerprint 1.1 0 ++% ++% PostScript banner page for the Common UNIX Printing System ("CUPS"). ++% ++% Copyright 1993-2005 by Easy Software Products ++% ++% These coded instructions, statements, and computer programs are the ++% property of Easy Software Products and are protected by Federal ++% copyright law. Distribution and use rights are outlined in the file ++% "LICENSE.txt" which should have been included with this file. If this ++% file is missing or damaged please contact Easy Software Products ++% at: ++% ++% Attn: CUPS Licensing Information ++% Easy Software Products ++% 44141 Airport View Drive, Suite 204 ++% Hollywood, Maryland 20636 USA ++% ++% Voice: (301) 373-9600 ++% EMail: cups-info@cups.org ++% WWW: http://www.cups.org ++% ++/CENTER { % Draw centered text ++ % (name) CENTER - ++ dup stringwidth pop % Get the width of the string ++ 0.5 mul neg 0 rmoveto % Shift left 1/2 of the distance ++ show % Show the string ++} bind def ++/RIGHT { % Draw right-justified text ++ % (name) RIGHT - ++ dup stringwidth pop % Get the width of the string ++ neg 0 rmoveto % Shift left the entire distance ++ show % Show the string ++} bind def ++/NUMBER { % Draw a number ++ % power n NUMBER - ++ 1 index 1 eq { % power == 1? ++ round cvi exch pop % Convert "n" to integer ++ } { ++ 1 index mul round exch div % Truncate extra decimal places ++ } ifelse ++ 100 string cvs show % Convert to a string and show it... ++} bind def ++/CUPSLOGO { % Draw the CUPS logo ++ % height CUPSLOGO ++ % Start with a big C... ++ /Helvetica findfont 1 index scalefont setfont ++ 0 setgray ++ 0 0 moveto ++ (C) show ++ ++ % Then "UNIX Printing System" much smaller... ++ /Helvetica-Bold findfont 1 index 9 div scalefont setfont ++ 0.25 mul ++ dup dup 2.0 mul moveto ++ (UNIX) show ++ dup dup 1.6 mul moveto ++ (Printing) show ++ dup 1.2 mul moveto ++ (System) show ++} bind def ++/ESPLOGO { % Draw the ESP logo ++ % height ESPLOGO ++ % Compute the size of the logo... ++ 0 0 ++ 2 index 1.5 mul 3 index ++ ++ % Do the "metallic" fill from 10% black to 40% black... ++ 1 -0.001 0 { ++ dup % loopval ++ -0.15 mul % loopval * -0.15 ++ 0.9 add % 0.9 - loopval * 0.15 ++ setgray % set gray shade ++ ++ 0 % x ++ 1 index neg % loopval ++ 1 add % 1 - loopval ++ 3 index % height ++ mul % height * (1 - loopval) ++ moveto % starting point ++ ++ dup % loopval ++ 3 index % width ++ mul % loopval * width ++ 2 index % height ++ lineto % Next point ++ ++ 0 % x ++ 2 index % height ++ lineto % Next point ++ ++ closepath ++ fill ++ ++ dup % loopval ++ 0.15 mul % loopval * 0.15 ++ 0.6 add % 0.6 + loopval * 0.15 ++ setgray ++ ++ dup % loopval ++ neg 1 add % 1 - loopval ++ 3 index % width ++ mul % (1 - loopval) * width ++ 0 % y ++ moveto % Starting point ++ ++ 2 index % width ++ exch % loopval ++ 2 index % height ++ mul % loopval * height ++ lineto % Next point ++ ++ 1 index % width ++ 0 % y ++ lineto % Next point ++ ++ closepath ++ fill ++ } for ++ ++ 0 setgray rectstroke ++ ++ /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont ++ dup 40 div ++ ++ dup 4 mul 1 index 25 mul moveto (E) show ++ dup 10 mul 1 index 15 mul moveto (S) show ++ dup 16 mul 1 index 5 mul moveto (P) show ++ ++ /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont ++ dup 14 mul 1 index 29 mul moveto (asy) show ++ dup 20 mul 1 index 19 mul moveto (oftware) show ++ dup 26 mul 1 index 9 mul moveto (roducts) show ++ ++ pop ++} bind def ++%%EndResource ++%%EndProlog ++%%Page: 1 1 ++gsave ++ ++ % Determine the imageable area and device resolution... ++ initclip newpath clippath pathbbox % Get bounding rectangle ++ 72 div /pageTop exch def % Get top margin in inches ++ 72 div /pageRight exch def % Get right margin in inches ++ 72 div /pageBottom exch def % Get bottom margin in inches ++ 72 div /pageLeft exch def % Get left margin in inches ++ ++ /pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft ++ /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom ++ ++ /boxWidth % width of text box ++ pageWidth pageHeight lt ++ { pageWidth 54 mul } ++ { pageHeight 42 mul } ++ ifelse def ++ ++ newpath % Clear bounding path ++ ++ % Create fonts... ++ /bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold ++ pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33) ++ ++ /mediumFont /Helvetica findfont % mediumFont = Helvetica ++ pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5) ++ ++ % Offset page to account for lower-left margin... ++ pageLeft 72 mul ++ pageBottom 72 mul ++ translate ++ ++ % Draw the label at the top and bottom... ++ 0 setgray % Color ++ ++ pageWidth 36 mul % Center of page ++ pageHeight 72 mul % Top of page ++ pageWidth -7 mul add % - 2 lines ++ moveto % Position text ++ bigFont setfont % Font ++ ({mls-label}) CENTER % Show text centered ++ ++ pageWidth 36 mul % Center of page ++ pageHeight 6 mul % Bottom of page ++ moveto % Position text ++ bigFont setfont % Font ++ ({mls-label}) CENTER % Show text centered ++ ++ % Job information box... ++ pageWidth 36 mul 9 add % x = pageWidth * 1/2 * 72 + 9 ++ boxWidth 0.5 mul sub % x-= 1/2 box width ++ pageHeight 30 mul 9 sub % y = pageHeight * 1/2 * 72 - 9 ++ boxWidth % w = box width ++ pageHeight 14 mul % h = pageHeight * 1/2 * 72 ++ 0.5 setgray rectfill % Draw a shadow ++ ++ pageWidth 36 mul % x = pageWidth * 1/2 * 72 ++ boxWidth 0.5 mul sub % x-= 1/2 box width ++ pageHeight 30 mul % y = pageHeight * 1/4 * 72 ++ boxWidth % w = box width ++ pageHeight 14 mul % h = pageHeight * 1/2 * 72 ++ ++ 4 copy 1 setgray rectfill % Clear the box to white ++ 0 setgray rectstroke % Draw a black box around it... ++ ++ % Job information text... ++ mediumFont setfont % Medium sized font ++ ++ pageWidth 36 mul % x = pageWidth * 1/2 * 72 ++ pageHeight 36 mul % y = pageHeight * 1/2 * 72 ++ pageHeight 5 mul add % y += 2 lines ++ 2 copy % Copy X & Y ++ moveto ++ (Job ID: ) RIGHT ++ moveto ++ ({printer-name}-{job-id}) show ++ ++ pageWidth 36 mul % x = pageWidth * 1/2 * 72 ++ pageHeight 36 mul % y = pageHeight * 1/2 * 72 ++ pageHeight 2 mul add % y += 1 line ++ 2 copy % Copy X & Y ++ moveto ++ (Title: ) RIGHT ++ moveto ++ ({job-name}) show ++ ++ pageWidth 36 mul % x = pageWidth * 1/2 * 72 ++ pageHeight 36 mul % y = pageHeight * 1/2 * 72 ++ pageHeight -1 mul add % y -= 1 line ++ 2 copy % Copy X & Y ++ moveto ++ (Requesting User: ) RIGHT ++ moveto ++ ({job-originating-user-name}) show ++ ++ pageWidth 36 mul % x = pageWidth * 1/2 * 72 ++ pageHeight 36 mul % y = pageHeight * 1/2 * 72 ++ pageHeight -4 mul add % y -= 2 lines ++ 2 copy % Copy X & Y ++ moveto ++ (Billing Info: ) RIGHT ++ moveto ++ ({?job-billing}) show ++ ++ % Then the CUPS logo.... ++ gsave ++ pageWidth 4 mul ++ pageWidth 6 mul ++ translate ++ pageWidth 9 mul CUPSLOGO ++ grestore ++ ++ % And the ESP logo.... ++ gsave ++ pageWidth 59 mul ++ pageWidth 6 mul ++ translate ++ pageWidth 6 mul ESPLOGO ++ grestore ++% Show the page... ++grestore ++showpage ++% ++% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $". ++% ++%%EOF +--- /dev/null 2006-07-21 09:48:40.571484750 +0100 ++++ cups-1.2.2/data/te 2006-07-21 12:42:40.000000000 +0100 +@@ -0,0 +1,277 @@ ++%!PS-Adobe-3.0 ++%%BoundingBox: 0 0 612 792 ++%%Pages: 1 ++%%LanguageLevel: 1 ++%%DocumentData: Clean7Bit ++%%DocumentSuppliedResources: procset bannerprint/1.0 ++%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman ++%%Creator: Michael Sweet, Easy Software Products ++%%CreationDate: May 10, 2000 ++%%Title: Test Page ++%%EndComments ++%%BeginProlog ++%%BeginResource procset bannerprint 1.1 0 ++% ++% PostScript banner page for the Common UNIX Printing System ("CUPS"). ++% ++% Copyright 1993-2005 by Easy Software Products ++% ++% These coded instructions, statements, and computer programs are the ++% property of Easy Software Products and are protected by Federal ++% copyright law. Distribution and use rights are outlined in the file ++% "LICENSE.txt" which should have been included with this file. If this ++% file is missing or damaged please contact Easy Software Products ++% at: ++% ++% Attn: CUPS Licensing Information ++% Easy Software Products ++% 44141 Airport View Drive, Suite 204 ++% Hollywood, Maryland 20636 USA ++% ++% Voice: (301) 373-9600 ++% EMail: cups-info@cups.org ++% WWW: http://www.cups.org ++% ++/CENTER { % Draw centered text ++ % (name) CENTER - ++ dup stringwidth pop % Get the width of the string ++ 0.5 mul neg 0 rmoveto % Shift left 1/2 of the distance ++ show % Show the string ++} bind def ++/RIGHT { % Draw right-justified text ++ % (name) RIGHT - ++ dup stringwidth pop % Get the width of the string ++ neg 0 rmoveto % Shift left the entire distance ++ show % Show the string ++} bind def ++/NUMBER { % Draw a number ++ % power n NUMBER - ++ 1 index 1 eq { % power == 1? ++ round cvi exch pop % Convert "n" to integer ++ } { ++ 1 index mul round exch div % Truncate extra decimal places ++ } ifelse ++ 100 string cvs show % Convert to a string and show it... ++} bind def ++/CUPSLOGO { % Draw the CUPS logo ++ % height CUPSLOGO ++ % Start with a big C... ++ /Helvetica findfont 1 index scalefont setfont ++ 0 setgray ++ 0 0 moveto ++ (C) show ++ ++ % Then "UNIX Printing System" much smaller... ++ /Helvetica-Bold findfont 1 index 9 div scalefont setfont ++ 0.25 mul ++ dup dup 2.0 mul moveto ++ (UNIX) show ++ dup dup 1.6 mul moveto ++ (Printing) show ++ dup 1.2 mul moveto ++ (System) show ++} bind def ++/ESPLOGO { % Draw the ESP logo ++ % height ESPLOGO ++ % Compute the size of the logo... ++ 0 0 ++ 2 index 1.5 mul 3 index ++ ++ % Do the "metallic" fill from 10% black to 40% black... ++ 1 -0.001 0 { ++ dup % loopval ++ -0.15 mul % loopval * -0.15 ++ 0.9 add % 0.9 - loopval * 0.15 ++ setgray % set gray shade ++ ++ 0 % x ++ 1 index neg % loopval ++ 1 add % 1 - loopval ++ 3 index % height ++ mul % height * (1 - loopval) ++ moveto % starting point ++ ++ dup % loopval ++ 3 index % width ++ mul % loopval * width ++ 2 index % height ++ lineto % Next point ++ ++ 0 % x ++ 2 index % height ++ lineto % Next point ++ ++ closepath ++ fill ++ ++ dup % loopval ++ 0.15 mul % loopval * 0.15 ++ 0.6 add % 0.6 + loopval * 0.15 ++ setgray ++ ++ dup % loopval ++ neg 1 add % 1 - loopval ++ 3 index % width ++ mul % (1 - loopval) * width ++ 0 % y ++ moveto % Starting point ++ ++ 2 index % width ++ exch % loopval ++ 2 index % height ++ mul % loopval * height ++ lineto % Next point ++ ++ 1 index % width ++ 0 % y ++ lineto % Next point ++ ++ closepath ++ fill ++ } for ++ ++ 0 setgray rectstroke ++ ++ /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont ++ dup 40 div ++ ++ dup 4 mul 1 index 25 mul moveto (E) show ++ dup 10 mul 1 index 15 mul moveto (S) show ++ dup 16 mul 1 index 5 mul moveto (P) show ++ ++ /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont ++ dup 14 mul 1 index 29 mul moveto (asy) show ++ dup 20 mul 1 index 19 mul moveto (oftware) show ++ dup 26 mul 1 index 9 mul moveto (roducts) show ++ ++ pop ++} bind def ++%%EndResource ++%%EndProlog ++%%Page: 1 1 ++gsave ++ ++ % Determine the imageable area and device resolution... ++ initclip newpath clippath pathbbox % Get bounding rectangle ++ 72 div /pageTop exch def % Get top margin in inches ++ 72 div /pageRight exch def % Get right margin in inches ++ 72 div /pageBottom exch def % Get bottom margin in inches ++ 72 div /pageLeft exch def % Get left margin in inches ++ ++ /pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft ++ /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom ++ ++ /boxWidth % width of text box ++ pageWidth pageHeight lt ++ { pageWidth 54 mul } ++ { pageHeight 42 mul } ++ ifelse def ++ ++ newpath % Clear bounding path ++ ++ % Create fonts... ++ /bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold ++ pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33) ++ ++ /mediumFont /Helvetica findfont % mediumFont = Helvetica ++ pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5) ++ ++ % Offset page to account for lower-left margin... ++ pageLeft 72 mul ++ pageBottom 72 mul ++ translate ++ ++ % Draw the label at the top and bottom... ++ 0 setgray % Color ++ ++ pageWidth 36 mul % Center of page ++ pageHeight 72 mul % Top of page ++ pageWidth -7 mul add % - 2 lines ++ moveto % Position text ++ bigFont setfont % Font ++ ({mls-label}) CENTER % Show text centered ++ ++ pageWidth 36 mul % Center of page ++ pageHeight 6 mul % Bottom of page ++ moveto % Position text ++ bigFont setfont % Font ++ ({mls-label}) CENTER % Show text centered ++ ++ % Job information box... ++ pageWidth 36 mul 9 add % x = pageWidth * 1/2 * 72 + 9 ++ boxWidth 0.5 mul sub % x-= 1/2 box width ++ pageHeight 30 mul 9 sub % y = pageHeight * 1/2 * 72 - 9 ++ boxWidth % w = box width ++ pageHeight 14 mul % h = pageHeight * 1/2 * 72 ++ 0.5 setgray rectfill % Draw a shadow ++ ++ pageWidth 36 mul % x = pageWidth * 1/2 * 72 ++ boxWidth 0.5 mul sub % x-= 1/2 box width ++ pageHeight 30 mul % y = pageHeight * 1/4 * 72 ++ boxWidth % w = box width ++ pageHeight 14 mul % h = pageHeight * 1/2 * 72 ++ ++ 4 copy 1 setgray rectfill % Clear the box to white ++ 0 setgray rectstroke % Draw a black box around it... ++ ++ % Job information text... ++ mediumFont setfont % Medium sized font ++ ++ pageWidth 36 mul % x = pageWidth * 1/2 * 72 ++ pageHeight 36 mul % y = pageHeight * 1/2 * 72 ++ pageHeight 5 mul add % y += 2 lines ++ 2 copy % Copy X & Y ++ moveto ++ (Job ID: ) RIGHT ++ moveto ++ ({printer-name}-{job-id}) show ++ ++ pageWidth 36 mul % x = pageWidth * 1/2 * 72 ++ pageHeight 36 mul % y = pageHeight * 1/2 * 72 ++ pageHeight 2 mul add % y += 1 line ++ 2 copy % Copy X & Y ++ moveto ++ (Title: ) RIGHT ++ moveto ++ ({job-name}) show ++ ++ pageWidth 36 mul % x = pageWidth * 1/2 * 72 ++ pageHeight 36 mul % y = pageHeight * 1/2 * 72 ++ pageHeight -1 mul add % y -= 1 line ++ 2 copy % Copy X & Y ++ moveto ++ (Requesting User: ) RIGHT ++ moveto ++ ({job-originating-user-name}) show ++ ++ pageWidth 36 mul % x = pageWidth * 1/2 * 72 ++ pageHeight 36 mul % y = pageHeight * 1/2 * 72 ++ pageHeight -4 mul add % y -= 2 lines ++ 2 copy % Copy X & Y ++ moveto ++ (Billing Info: ) RIGHT ++ moveto ++ ({?job-billing}) show ++ ++ % Then the CUPS logo.... ++ gsave ++ pageWidth 4 mul ++ pageWidth 6 mul ++ translate ++ pageWidth 9 mul CUPSLOGO ++ grestore ++ ++ % And the ESP logo.... ++ gsave ++ pageWidth 59 mul ++ pageWidth 6 mul ++ translate ++ pageWidth 6 mul ESPLOGO ++ grestore ++% Show the page... ++grestore ++showpage ++% ++% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $". ++% ++%%EOF +--- cups-1.2.2/data/Makefile.lspp 2006-03-19 03:23:34.000000000 +0000 ++++ cups-1.2.2/data/Makefile 2006-07-21 12:42:40.000000000 +0100 +@@ -34,7 +34,10 @@ + secret \ + standard \ + topsecret \ +- unclassified ++ unclassified \ ++ selinux \ ++ mls \ ++ te + + CHARMAPS = \ + euc-cn.txt \ +--- cups-1.2.2/config.h.in.lspp 2006-06-05 19:42:53.000000000 +0100 ++++ cups-1.2.2/config.h.in 2006-07-21 12:42:40.000000000 +0100 +@@ -443,6 +443,13 @@ + #undef HAVE_APPLETALK_AT_PROTO_H + + ++/* ++ * Are we trying to meet LSPP requirements? ++ */ ++ ++#undef WITH_LSPP ++ ++ + #endif /* !_CUPS_CONFIG_H_ */ + + /* +--- cups-1.2.2/scheduler/printers.c.lspp 2006-07-21 12:42:35.000000000 +0100 ++++ cups-1.2.2/scheduler/printers.c 2006-07-21 12:42:40.000000000 +0100 +@@ -57,6 +57,8 @@ + * printing desktop tools. + */ + ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ + /* + * Include necessary headers... + */ +@@ -79,6 +81,9 @@ + static void write_irix_state(cupsd_printer_t *p); + #endif /* __sgi */ + ++#ifdef WITH_LSPP ++# include ++#endif /* WITH_LSPP */ + + /* + * 'cupsdAddPrinter()' - Add a printer to the system. +@@ -1472,6 +1477,9 @@ + "two-sided-long-edge", + "two-sided-short-edge" + }; ++#ifdef WITH_LSPP ++ char *audit_message; /* Audit message string */ ++#endif /* WITH_LSPP */ + + + DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, +@@ -1578,6 +1586,14 @@ + attr->values[1].string.text = _cupsStrAlloc(Classification ? + Classification : p->job_sheets[1]); + } ++#ifdef WITH_LSPP ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "[Config] printer=%s uri=%s banners set to %s %s", ++ p->name, p->device_uri, p->job_sheets[0], p->job_sheets[1]); ++ audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message, ++ ServerName, NULL, NULL, 1); ++ free(audit_message); ++#endif /* WITH_LSPP */ + } + + printer_type = p->type; +--- cups-1.2.2/scheduler/job.c.lspp 2006-07-21 12:42:35.000000000 +0100 ++++ cups-1.2.2/scheduler/job.c 2006-07-21 12:42:40.000000000 +0100 +@@ -68,6 +68,9 @@ + * unload_job() - Unload a job from memory. + */ + ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ + /* + * Include necessary headers... + */ +@@ -77,6 +80,11 @@ + #include + #include + ++#ifdef WITH_LSPP ++#include ++#include ++#include ++#endif /* WITH_LSPP */ + + /* + * Local globals... +@@ -985,6 +993,23 @@ + cupsdSetString(&job->dest, dest); + } + ++#ifdef WITH_LSPP ++ if ((attr = ippFindAttribute(job->attrs, "security-context", IPP_TAG_NAME)) != NULL) ++ cupsdSetString(&job->scon, attr->values[0].string.text); ++ else if (is_lspp_config()) ++ { ++ /* ++ * There was no security context so delete the job ++ */ ++ cupsdLogMessage(CUPSD_LOG_ERROR, "LoadAllJobs: Missing or bad security-context attribute in control file \"%s\"!", ++ jobfile); ++ ippDelete(job->attrs); ++ job->attrs = NULL; ++ unlink(jobfile); ++ return; ++ } ++#endif /* WITH_LSPP */ ++ + job->sheets = ippFindAttribute(job->attrs, "job-media-sheets-completed", + IPP_TAG_INTEGER); + job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME); +@@ -2428,6 +2453,17 @@ + int remote_job; /* Remote print job? */ + static char *options = NULL;/* Full list of options */ + static int optlength = 0; /* Length of option buffer */ ++#ifdef WITH_LSPP ++ int acstatus = 0; /* return value of the access check */ ++ pid_t acpid = -1; /* pid for the access check */ ++ const char *mls_label = NULL; /* SL to put in classification env var */ ++ char *audit_message = NULL; /* Audit message string */ ++ char *printerfile = NULL; /* Device file pointed to by the printer */ ++ char *acargv[3]; /* Command line args */ ++ char buffer[1024] = {0}; /* argv[0] buffer */ ++ char *acenvp[MAX_ENV]; /* Environment */ ++ context_t job_context; /* SELinux context of the job */ ++#endif /* WITH_LSPP */ + + + cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job: id = %d, file = %d/%d", +@@ -2709,6 +2745,76 @@ + + cupsdLogMessage(CUPSD_LOG_DEBUG, "banner_page = %d", banner_page); + ++#ifdef WITH_LSPP ++ if (is_lspp_config()) ++ { ++ /* ++ * Perform an access check before printing, but only if the printer starts with /dev/ ++ */ ++ printerfile = strdup(printer->device_uri); ++ if ((printerfile = strrchr(printer->device_uri, '=')) == NULL) ++ { ++ if ((printerfile = strrchr(printer->device_uri, ':')) == NULL) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to determine printer device file"); ++ cupsdCancelJob(job, 0); ++ return; ++ } ++ } ++ ++ printerfile++; ++ if (strncmp(printerfile, "/dev/", 5) == 0) ++ { ++ if (setexeccon(job->scon) != 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to setexeccon to %s", job->scon); ++ cupsdCancelJob(job, 0); ++ return; ++ } ++ ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "StartJob: Attempting to check access on printer device %s", ++ printerfile); ++ ++ snprintf(buffer, sizeof(buffer), "%s/daemon/access", ServerBin); ++ acargv[0] = "access"; ++ acargv[1] = printerfile; ++ acargv[2] = NULL; ++ ++ cupsdLoadEnv(acenvp, (int)(sizeof(acenvp) / sizeof(acenvp[0]))); ++ ++ if (!cupsdStartProcess(buffer, acargv, acenvp, -1, -1, -1, -1, 0, &acpid)) ++ { ++ waitpid(acpid, &acstatus, 0); ++ if (WIFEXITED(acstatus)) ++ { ++ if (WEXITSTATUS(acstatus) != 0) ++ { ++ /* ++ * The access check failed, so cancel the job and send an audit message ++ */ ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s obj=%s cancelled," ++ " unable to access printer=%s", ++ job->id, job->auid, job->username, job->scon, printer->name); ++ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, ++ ServerName, NULL, NULL, 0); ++ free(audit_message); ++ ++ cupsdCancelJob(job, 0); ++ ++ return; ++ } ++ else ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "StartJob: access check succeeded (returned %d)", ++ WEXITSTATUS(acstatus)); ++ } ++ } ++ } ++ } ++ } ++#endif /* WITH_LSPP */ ++ + /* + * Building the options string is harder than it needs to be, but + * for the moment we need to pass strings for command-line args and +@@ -3026,6 +3132,41 @@ + envp[envc ++] = final_content_type; + } + ++#ifdef WITH_LSPP ++ if (is_lspp_config()) ++ { ++ if (job->scon == NULL) ++ { ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s", ++ job->id, job->auid, job->username, printer->name); ++ audit_log_user_message(AuditLog, AUDIT_USER_UNLABELED_EXPORT, audit_message, ++ ServerName, NULL, NULL, 1); ++ free(audit_message); ++ } ++ else ++ { ++ job_context = context_new(job->scon); ++ if (strcasecmp(Classification, MLS_CONFIG) == 0) ++ mls_label = context_range_get(job_context); ++ else if (strcasecmp(Classification, TE_CONFIG) == 0) ++ mls_label = context_type_get(job_context); ++ else // default is SELinux which means print the whole context ++ mls_label = context_str(job_context); ++ snprintf(classification, sizeof(classification), "CLASSIFICATION=%s", ++ mls_label); ++ envp[envc ++] = classification; ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s obj=%s", ++ job->id, job->auid, job->username, printer->name, job->scon); ++ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, ++ ServerName, NULL, NULL, 1); ++ context_free(job_context); ++ free(audit_message); ++ } ++ } ++ else ++#endif /* WITH_LSPP */ + if (Classification && !banner_page) + { + if ((attr = ippFindAttribute(job->attrs, "job-sheets", +--- cups-1.2.2/scheduler/client.h.lspp 2006-03-18 03:05:12.000000000 +0000 ++++ cups-1.2.2/scheduler/client.h 2006-07-21 12:42:40.000000000 +0100 +@@ -22,6 +22,13 @@ + * WWW: http://www.cups.org + */ + ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ ++#ifdef WITH_LSPP ++#include ++#endif /* WITH_LSPP */ ++ + /* + * HTTP client structure... + */ +@@ -55,6 +62,10 @@ + http_addr_t clientaddr; /* Client address */ + char servername[256];/* Server name for connection */ + int serverport; /* Server port for connection */ ++#ifdef WITH_LSPP ++ security_context_t scon; /* Security context of connection */ ++ uid_t auid; /* Audit loginuid of the client */ ++#endif /* WITH_LSPP */ + }; + + #define HTTP(con) &((con)->http) +@@ -118,6 +129,9 @@ + extern void cupsdStopListening(void); + extern void cupsdUpdateCGI(void); + extern int cupsdWriteClient(cupsd_client_t *con); ++#ifdef WITH_LSPP ++extern uid_t client_pid_to_auid(pid_t clipid); ++#endif /* WITH_LSPP */ + + + /* +--- cups-1.2.2/scheduler/main.c.lspp 2006-07-21 12:42:35.000000000 +0100 ++++ cups-1.2.2/scheduler/main.c 2006-07-21 12:42:40.000000000 +0100 +@@ -47,6 +47,8 @@ + * usage() - Show scheduler usage. + */ + ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ + /* + * Include necessary headers... + */ +@@ -69,6 +71,9 @@ + # include + #endif /* HAVE_NOTIFY_H */ + ++#ifdef WITH_LSPP ++# include ++#endif /* WITH_LSPP */ + + /* + * Local functions... +@@ -351,6 +356,17 @@ + #endif /* DEBUG */ + } + ++#ifdef WITH_LSPP ++ if ((AuditLog = audit_open()) < 0 ) ++ { ++ if (is_lspp_config()) ++ { ++ fprintf(stderr, "cupsd: unable to start auditing"); ++ return -1; ++ } ++ } ++#endif /* WITH_LSPP */ ++ + /* + * Set the timezone info... + */ +@@ -1115,6 +1131,10 @@ + free(input); + free(output); + ++#ifdef WITH_LSPP ++ audit_close(AuditLog); ++#endif /* WITH_LSPP */ ++ + return (!stop_scheduler); + } + +--- cups-1.2.2/scheduler/job.h.lspp 2006-04-14 19:17:18.000000000 +0100 ++++ cups-1.2.2/scheduler/job.h 2006-07-21 12:42:40.000000000 +0100 +@@ -22,6 +22,13 @@ + * WWW: http://www.cups.org + */ + ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ ++#ifdef WITH_LSPP ++#include ++#endif /* WITH_LSPP */ ++ + /* + * Job request structure... + */ +@@ -55,6 +62,10 @@ + int status; /* Status code from filters */ + cupsd_printer_t *printer; /* Printer this job is assigned to */ + int tries; /* Number of tries for this job */ ++#ifdef WITH_LSPP ++ security_context_t scon; /* Security context of job */ ++ uid_t auid; /* Audit loginuid for this job */ ++#endif /* WITH_LSPP */ + } cupsd_job_t; + + +--- cups-1.2.2/scheduler/ipp.c.lspp 2006-07-21 12:42:35.000000000 +0100 ++++ cups-1.2.2/scheduler/ipp.c 2006-07-21 12:42:40.000000000 +0100 +@@ -96,6 +96,9 @@ + * validate_user() - Validate the user for the request. + */ + ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ + /* + * Include necessary headers... + */ +@@ -106,6 +109,14 @@ + # include + #endif /* HAVE_LIBPAPER */ + ++#ifdef WITH_LSPP ++#include ++#include ++#include ++#include ++#include ++#include ++#endif /* WITH_LSPP */ + + /* + * PPD default choice structure... +@@ -1166,6 +1177,15 @@ + int kbytes; /* Size of print file */ + int i; /* Looping var */ + int lowerpagerange; /* Page range bound */ ++#ifdef WITH_LSPP ++ char *argv[3]; /* Command line args */ ++ char *envp[MAX_ENV]; /* Environment */ ++ char *audit_message; /* Audit message string */ ++ char buffer[1024] = {0}; /* argv[0] buffer */ ++ int acstatus; /* return value of the access check */ ++ pid_t acpid; /* pid for the access check */ ++ char *printerfile; /* device file pointed to by the printer */ ++#endif /* WITH_LSPP */ + + + cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %s)", con, +@@ -1342,6 +1362,97 @@ + return (NULL); + } + ++#ifdef WITH_LSPP ++ if (is_lspp_config()) ++ { ++ if (!con->scon || strlen(con->scon) == 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "add_job: missing classification for connection \'%s\'!", dest); ++ send_ipp_status(con, IPP_INTERNAL_ERROR, _("Missing required secuirty attributes.")); ++ return (NULL); ++ } ++ else ++ { ++ /* ++ * duplicate the security context and auid of the connection into the job structure ++ */ ++ job->scon = strdup(con->scon); ++ job->auid = con->auid; ++ ++ /* ++ * add the security context to the request so that on a restart the security ++ * attributes will be able to be restored ++ */ ++ ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "security-context", ++ NULL, job->scon); ++ } ++ ++ /* ++ * Perform an access check so that if the user gets feedback at enqueue time ++ */ ++ ++ printerfile = strdup(printer->device_uri); ++ if ((printerfile = strrchr(printer->device_uri, '=')) == NULL) ++ { ++ if ((printerfile = strrchr(printer->device_uri, ':')) == NULL) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "add_job: Unable to determine printer device file"); ++ send_ipp_status(con, IPP_INTERNAL_ERROR, _("Unable to perform printer access check")); ++ return (NULL); ++ } ++ } ++ ++ printerfile++; ++ if (strncmp(printerfile, "/dev/", 5) == 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "add_job: Attempting an access check on printer device %s", ++ printerfile); ++ ++ if (setexeccon(job->scon) != 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "add_job: Unable to setexeccon to %s", job->scon); ++ send_ipp_status(con, IPP_INTERNAL_ERROR, _("Internal SELinux error")); ++ return (NULL); ++ } ++ ++ snprintf(buffer, sizeof(buffer), "%s/daemon/access", ServerBin); ++ argv[0] = "access"; ++ argv[1] = printerfile; ++ argv[2] = NULL; ++ ++ cupsdLoadEnv(envp, (int)(sizeof(envp) / sizeof(envp[0]))); ++ ++ if (!cupsdStartProcess(buffer, argv, envp, -1, -1, -1, -1, 0, &acpid)) ++ { ++ waitpid(acpid, &acstatus, 0); ++ if (WIFEXITED(acstatus)) ++ { ++ if (WEXITSTATUS(acstatus) != 0) ++ { ++ /* ++ * The access check failed, so cancel the job and send an audit message ++ */ ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s obj=%s refused, unable to access printer=%s", ++ job->id, con->auid, con->username, con->scon, printer->name); ++ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, ++ ServerName, NULL, NULL, 0); ++ free(audit_message); ++ ++ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("SELinux prohibits access to the printer")); ++ return (NULL); ++ } ++ else ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "add_job: access check succeeded (returned %d)", ++ WEXITSTATUS(acstatus)); ++ } ++ } ++ } ++ } ++ } ++#endif /* WITH_LSPP */ ++ + job->dtype = dtype; + job->attrs = con->request; + con->request = NULL; +@@ -1553,6 +1664,19 @@ + + if (ClassifyOverride) + { ++#ifdef WITH_LSPP ++ /* ++ * The configuration allows for user's to Override the banner, so let them ++ */ ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "job=%d user supplied classification \"%s\" \"%s\"", ++ job->id, ++ (attr->values[0].string.text)?attr->values[0].string.text:"none", ++ (attr->values[1].string.text)?attr->values[1].string.text:"none"); ++ audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message, ++ ServerName, NULL, NULL, 1); ++ free(audit_message); ++#endif /* WITH_LSPP */ + if (!strcmp(attr->values[0].string.text, "none") && + (attr->num_values == 1 || + !strcmp(attr->values[1].string.text, "none"))) +@@ -3501,6 +3625,11 @@ + char attrname[255], /* Name of attribute */ + *s; /* Pointer into name */ + ipp_attribute_t *attr; /* Attribute */ ++#ifdef WITH_LSPP ++ const char *mls_label = NULL; /* SL of print job */ ++ context_t job_context; /* SELinux context of the job */ ++#endif /* WITH_LSPP */ ++ + + + cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner(%p[%d], %p[%d], %s)", +@@ -3628,6 +3757,24 @@ + else + s = attrname; + ++#ifdef WITH_LSPP ++ if (strcmp(s, "mls-label") == 0) ++ { ++ if (con->scon != NULL && strcmp(con->scon, UNKNOWN_SL) != 0) ++ { ++ job_context = context_new(con->scon); ++ if (strcasecmp(name, MLS_CONFIG) == 0) ++ mls_label = context_range_get(job_context); ++ else if (strcasecmp(name, TE_CONFIG) == 0) ++ mls_label = context_type_get(job_context); ++ else // default to using the whole context string ++ mls_label = context_str(job_context); ++ cupsFilePuts(out, mls_label); ++ context_free(job_context); ++ } ++ continue; ++ } ++#endif /* WITH_LSPP */ + if (!strcmp(s, "printer-name")) + { + cupsFilePuts(out, job->dest); +@@ -5353,6 +5500,15 @@ + cupsd_printer_t *printer; /* Printer */ + cups_array_t *list; /* Which job list... */ + cups_array_t *ra; /* Requested attributes array */ ++#ifdef WITH_LSPP ++ int selinuxcheck; /* perform the SELinux access check? */ ++ security_id_t clisid; /* SELinux SID of the client */ ++ security_id_t jobsid; /* SELinux SID of the job */ ++ struct av_decision avd; /* SELinux decision stuct */ ++ struct avc_entry_ref avcref; /* AVC entry cache pointer */ ++ security_class_t tclass; /* SELinux security class */ ++ access_vector_t avr; /* SELinux access being queried */ ++#endif /* WITH_LSPP */ + + + cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs(%p[%d], %s)", con, con->http.fd, +@@ -5470,6 +5626,40 @@ + + ra = create_requested_array(con->request); + ++#ifdef WITH_LSPP ++ /* ++ * Determine outside the loop if we are concerned about SELinux ++ */ ++ selinuxcheck = is_lspp_config(); ++ if (selinuxcheck) ++ { ++ selinuxcheck = security_getenforce(); ++ if (selinuxcheck == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "get_jobs: unable to determine SELinux enforcement"); ++ send_ipp_status(con, IPP_INTERNAL_ERROR, _("Internal SELinux error (getenforce).")); ++ return; ++ } ++ if (avc_init("cups", NULL, NULL, NULL, NULL) < 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "get_jobs: unable avc_init"); ++ send_ipp_status(con, IPP_INTERNAL_ERROR, _("Internal SELinux error (avc_init).")); ++ return; ++ } ++ if (avc_context_to_sid(con->scon, &clisid) != 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "get_jobs: unable to convert %s to SELinux sid", con->scon); ++ send_ipp_status(con, IPP_INTERNAL_ERROR, _("Internal SELinux error (avc_context_to_sid).")); ++ return; ++ } ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "get_jobs: client context %s", con->scon); ++ ++ avr = FILE__READ; ++ tclass = SECCLASS_FILE; ++ } ++#endif /* WITH_LSPP */ ++ ++ + /* + * OK, build a list of jobs for this printer... + */ +@@ -5507,6 +5697,19 @@ + if (count > 0) + ippAddSeparator(con->response); + ++#ifdef WITH_LSPP ++ if (selinuxcheck) ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "get_jobs: job context %s", job->scon); ++ ++ avc_context_to_sid(job->scon, &jobsid); ++ avc_entry_ref_init(&avcref); ++ ++ if (avc_has_perm_noaudit(clisid, jobsid, tclass, avr, &avcref, &avd) != 0) ++ continue; ++ } ++#endif /* WITH_LSPP */ ++ + count ++; + + cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count); +@@ -7935,12 +8138,22 @@ + * See if we need to add the ending sheet... + */ + ++#ifdef WITH_LSPP ++ if (printer && ++ ( is_lspp_config() || ++ !(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) ) && ++ (attr = ippFindAttribute(job->attrs, "job-sheets", ++ IPP_TAG_ZERO)) != NULL && ++ attr->num_values > 1) ++ { ++#else /* !WITH_LSPP */ + if (printer && + !(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT)) && + (attr = ippFindAttribute(job->attrs, "job-sheets", + IPP_TAG_ZERO)) != NULL && + attr->num_values > 1) + { ++#endif /* WITH_LSPP */ + /* + * Yes... + */ +--- cups-1.2.2/scheduler/conf.c.lspp 2006-07-21 12:42:35.000000000 +0100 ++++ cups-1.2.2/scheduler/conf.c 2006-07-21 12:42:40.000000000 +0100 +@@ -35,6 +35,7 @@ + * read_configuration() - Read a configuration file. + * read_location() - Read a definition. + * read_policy() - Read a definition. ++ * is_lspp_config() - Is the system configured for LSPP + */ + + /* +@@ -60,6 +61,9 @@ + # define INADDR_NONE 0xffffffff + #endif /* !INADDR_NONE */ + ++#ifdef WITH_LSPP ++# include ++#endif /* WITH_LSPP */ + + /* + * Configuration variable structure... +@@ -161,6 +165,9 @@ + { "ServerKey", &ServerKey, CUPSD_VARTYPE_STRING }, + # endif /* HAVE_LIBSSL || HAVE_GNUTLS */ + #endif /* HAVE_SSL */ ++#ifdef WITH_LSPP ++ { "AuditLog", &AuditLog, CUPSD_VARTYPE_INTEGER }, ++#endif /* WITH_LSPP */ + #ifdef HAVE_LAUNCHD + { "LaunchdTimeout", &LaunchdTimeout, CUPSD_VARTYPE_INTEGER }, + { "LaunchdConf", &LaunchdConf, CUPSD_VARTYPE_STRING }, +@@ -223,6 +230,9 @@ + *old_requestroot; /* Old RequestRoot */ + const char *tmpdir; /* TMPDIR environment variable */ + struct stat tmpinfo; /* Temporary directory info */ ++#ifdef WITH_LSPP ++ char *audit_message; /* Audit message string */ ++#endif /* WITH_LSPP */ + + + /* +@@ -377,6 +387,16 @@ + } + } + ++#ifdef WITH_LSPP ++ /* ++ * ClassifyOverride is set during read_configuration, if its on, report it now ++ */ ++ if (ClassifyOverride) ++ audit_log_user_message(AuditLog, AUDIT_USYS_CONFIG, ++ "[Config] ClassifyOverride=enabled Users can override print banners", ++ ServerName, NULL, NULL, 1); ++#endif /* WITH_LSPP */ ++ + /* + * Numeric options... + */ +@@ -779,7 +799,16 @@ + cupsdClearString(&Classification); + + if (Classification) ++ { + cupsdLogMessage(CUPSD_LOG_INFO, "Security set to \"%s\"", Classification); ++#ifdef WITH_LSPP ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "[Config] Security level=%s", Classification); ++ audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message, ++ ServerName, NULL, NULL, 1); ++ free(audit_message); ++#endif /* WITH_LSPP */ ++ } + + /* + * Update the MaxClientsPerHost value, as needed... +@@ -2233,7 +2262,6 @@ + + cupsd_dirsvc_addr_t *dira; /* New browse address array */ + +- + if (NumBrowsers == 0) + dira = malloc(sizeof(cupsd_dirsvc_addr_t)); + else +@@ -3286,6 +3314,18 @@ + return (0); + } + ++#ifdef WITH_LSPP ++int is_lspp_config() ++{ ++ if (Classification != NULL) ++ return ((strcasecmp(Classification, MLS_CONFIG) == 0) ++ || (strcasecmp(Classification, TE_CONFIG) == 0) ++ || (strcasecmp(Classification, SELINUX_CONFIG) == 0)); ++ else ++ return 0; ++} ++#endif /* WITH_LSPP */ ++ + + /* + * End of "$Id: conf.c 5736 2006-07-13 19:59:36Z mike $". +--- /dev/null 2006-07-21 09:48:40.571484750 +0100 ++++ cups-1.2.2/scheduler/access.c 2006-07-21 12:42:40.000000000 +0100 +@@ -0,0 +1,56 @@ ++/* ++ * Copyright (C) Hewlett-Packard Development Company, L.P., 2006 ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ++ * the GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ * Contents: ++ * ++ * main() - Main entry for the access checker. ++ */ ++ ++#include ++#include ++#include ++ ++int main(int argc, char *argv[]) { ++ int status = -1; ++ char filename[FILENAME_MAX+1] = {0}; ++ ++ if (argc < 2) ++ { ++ printf("Check for access to which file? "); ++ scanf("%s", (char *)&filename); ++ } ++ else ++ { ++ strncpy(filename, argv[1], FILENAME_MAX); ++ } ++ ++ status = access(filename, R_OK|W_OK); ++ ++ if (argc < 2) ++ { ++ /* ++ * Assume the user would like to hear the answer on the terminal ++ * since the filename was received interactively. ++ */ ++ if (status != 0) ++ printf("Unable to access that file.\n"); ++ else ++ printf("Access Granted\n"); ++ } ++ ++ return status; ++} +--- cups-1.2.2/scheduler/Makefile.lspp 2006-07-13 20:59:36.000000000 +0100 ++++ cups-1.2.2/scheduler/Makefile 2006-07-21 12:42:40.000000000 +0100 +@@ -54,6 +54,7 @@ + OBJS = \ + $(CUPSDOBJS) \ + $(MIMEOBJS) \ ++ access.o \ + cups-deviced.o \ + cups-driverd.o \ + cups-lpd.o \ +@@ -63,6 +64,7 @@ + testspeed.o \ + util.o + TARGETS = \ ++ access \ + cupsd \ + cups-deviced \ + cups-driverd \ +@@ -111,7 +113,8 @@ + $(INSTALL_DIR) -m 755 $(SERVERBIN) + echo Creating $(SERVERBIN)/daemon... + $(INSTALL_DIR) -m 755 $(SERVERBIN)/daemon +- echo Installing cups-deviced, cups-driverd, cups-lpd, and cups-polld in $(SERVERBIN)/daemon... ++ echo Installing access cups-deviced, cups-driverd, cups-lpd, and cups-polld in $(SERVERBIN)/daemon... ++ $(INSTALL_BIN) access $(SERVERBIN)/daemon + $(INSTALL_BIN) cups-deviced $(SERVERBIN)/daemon + $(INSTALL_BIN) cups-driverd $(SERVERBIN)/daemon + $(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon +@@ -157,6 +160,7 @@ + + uninstall: all + $(RM) $(SBINDIR)/cupsd ++ $(RM) $(SERVERBIN)/daemon/access + $(RM) $(SERVERBIN)/daemon/cups-deviced + $(RM) $(SERVERBIN)/daemon/cups-driverd + $(RM) $(SERVERBIN)/daemon/cups-lpd +--- cups-1.2.2/scheduler/conf.h.lspp 2006-07-21 12:42:35.000000000 +0100 ++++ cups-1.2.2/scheduler/conf.h 2006-07-21 12:42:40.000000000 +0100 +@@ -182,7 +182,6 @@ + /* Number of MIME types */ + VAR const char **MimeTypes VALUE(NULL); + /* Array of MIME types */ +- + #ifdef HAVE_SSL + VAR char *ServerCertificate VALUE(NULL); + /* Server certificate file */ +@@ -191,6 +190,10 @@ + /* Server key file */ + # endif /* HAVE_LIBSSL || HAVE_GNUTLS */ + #endif /* HAVE_SSL */ ++#ifdef WITH_LSPP ++VAR int AuditLog VALUE(-1); ++ /* File descriptor for audit */ ++#endif /* WITH_LSPP */ + + #ifdef HAVE_LAUNCHD + VAR int LaunchdTimeout VALUE(DEFAULT_TIMEOUT); +@@ -213,6 +216,9 @@ + ; + extern int cupsdLogPage(cupsd_job_t *job, const char *page); + ++#ifdef WITH_LSPP ++extern int is_lspp_config(void); ++#endif /* WITH_LSPP */ + + /* + * End of "$Id: conf.h 5696 2006-06-26 18:34:20Z mike $". +--- cups-1.2.2/scheduler/client.c.lspp 2006-07-21 12:42:35.000000000 +0100 ++++ cups-1.2.2/scheduler/client.c 2006-07-21 12:43:29.000000000 +0100 +@@ -43,12 +43,17 @@ + * make_certificate() - Make a self-signed SSL/TLS certificate. + * pipe_command() - Pipe the output of a command to the remote client. + * write_file() - Send a file via HTTP. ++ * client_pid_to_auid() - Get the audit login uid of the client. + */ + ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ + /* + * Include necessary headers... + */ + ++#define _GNU_SOURCE + #include + #include "cupsd.h" + +@@ -64,6 +69,11 @@ + # include + #endif /* HAVE_GNUTLS */ + ++#ifdef WITH_LSPP ++#include ++#include ++#endif /* WITH_LSPP */ ++ + + /* + * Local functions... +@@ -380,6 +390,45 @@ + "cupsdAcceptClient: %d connected to server on %s:%d", + con->http.fd, con->servername, con->serverport); + ++#ifdef WITH_LSPP ++ if (is_lspp_config()) ++ { ++ struct ucred cr; ++ unsigned int cl=sizeof(cr); ++ ++ if (getsockopt(con->http.fd, SOL_SOCKET, SO_PEERCRED, &cr, &cl)==0) { ++ /* ++ * client_pid_to_auid() can be racey ++ * In this case the pid is based on a socket connected to the client ++ */ ++ con->auid = client_pid_to_auid(cr.pid); ++ cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: peer's pid=%d, uid=%d, gid=%d, auid=%d", ++ cr.pid, cr.uid, cr.gid, con->auid); ++ } else { ++ close(con->http.fd); ++ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getsockopt() failed"); ++ return (cupsdCloseClient(con)); ++ } ++ ++ /* ++ * get the context of the peer connection ++ */ ++ if (getpeercon(con->http.fd, &con->scon)) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getpeercon() failed"); ++ cupsdSetString(&con->scon, UNKNOWN_SL); ++ } ++ ++ cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: client context=%s", con->scon); ++ ++ } ++ else ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: skipping getpeercon()"); ++ cupsdSetString(&con->scon, UNKNOWN_SL); ++ } ++#endif /* WITH_LSPP */ ++ + /* + * Using TCP_NODELAY improves responsiveness, especially on systems + * with a slow loopback interface... Since we write large buffers +@@ -3465,7 +3514,6 @@ + time_t curtime; /* Current time */ + int result; /* Result of GNU TLS calls */ + +- + /* + * Create the encryption key... + */ +@@ -3664,6 +3712,49 @@ + #endif /* HAVE_SSL */ + + ++#ifdef WITH_LSPP ++/* ++ * 'client_pid_to_auid()' - Using the client's pid, read /proc and determine the loginuid. ++ */ ++ ++uid_t client_pid_to_auid(pid_t clipid) ++{ ++ uid_t uid; ++ int len, in; ++ char buf[16] = {0}; ++ char fname[32] = {0}; ++ ++ ++ /* ++ * Hopefully this pid is still the one we are interested in. ++ */ ++ snprintf(fname, 32, "/proc/%d/loginuid", clipid); ++ in = open(fname, O_NOFOLLOW|O_RDONLY); ++ ++ if (in < 0) ++ return -1; ++ ++ errno = 0; ++ ++ do { ++ len = read(in, buf, sizeof(buf)); ++ } while (len < 0 && errno == EINTR); ++ ++ close(in); ++ ++ if (len < 0 || len >= sizeof(buf)) ++ return -1; ++ ++ buf[len] = 0; ++ uid = strtol(buf, 0, 10); ++ ++ if (errno != 0) ++ return -1; ++ else ++ return uid; ++} ++#endif /* WITH_LSPP */ ++ + /* + * 'pipe_command()' - Pipe the output of a command to the remote client. + */ +--- cups-1.2.2/cups/cups.h.lspp 2006-03-06 03:39:28.000000000 +0000 ++++ cups-1.2.2/cups/cups.h 2006-07-21 12:42:40.000000000 +0100 +@@ -24,6 +24,8 @@ + * This file is subject to the Apple OS-Developed Software exception. + */ + ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++ + #ifndef _CUPS_CUPS_H_ + # define _CUPS_CUPS_H_ + +@@ -68,6 +70,12 @@ + # define CUPS_DATE_ANY -1 + + ++# ifdef WITH_LSPP ++# define MLS_CONFIG "mls" ++# define TE_CONFIG "te" ++# define SELINUX_CONFIG "SELinux" ++# define UNKNOWN_SL "UNKNOWN SL" ++# endif /* WITH_LSPP */ + /* + * Types and structures... + */ diff --git a/cups.spec b/cups.spec index 1324eef..6898487 100644 --- a/cups.spec +++ b/cups.spec @@ -1,11 +1,12 @@ %define initdir /etc/rc.d/init.d %define use_alternatives 1 +%define lspp 1 %define cups_serverbin %{_exec_prefix}/lib/cups Summary: Common Unix Printing System Name: cups Version: 1.2.2 -Release: 2 +Release: 3 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -37,6 +38,7 @@ Patch14: cups-dest-cache-v2.patch Patch15: cups-maxlogsize.patch Patch16: cups-pid.patch Patch17: cups-relro.patch +Patch100: cups-lspp.patch Epoch: 1 Url: http://www.cups.org/ BuildRoot: %{_tmppath}/%{name}-root @@ -63,6 +65,13 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel +%if %lspp +BuildPrereq: libselinux-devel >= 1.23 +BuildPrereq: audit-libs-devel >= 1.1 +Requires: audit-libs-devel >= 1.1 +Requires: libselinux >= 1.23 +%endif + # -fstack-protector-all requires GCC 4.0.1 BuildRequires: gcc >= 4.0.1 @@ -130,6 +139,11 @@ lpd emulation. %patch15 -p1 -b .maxlogsize %patch16 -p1 -b .pid %patch17 -p1 -b .relro + +%if %lspp +%patch100 -p1 -b .lspp +%endif + perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in aclocal -I config-scripts autoconf @@ -144,6 +158,9 @@ perl -pi -e "s,^.SILENT:,," Makedefs.in export CFLAGS="-DLDAP_DEPRECATED=1" %configure --with-docdir=%{_docdir}/cups-%{version} \ --with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all" \ +%if %lspp + --enable-lspp \ +%endif --with-log-file-perm=0700 --enable-pie # If we got this far, all prerequisite libraries must be here. @@ -341,6 +358,9 @@ rm -rf $RPM_BUILD_ROOT %{cups_serverbin}/backend %{cups_serverbin}/cgi-bin %dir %{cups_serverbin}/daemon +%if %lspp +%{cups_serverbin}/daemon/access +%endif %{cups_serverbin}/daemon/cups-polld %{cups_serverbin}/daemon/cups-deviced %{cups_serverbin}/daemon/cups-driverd @@ -389,7 +409,8 @@ rm -rf $RPM_BUILD_ROOT %{cups_serverbin}/daemon/cups-lpd %changelog -* Fri Jul 21 2006 Tim Waugh +* Fri Jul 21 2006 Tim Waugh 1:1.2.2-3 +- Apply Matt Anderson's LSPP patch. - Renumbered patches. * Thu Jul 20 2006 Tim Waugh 1:1.2.2-2