]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Generate cupsd.conf so that the defaults reflect what has been
authormike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Thu, 24 Jan 2002 18:51:13 +0000 (18:51 +0000)
committermike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Thu, 24 Jan 2002 18:51:13 +0000 (18:51 +0000)
configured...

Add missing structures to SPM.

Fix links in SAM and SPM.

Fix *BSD DSO build stuff.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@2064 7a7537e8-13f0-0310-91df-b6672ffda945

Makefile
conf/cupsd.conf.in [moved from conf/cupsd.conf with 94% similarity]
config-scripts/cups-directories.m4
config-scripts/cups-sharedlibs.m4
configure.in
doc/sam.html
doc/sam.pdf
doc/sam.shtml
doc/spm.html
doc/spm.pdf
doc/spm.shtml

index dd3c466dc92dc5cbfe20e2d1ad16e18830565511..c561c4f95b20ea59d73c324d417b53d494c94194 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.40 2002/01/02 17:58:33 mike Exp $"
+# "$Id: Makefile,v 1.41 2002/01/24 18:51:04 mike Exp $"
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -36,6 +36,7 @@ DIRS  =       cups backend berkeley cgi-bin filter man pdftops pstoraster \
 #
 
 all:
+       chmod +x cups-config
        for dir in $(DIRS); do\
                echo Making all in $$dir... ;\
                (cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\
@@ -143,5 +144,5 @@ tardist:
        epm $(EPMFLAGS) -f tardist cups
 
 #
-# End of "$Id: Makefile,v 1.40 2002/01/02 17:58:33 mike Exp $".
+# End of "$Id: Makefile,v 1.41 2002/01/24 18:51:04 mike Exp $".
 #
similarity index 94%
rename from conf/cupsd.conf
rename to conf/cupsd.conf.in
index 21b3c02ae300082a3beae5948ebae8a16d0dd692..25a1f0a19ffa24b7e240974c2936bd988be5b57c 100644 (file)
@@ -1,5 +1,5 @@
 #
-# "$Id: cupsd.conf,v 1.38 2002/01/23 17:25:33 mike Exp $"
+# "$Id: cupsd.conf.in,v 1.1 2002/01/24 18:51:04 mike Exp $"
 #
 #   Sample configuration file for the Common UNIX Printing System (CUPS)
 #   scheduler.
 #
 # AccessLog: the access log file; if this does not start with a leading /
 # then it is assumed to be relative to ServerRoot.  By default set to
-# "/var/log/cups/access_log"
+# "@CUPS_LOGDIR@/access_log"
 #
 # You can also use the special name "syslog" to send the output to the
 # syslog file or daemon.
 #
 
-#AccessLog /var/log/cups/access_log
+#AccessLog @CUPS_LOGDIR@/access_log
 
 #
 # Classification: the classification level of the server.  If set, this
 
 #
 # DocumentRoot: the root directory for HTTP documents that are served.
-# By default the compiled in directory.
+# By default @CUPS_DOCROOT@.
 #
 
-#DocumentRoot /usr/share/doc/cups
+#DocumentRoot @CUPS_DOCROOT@
 
 #
 # ErrorLog: the error log file; if this does not start with a leading /
 # then it is assumed to be relative to ServerRoot.  By default set to
-# "/var/log/cups/error_log"
+# "@CUPS_LOGDIR@/error_log"
 #
 # You can also use the special name "syslog" to send the output to the
 # syslog file or daemon.
 #
 
-#ErrorLog /var/log/cups/error_log
+#ErrorLog @CUPS_LOGDIR@/error_log
 
 #
 # FontPath: the path to locate all font files (currently only for pstoraster)
-# By default /usr/share/cups/fonts.
+# By default @CUPS_FONTPATH@.
 #
 
-#FontPath /usr/share/cups/fonts
+#FontPath @CUPS_FONTPATH@
 
 #
 # LogLevel: controls the number of messages logged to the ErrorLog
@@ -165,13 +165,13 @@ LogLevel info
 #
 # PageLog: the page log file; if this does not start with a leading /
 # then it is assumed to be relative to ServerRoot.  By default set to
-# "/var/log/cups/page_log"
+# "@CUPS_LOGDIR@/page_log"
 #
 # You can also use the special name "syslog" to send the output to the
 # syslog file or daemon.
 #
 
-#PageLog /var/log/cups/page_log
+#PageLog @CUPS_LOGDIR@/page_log
 
 #
 # PreserveJobHistory: whether or not to preserve the job history after a
@@ -230,10 +230,10 @@ LogLevel info
 
 #
 # RequestRoot: the directory where request files are stored.
-# By default /var/spool/cups.
+# By default @CUPS_REQUESTS@.
 #
 
-#RequestRoot /var/spool/cups
+#RequestRoot @CUPS_REQUESTS@
 
 #
 # RemoteRoot: the name of the user assigned to unauthenticated accesses
@@ -244,17 +244,17 @@ LogLevel info
 
 #
 # ServerBin: the root directory for the scheduler executables.
-# By default /usr/lib/cups or /usr/lib32/cups (IRIX 6.5).
+# By default @CUPS_SERVERBIN@.
 #
 
-#ServerBin /usr/lib/cups
+#ServerBin @CUPS_SERVERBIN@
 
 #
 # ServerRoot: the root directory for the scheduler.
-# By default /etc/cups.
+# By default @CUPS_SERVERROOT@.
 #
 
-#ServerRoot /etc/cups
+#ServerRoot @CUPS_SERVERROOT@
 
 
 ########
@@ -263,17 +263,17 @@ LogLevel info
 
 #
 # ServerCertificate: the file to read containing the server's certificate.
-# Defaults to "/etc/cups/ssl/server.crt".
+# Defaults to "@CUPS_SERVERROOT@/ssl/server.crt".
 #
 
-#ServerCertificate /etc/cups/ssl/server.crt
+#ServerCertificate @CUPS_SERVERROOT@/ssl/server.crt
 
 #
 # ServerKey: the file to read containing the server's key.
-# Defaults to "/etc/cups/ssl/server.key".
+# Defaults to "@CUPS_SERVERROOT@/ssl/server.key".
 #
 
-#ServerKey /etc/cups/ssl/server.key
+#ServerKey @CUPS_SERVERROOT@/ssl/server.key
 
 
 ########
@@ -303,12 +303,12 @@ LogLevel info
 #RIPCache 8m
 
 #
-# TempDir: the directory to put temporary files in. This directory must be
-# writable by the user defined above!  Defaults to "/var/spool/cups/tmp" or
+# TempDir: the directory to put temporary files in.  This directory must be
+# writable by the user defined above!  Defaults to "@CUPS_REQUESTS@/tmp" or
 # the value of the TMPDIR environment variable.
 #
 
-#TempDir /var/spool/cups/tmp
+#TempDir @CUPS_REQUESTS@/tmp
 
 #
 # FilterLimit: sets the maximum cost of all job filters that can be run
@@ -716,5 +716,5 @@ Allow From 127.0.0.1
 </Location>
 
 #
-# End of "$Id: cupsd.conf,v 1.38 2002/01/23 17:25:33 mike Exp $".
+# End of "$Id: cupsd.conf.in,v 1.1 2002/01/24 18:51:04 mike Exp $".
 #
index 2e7aeb66be6221f14d6bf61af412026937565d72..0273b52a9779596a3b70ce70d00c0155a105cdb6 100644 (file)
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-directories.m4,v 1.6 2002/01/02 18:50:43 mike Exp $"
+dnl "$Id: cups-directories.m4,v 1.7 2002/01/24 18:51:05 mike Exp $"
 dnl
 dnl   Directory stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -155,14 +155,14 @@ AC_SUBST(INITDIR)
 AC_SUBST(INITDDIR)
 
 dnl Setup default locations...
-CUPS_SERVERROOT='${sysconfdir}/cups'
-CUPS_REQUESTS='${localstatedir}/spool/cups'
+CUPS_SERVERROOT="$sysconfdir/cups"
+CUPS_REQUESTS="$localstatedir/spool/cups"
 
 AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
 AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups")
 
 if test x$logdir = x; then
-       CUPS_LOGDIR='${localstatedir}/log/cups'
+       CUPS_LOGDIR="$localstatedir/log/cups"
        AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups")
 else
        CUPS_LOGDIR="$logdir"
@@ -174,13 +174,13 @@ case "$uname" in
        *BSD* | Darwin*)
                # *BSD and Darwin (MacOS X)
                INSTALL_SYSV=""
-               CUPS_SERVERBIN='${exec_prefix}/libexec/cups'
+               CUPS_SERVERBIN="$exec_prefix/libexec/cups"
                AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/libexec/cups")
                ;;
        *)
                # All others
                INSTALL_SYSV="install-sysv"
-               CUPS_SERVERBIN='${exec_prefix}/lib/cups'
+               CUPS_SERVERBIN="$exec_prefix/lib/cups"
                AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/lib/cups")
                ;;
 esac
@@ -194,18 +194,18 @@ AC_SUBST(CUPS_REQUESTS)
 dnl Set the CUPS_LOCALE directory...
 case "$uname" in
        Linux* | *BSD* | Darwin*)
-               CUPS_LOCALEDIR='${datadir}/locale'
+               CUPS_LOCALEDIR="$datadir/locale"
                AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$datadir/locale")
                ;;
 
        OSF1* | AIX*)
-               CUPS_LOCALEDIR='${exec_prefix}/lib/nls/msg'
+               CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
                AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/lib/nls/msg")
                ;;
 
        *)
                # This is the standard System V location...
-               CUPS_LOCALEDIR='${exec_prefix}/lib/locale'
+               CUPS_LOCALEDIR="$exec_prefix/lib/locale"
                AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/lib/locale")
                ;;
 esac
@@ -213,13 +213,13 @@ esac
 AC_SUBST(CUPS_LOCALEDIR)
 
 dnl Set the CUPS_DATADIR directory...
-CUPS_DATADIR='${datadir}/cups'
+CUPS_DATADIR="$datadir/cups"
 AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups")
 AC_SUBST(CUPS_DATADIR)
 
 dnl Set the CUPS_DOCROOT directory...
 if test x$docdir = x; then
-       CUPS_DOCROOT='${datadir}/doc/cups'
+       CUPS_DOCROOT="$datadir/doc/cups"
        docdir="$datadir/doc/cups"
 else
        CUPS_DOCROOT="$docdir"
@@ -229,8 +229,10 @@ AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$docdir")
 AC_SUBST(CUPS_DOCROOT)
 
 dnl Set the CUPS_FONTPATH directory...
+CUPS_FONTPATH="$fontpath"
+AC_SUBST(CUPS_FONTPATH)
 AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
 
 dnl
-dnl End of "$Id: cups-directories.m4,v 1.6 2002/01/02 18:50:43 mike Exp $".
+dnl End of "$Id: cups-directories.m4,v 1.7 2002/01/24 18:51:05 mike Exp $".
 dnl
index 344763414049b815fb8ffbbf63864e8314c48f5e..37234640cb34883d6bbd8650fb1eeaa1c9387155 100644 (file)
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4,v 1.9 2002/01/14 20:37:44 mike Exp $"
+dnl "$Id: cups-sharedlibs.m4,v 1.10 2002/01/24 18:51:05 mike Exp $"
 dnl
 dnl   Shared library support for the Common UNIX Printing System (CUPS).
 dnl
@@ -47,13 +47,13 @@ if test x$enable_shared != xno; then
                        DSO="\$(CC)"
                        DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi2.4,-soname,\$@ -shared \$(OPTIM)"
                        ;;
-               OSF1* | Linux*)
+               OSF1* | Linux* | NetBSD* | OpenBSD*)
                        LIBCUPS="libcups.so.2"
                        LIBCUPSIMAGE="libcupsimage.so.2"
                        DSO="\$(CC)"
                        DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)"
                        ;;
-               Darwin* | *BSD*)
+               Darwin* | FreeBSD*)
                        LIBCUPS="libcups.2.dylib"
                        LIBCUPSIMAGE="libcupsimage.2.dylib"
                        DSO="ld"
@@ -146,5 +146,5 @@ AC_SUBST(DSOLIBS)
 AC_SUBST(IMGLIBS)
 
 dnl
-dnl End of "$Id: cups-sharedlibs.m4,v 1.9 2002/01/14 20:37:44 mike Exp $".
+dnl End of "$Id: cups-sharedlibs.m4,v 1.10 2002/01/24 18:51:05 mike Exp $".
 dnl
index bf7f91c307135ca829715b3fa4521ca66c7f7dc4..3097f0d084253e5b06b20e20734e1bed6fa98236 100644 (file)
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: configure.in,v 1.104 2002/01/02 17:58:33 mike Exp $"
+dnl "$Id: configure.in,v 1.105 2002/01/24 18:51:04 mike Exp $"
 dnl
 dnl   Configuration script for the Common UNIX Printing System (CUPS).
 dnl
@@ -39,10 +39,10 @@ sinclude(config-scripts/cups-openslp.m4)
 sinclude(config-scripts/cups-openssl.m4)
 sinclude(config-scripts/cups-pam.m4)
 
-AC_OUTPUT(Makedefs cups.list cups.sh cups-config)
+AC_OUTPUT(Makedefs cups.list cups.sh cups-config conf/cupsd.conf)
 
 chmod +x cups-config
 
 dnl
-dnl End of "$Id: configure.in,v 1.104 2002/01/02 17:58:33 mike Exp $".
+dnl End of "$Id: configure.in,v 1.105 2002/01/24 18:51:04 mike Exp $".
 dnl
index b0175e1031e250a40dad1db9b2b10a244b26d4c2..7ae9809be38b6e2ff417595e5994b583e6e09a50 100644 (file)
@@ -64,7 +64,7 @@ Copyright 1997-2002, All Rights Reserved<BR>
 <LI><A HREF="#DPKG-BINARY">Installing an Debian Distribution</A></LI>
 </UL>
 </UL>
-<B><A HREF="#PRINTER_MANAGEMENT">3 - Printer Management</A></B>
+<B><A HREF="#MANAGING_PRINTERS">3 - Managing Printers</A></B>
 <UL>
 <LI><A HREF="#4_1">The Basics</A></LI>
 <LI><A HREF="#4_2">Adding Your First Printer</A></LI>
@@ -263,7 +263,7 @@ Copyright 1997-2002, All Rights Reserved<BR>
 <UL>
 <LI><A HREF="#13_1">My Applications Don't See the Available Printers</A></LI>
 <LI><A HREF="#13_2">CUPS Doesn't Recognize My Username or Password!</A></LI>
-<LI><A HREF="#13_3">I Can't Do Administration Tasks from Another
+<LI><A HREF="#ALLOW_REMOTE">I Can't Do Administration Tasks from Another
  Machine!</A></LI>
 <LI><A HREF="#13_4">I Can't Do Administration Tasks from My Web Browser!</A>
 </LI>
@@ -663,8 +663,7 @@ CXXFLAGS</CODE>, and <CODE>LDFLAGS</CODE> environment variables prior to
 </UL>
 <P>After a short delay the CUPS software will be installed and the
  scheduler will be started automatically.</P>
-<H1 ALIGN="RIGHT"><A NAME="PRINTER_MANAGEMENT">3 - Printer Management</A>
-</H1>
+<H1 ALIGN="RIGHT"><A NAME="MANAGING_PRINTERS">3 - Managing Printers</A></H1>
 <P>This chapter describes how to add your first printer and how to
  manage your printers.</P>
 <H2><A NAME="4_1">The Basics</A></H2>
@@ -1001,7 +1000,7 @@ ServerName <I>server</I>
  configuration information.</P>
 <P>Polling is enabled by specifying one or more<A HREF="#BrowsePoll"> <CODE>
 BrowsePoll</CODE></A> directives in the<VAR> /etc/cups/cupsd.conf</VAR>
- file. For information on making these changes, see<A HREF="PRINTING_MANAGEMENT">
+ file. For information on making these changes, see<A HREF="#PRINTING_MANAGEMENT">
  Chapter 6, &quot;Printing System Management&quot;</A>.</P>
 <H1 ALIGN="RIGHT"><A NAME="PRINTING_MANAGEMENT">6 - Printing System
  Management</A></H1>
@@ -4788,7 +4787,7 @@ AuthClass System
 </PRE>
 </UL>
  for the<VAR> /admin</VAR> location. Then restart the CUPS server as
- described in<A HREF="PRINTING_MANAGEMENT"> Chapter 8, &quot;Printing System
+ described in<A HREF="#PRINTING_MANAGEMENT"> Chapter 6, &quot;Printing System
  Management&quot;</A>.
 <CENTER>
 <TABLE BGCOLOR="#cccccc" BORDER="1" CELLPADDING="5" WIDTH="80%">
@@ -4799,8 +4798,8 @@ AuthClass System
 </TD></TR>
 </TABLE>
 </CENTER>
-<H2><A NAME="13_3">I Can't Do Administration Tasks from Another Machine!</A>
-</H2>
+<H2><A NAME="ALLOW_REMOTE">I Can't Do Administration Tasks from Another
+ Machine!</A></H2>
 <P>The default CUPS configuration limits administration to the local
  machine. To open up access, edit the<VAR> /etc/cups/cupsd.conf</VAR>
  and comment out the lines reading:</P>
@@ -4812,7 +4811,7 @@ Allow from 127.0.0.1
 </PRE>
 </UL>
  for the<VAR> /admin</VAR> location. Then restart the CUPS server as
- described in<A HREF="PRINTING_MANAGEMENT"> Chapter 8, &quot;Printing System
+ described in<A HREF="#PRINTING_MANAGEMENT"> Chapter 6, &quot;Printing System
  Management&quot;</A>.
 <CENTER>
 <TABLE BGCOLOR="#cccccc" BORDER="1" CELLPADDING="5" WIDTH="80%">
index 7f7653deec7abcf55387ca023d280c726aa98a36..3d4bbda1540bc85ce8668a90570bdaeafe0d4bf4 100644 (file)
Binary files a/doc/sam.pdf and b/doc/sam.pdf differ
index 0ce82a8ea4ed3549ee916303f92c8b203c00e23f..19af687d69a54d595542a1c46167f73958dea7e8 100644 (file)
@@ -355,7 +355,7 @@ Once you are the root user, run dpkg with:
 scheduler will be started automatically.
 
 
-<H1 ALIGN="RIGHT"><A NAME="PRINTER_MANAGEMENT">3 - Printer Management</A></H1>
+<H1 ALIGN="RIGHT"><A NAME="MANAGING_PRINTERS">3 - Managing Printers</A></H1>
 
 <P>This chapter describes how to add your first printer and how to
 manage your printers.
@@ -767,7 +767,7 @@ clients on the same subnet can share the same configuration information.
 <P>Polling is enabled by specifying one or more
 <A HREF="#BrowsePoll"><CODE>BrowsePoll</CODE></A> directives in the
 <VAR>/etc/cups/cupsd.conf</VAR> file. For information on making these
-changes, see <A HREF="PRINTING_MANAGEMENT">Chapter 6, "Printing System
+changes, see <A HREF="#PRINTING_MANAGEMENT">Chapter 6, "Printing System
 Management"</A>.
 
 
@@ -4490,7 +4490,7 @@ AuthClass System
 </UL></PRE>
 
 for the <VAR>/admin</VAR> location. Then restart the CUPS server as
-described in <A HREF="PRINTING_MANAGEMENT">Chapter 8, "Printing System
+described in <A HREF="#PRINTING_MANAGEMENT">Chapter 6, "Printing System
 Management"</A>.
 
 <CENTER><TABLE WIDTH="80%" BORDER="1" CELLPADDING="5" BGCOLOR="#cccccc">
@@ -4505,7 +4505,7 @@ Management"</A>.
 </TR>
 </TABLE></CENTER>
 
-<H2>I Can't Do Administration Tasks from Another Machine!</H2>
+<H2><A NAME="ALLOW_REMOTE">I Can't Do Administration Tasks from Another Machine!</A></H2>
 
 <P>The default CUPS configuration limits administration to the local
 machine. To open up access, edit the <VAR>/etc/cups/cupsd.conf</VAR>
@@ -4518,7 +4518,7 @@ Allow from 127.0.0.1
 </PRE></UL>
 
 for the <VAR>/admin</VAR> location. Then restart the CUPS server as
-described in <A HREF="PRINTING_MANAGEMENT">Chapter 8, "Printing System
+described in <A HREF="#PRINTING_MANAGEMENT">Chapter 6, "Printing System
 Management"</A>.
 
 <CENTER><TABLE WIDTH="80%" BORDER="1" CELLPADDING="5" BGCOLOR="#cccccc">
index 05a1286caf35d92f1c81b698ad1d7fce2d7cb724..df204cb1cd8fd8dd72cf70dedcd1f4a6b75603d2 100644 (file)
@@ -192,12 +192,25 @@ Copyright 1997-2002, All Rights Reserved<BR>
 </UL>
 <B><A HREF="#STRUCTURES">C - Structures</A></B>
 <UL>
-<LI><A HREF="#9_1">Raster Structures</A></LI>
+<LI><A HREF="#9_1">CUPS Structures</A></LI>
 <UL>
-<LI><A HREF="#9_1_1">Raster Page Header</A></LI>
+<LI><A HREF="#cups_job_t">CUPS Destinations</A></LI>
+<LI><A HREF="#cups_job_t">CUPS Jobs</A></LI>
+<LI><A HREF="#cups_lang_t">CUPS Messages</A></LI>
+<LI><A HREF="#cups_option_t">CUPS Options</A></LI>
+</UL>
+<LI><A HREF="#9_2">Networking Structures</A></LI>
+<UL>
+<LI><A HREF="#http_t">HTTP State</A></LI>
+<LI><A HREF="#ipp_t">IPP State</A></LI>
+<LI><A HREF="#cups_option_t">CUPS Options</A></LI>
+</UL>
+<LI><A HREF="#9_3">Raster Structures</A></LI>
+<UL>
+<LI><A HREF="#cups_raster_header_t">Raster Page Header</A></LI>
 </UL>
 </UL>
-<B><A HREF="#10">D - Functions</A></B>
+<B><A HREF="#FUNCTIONS">D - Functions</A></B>
 <UL>
 <LI><A HREF="#cupsAddOption">cupsAddOption()</A></LI>
 <UL>
@@ -1564,10 +1577,10 @@ if (jobid == 0)
  Interfaces (&quot;GUIs&quot;), the CUPS API provides functions to set the default
  username and to register a callback function that returns a password
  string.</P>
-<P>The<A HREF="cupsSetPasswordCB"> <CODE>cupsSetPasswordCB()</CODE></A>
+<P>The<A HREF="#cupsSetPasswordCB"> <CODE>cupsSetPasswordCB()</CODE></A>
  function is used to set a password callback in your program. Only one
  function can be used at any time.</P>
-<P>The<A HREF="cupsSetUser"> <CODE>cupsSetUser()</CODE></A> function
+<P>The<A HREF="#cupsSetUser"> <CODE>cupsSetUser()</CODE></A> function
  sets the current username for authentication. This function can be
  called by your password callback function to change the current
  username as needed.</P>
@@ -3700,11 +3713,159 @@ cupsRasterOpen()</CODE></A> function to specify a stream for reading or
 <H1 ALIGN="RIGHT"><A NAME="STRUCTURES">C - Structures</A></H1>
 <P>This appendix describes all of the structures that are defined by the
  CUPS API.</P>
-<H2><A NAME="9_1">Raster Structures</A></H2>
-<H3><A NAME="9_1_1">Raster Page Header</A></H3>
-<P>The raster page header (<A NAME="cups_raster_header_t"><CODE>
-cups_raster_header_t</CODE></A>) consists of the PostScript page device
- dictionary for the page:
+<H2><A NAME="9_1">CUPS Structures</A></H2>
+<H3><A NAME="cups_job_t">CUPS Destinations</A></H3>
+<P>The CUPS destination structure (<CODE>cups_dest_t</CODE>) contains
+ information on a specific destination or instance:
+<CENTER>
+<TABLE BORDER="1" WIDTH="90%">
+<TR><TH>Member</TH><TH>Type</TH><TH>Description</TH></TR>
+<TR><TD>name</TD><TD>char *</TD><TD>The name of the printer or class.</TD>
+</TR>
+<TR><TD>instance</TD><TD>char *</TD><TD>The instance of the printer or
+ class; NULL for the primary instance.</TD></TR>
+<TR><TD>is_default</TD><TD>int</TD><TD>1 if the destination is set as
+ the default, 0 otherwise.</TD></TR>
+<TR><TD>num_options</TD><TD>int</TD><TD>The number of options associated
+ with this destination.</TD></TR>
+<TR><TD>options</TD><TD><A HREF="#cups_option_t">cups_option_t *</A></TD><TD>
+The options associated with this destination.</TD></TR>
+</TABLE>
+</CENTER>
+</P>
+<H3><A NAME="cups_job_t">CUPS Jobs</A></H3>
+<P>The CUPS job structure (<CODE>cups_job_t</CODE>) contains information
+ on a specific job:
+<CENTER>
+<TABLE BORDER="1" WIDTH="90%">
+<TR><TH>Member</TH><TH>Type</TH><TH>Description</TH></TR>
+<TR><TD>id</TD><TD>int</TD><TD>The job ID for this job.</TD></TR>
+<TR><TD>dest</TD><TD>char *</TD><TD>The destination for this job
+ (printer or class name).</TD></TR>
+<TR><TD>title</TD><TD>char *</TD><TD>The job-name for this job (title).</TD>
+</TR>
+<TR><TD>user</TD><TD>char *</TD><TD>The job-originating-user-name for
+ this job (username).</TD></TR>
+<TR><TD>format</TD><TD>char *</TD><TD>The document-format for this job
+ (MIME type string).</TD></TR>
+<TR><TD>state</TD><TD>ipp_jstate</TD><TD>The current state of the job.</TD>
+</TR>
+<TR><TD>size</TD><TD>int</TD><TD>The size of this job in kilobytes.</TD></TR>
+<TR><TD>priority</TD><TD>int</TD><TD>The priority of this job from 1 to
+ 100 (50 is normal).</TD></TR>
+<TR><TD>completed_time</TD><TD>time_t</TD><TD>The time the job was
+ completed, or 0 if not yet completed.</TD></TR>
+<TR><TD>creation_time</TD><TD>time_t</TD><TD>The time the job was
+ queued.</TD></TR>
+<TR><TD>processing_time</TD><TD>time_t</TD><TD>The time the job started
+ printing.</TD></TR>
+</TABLE>
+</CENTER>
+</P>
+<H3><A NAME="cups_lang_t">CUPS Messages</A></H3>
+<P>The CUPS messages structure (<CODE>cups_lang_t</CODE>) contains the
+ character set, locale name, and messages array:
+<CENTER>
+<TABLE BORDER="1" WIDTH="90%">
+<TR><TH>Member</TH><TH>Type</TH><TH>Description</TH></TR>
+<TR><TD>next</TD><TD>cups_lang_t *</TD><TD>Pointer to the next messages
+ structure in memory.</TD></TR>
+<TR><TD>used</TD><TD>int</TD><TD>The number of active users of this
+ messages structure.</TD></TR>
+<TR><TD>encoding</TD><TD>cups_encoding_t</TD><TD>The character encoding
+ of the message strings.</TD></TR>
+<TR><TD>language</TD><TD>char [16]</TD><TD>The language/locale name.</TD>
+</TR>
+<TR><TD>messages</TD><TD>char *[]</TD><TD>The array of message strings.</TD>
+</TR>
+</TABLE>
+</CENTER>
+</P>
+<H3><A NAME="cups_option_t">CUPS Options</A></H3>
+<P>The CUPS option structure (<CODE>cups_option_t</CODE>) contains the
+ option name and string value:
+<CENTER>
+<TABLE BORDER="1" WIDTH="90%">
+<TR><TH>Member</TH><TH>Type</TH><TH>Description</TH></TR>
+<TR><TD>name</TD><TD>char *</TD><TD>The name of the option.</TD></TR>
+<TR><TD>value</TD><TD>char *</TD><TD>The string value of the option.</TD>
+</TR>
+</TABLE>
+</CENTER>
+</P>
+<H2><A NAME="9_2">Networking Structures</A></H2>
+<H3><A NAME="http_t">HTTP State</A></H3>
+<P>The HTTP state structure (<CODE>http_t</CODE>) contains the current
+ state of a HTTP request or response:
+<CENTER>
+<TABLE BORDER="1" WIDTH="90%">
+<TR><TH>Member</TH><TH>Type</TH><TH>Description</TH></TR>
+<TR><TD>fd</TD><TD>int</TD><TD>The socket for the HTTP connection.</TD></TR>
+<TR><TD>blocking</TD><TD>int</TD><TD>1 if the HTTP functions should
+ block, 0 if not.</TD></TR>
+<TR><TD>error</TD><TD>int</TD><TD>The last OS error that occurred on the
+ socket.</TD></TR>
+<TR><TD>activity</TD><TD>time_t</TD><TD>The last time the HTTP
+ connection was used.</TD></TR>
+<TR><TD>state</TD><TD>http_state_t</TD><TD>The current HTTP
+ request/response state.</TD></TR>
+<TR><TD>status</TD><TD>int</TD><TD>The last HTTP status seen.</TD></TR>
+<TR><TD>version</TD><TD>http_version_t</TD><TD>The HTTP protocol version
+ in use.</TD></TR>
+<TR><TD>keep_alive</TD><TD>http_keep_alive_t</TD><TD>Whether or not to
+ use Keep-Alive</TD></TR>
+<TR><TD>hostaddr</TD><TD>struct sockaddr_in</TD><TD>The IPv4 address of
+ the HTTP server.</TD></TR>
+<TR><TD>hostname</TD><TD>char []</TD><TD>The hostname of the HTTP
+ server.</TD></TR>
+<TR><TD>fields</TD><TD>char [][]</TD><TD>The string values of all HTTP
+ request/response fields.</TD></TR>
+<TR><TD>data</TD><TD>char *</TD><TD>Current byte in data buffer.</TD></TR>
+<TR><TD>data_encoding</TD><TD>http_encoding_t</TD><TD>The transfer
+ encoding for the request/response.</TD></TR>
+<TR><TD>data_remaining</TD><TD>int</TD><TD>The number of bytes remaining
+ in the current request, response, or chunk.</TD></TR>
+<TR><TD>used</TD><TD>int</TD><TD>The number of bytes that are used in
+ the buffer.</TD></TR>
+<TR><TD>buffer</TD><TD>char []</TD><TD>The read/write buffer.</TD></TR>
+<TR><TD>auth_type</TD><TD>int</TD><TD>The type of authentication in use.</TD>
+</TR>
+<TR><TD>md5_state</TD><TD>md5_state_t</TD><TD>The current MD5 digest
+ state.</TD></TR>
+<TR><TD>nonce</TD><TD>char []</TD><TD>The nonce value for Digest
+ authentication.</TD></TR>
+<TR><TD>nonce_count</TD><TD>int</TD><TD>The nonce count value.</TD></TR>
+<TR><TD>tls</TD><TD>void *</TD><TD>A pointer to private encryption data.</TD>
+</TR>
+<TR><TD>encryption</TD><TD>http_encryption_t</TD><TD>The current
+ encryption mode.</TD></TR>
+</TABLE>
+</CENTER>
+</P>
+<H3><A NAME="ipp_t">IPP State</A></H3>
+<P>The IPP state structure (<CODE>ipp_t</CODE>) contains the current
+ state of a IPP request or response:
+<CENTER>
+<TABLE BORDER="1" WIDTH="90%">
+<TR><TH>Member</TH><TH>Type</TH><TH>Description</TH></TR>
+<TR><TD></TD><TD></TD><TD></TD></TR>
+</TABLE>
+</CENTER>
+</P>
+<H3><A NAME="cups_option_t">CUPS Options</A></H3>
+<P>The CUPS option structure (<CODE>cups_option_t</CODE>) contains the
+ option name and string value:
+<CENTER>
+<TABLE BORDER="1" WIDTH="90%">
+<TR><TH>Member</TH><TH>Type</TH><TH>Description</TH></TR>
+<TR><TD></TD><TD></TD><TD></TD></TR>
+</TABLE>
+</CENTER>
+</P>
+<H2><A NAME="9_3">Raster Structures</A></H2>
+<H3><A NAME="cups_raster_header_t">Raster Page Header</A></H3>
+<P>The raster page header (<CODE>cups_raster_header_t</CODE>) consists
+ of the PostScript page device dictionary for the page:
 <CENTER>
 <TABLE BORDER="1" WIDTH="90%">
 <TR><TH>Member</TH><TH>Type</TH><TH>Description</TH></TR>
@@ -3788,7 +3949,7 @@ cups_raster_header_t</CODE></A>) consists of the PostScript page device
 </TABLE>
 </CENTER>
 </P>
-<H1 ALIGN="RIGHT"><A HREF="FUNCTIONS" NAME="10">D - Functions</A></H1>
+<H1 ALIGN="RIGHT"><A NAME="FUNCTIONS">D - Functions</A></H1>
 <P>This appendix provides a reference for all of the CUPS API functions.
 <!-- NEW PAGE -->
 </P>
index 0deb26654a84ffd3d4d5191f63ccf35cece504c3..a65aaee2eba9645dd640832fd26b8cbc89fdb81c 100644 (file)
Binary files a/doc/spm.pdf and b/doc/spm.pdf differ
index dd0b372cfb93d4b9d21e5aab9f9e58fb04bb986b..f3e7eee2a9f0a6820067fd339f400617e92fa697 100644 (file)
@@ -463,11 +463,11 @@ Graphical User Interfaces ("GUIs"), the CUPS API provides
 functions to set the default username and to register a callback
 function that returns a password string.
 
-<P>The <A HREF="cupsSetPasswordCB"><CODE>cupsSetPasswordCB()</CODE></A>
+<P>The <A HREF="#cupsSetPasswordCB"><CODE>cupsSetPasswordCB()</CODE></A>
 function is used to set a password callback in your program. Only one
 function can be used at any time.
 
-<P>The <A HREF="cupsSetUser"><CODE>cupsSetUser()</CODE></A> function sets
+<P>The <A HREF="#cupsSetUser"><CODE>cupsSetUser()</CODE></A> function sets
 the current username for authentication. This function can be called by
 your password callback function to change the current username as needed.
 
@@ -2529,16 +2529,349 @@ value orderings:
 
 <H1 ALIGN="RIGHT"><A NAME="STRUCTURES">C - Structures</A></H1>
 
-<P>This appendix describes all of the structures that are defined by the CUPS
-API.
+<P>This appendix describes all of the structures that are
+defined by the CUPS API.
+
+<H2>CUPS Structures</H2>
+
+<H3><A NAME="cups_job_t">CUPS Destinations</A></H3>
+
+<P>The CUPS destination structure (<CODE>cups_dest_t</CODE>)
+contains information on a specific destination or instance:
+
+<CENTER><TABLE WIDTH="90%" BORDER="1">
+<TR>
+       <TH>Member</TH>
+       <TH>Type</TH>
+       <TH>Description</TH>
+</TR>
+<TR>
+       <TD>name</TD>
+       <TD>char *</TD>
+       <TD>The name of the printer or class.</TD>
+</TR>
+<TR>
+       <TD>instance</TD>
+       <TD>char *</TD>
+       <TD>The instance of the printer or class; NULL for the primary
+       instance.</TD>
+</TR>
+<TR>
+       <TD>is_default</TD>
+       <TD>int</TD>
+       <TD>1 if the destination is set as the default, 0 otherwise.</TD>
+</TR>
+<TR>
+       <TD>num_options</TD>
+       <TD>int</TD>
+       <TD>The number of options associated with this destination.</TD>
+</TR>
+<TR>
+       <TD>options</TD>
+       <TD><A HREF="#cups_option_t">cups_option_t *</A></TD>
+       <TD>The options associated with this destination.</TD>
+</TR>
+</TABLE></CENTER>
+
+<H3><A NAME="cups_job_t">CUPS Jobs</A></H3>
+
+<P>The CUPS job structure (<CODE>cups_job_t</CODE>) contains
+information on a specific job:
+
+<CENTER><TABLE WIDTH="90%" BORDER="1">
+<TR>
+       <TH>Member</TH>
+       <TH>Type</TH>
+       <TH>Description</TH>
+</TR>
+<TR>
+       <TD>id</TD>
+       <TD>int</TD>
+       <TD>The job ID for this job.</TD>
+</TR>
+<TR>
+       <TD>dest</TD>
+       <TD>char *</TD>
+       <TD>The destination for this job (printer or class name).</TD>
+</TR>
+<TR>
+       <TD>title</TD>
+       <TD>char *</TD>
+       <TD>The job-name for this job (title).</TD>
+</TR>
+<TR>
+       <TD>user</TD>
+       <TD>char *</TD>
+       <TD>The job-originating-user-name for this job (username).</TD>
+</TR>
+<TR>
+       <TD>format</TD>
+       <TD>char *</TD>
+       <TD>The document-format for this job (MIME type string).</TD>
+</TR>
+<TR>
+       <TD>state</TD>
+       <TD>ipp_jstate</TD>
+       <TD>The current state of the job.</TD>
+</TR>
+<TR>
+       <TD>size</TD>
+       <TD>int</TD>
+       <TD>The size of this job in kilobytes.</TD>
+</TR>
+<TR>
+       <TD>priority</TD>
+       <TD>int</TD>
+       <TD>The priority of this job from 1 to 100 (50 is normal).</TD>
+</TR>
+<TR>
+       <TD>completed_time</TD>
+       <TD>time_t</TD>
+       <TD>The time the job was completed, or 0 if not yet completed.</TD>
+</TR>
+<TR>
+       <TD>creation_time</TD>
+       <TD>time_t</TD>
+       <TD>The time the job was queued.</TD>
+</TR>
+<TR>
+       <TD>processing_time</TD>
+       <TD>time_t</TD>
+       <TD>The time the job started printing.</TD>
+</TR>
+</TABLE></CENTER>
+
+<H3><A NAME="cups_lang_t">CUPS Messages</A></H3>
+
+<P>The CUPS messages structure (<CODE>cups_lang_t</CODE>)
+contains the character set, locale name, and messages array:
+
+<CENTER><TABLE WIDTH="90%" BORDER="1">
+<TR>
+       <TH>Member</TH>
+       <TH>Type</TH>
+       <TH>Description</TH>
+</TR>
+<TR>
+       <TD>next</TD>
+       <TD>cups_lang_t *</TD>
+       <TD>Pointer to the next messages structure in memory.</TD>
+</TR>
+<TR>
+       <TD>used</TD>
+       <TD>int</TD>
+       <TD>The number of active users of this messages structure.</TD>
+</TR>
+<TR>
+       <TD>encoding</TD>
+       <TD>cups_encoding_t</TD>
+       <TD>The character encoding of the message strings.</TD>
+</TR>
+<TR>
+       <TD>language</TD>
+       <TD>char [16]</TD>
+       <TD>The language/locale name.</TD>
+</TR>
+<TR>
+       <TD>messages</TD>
+       <TD>char *[]</TD>
+       <TD>The array of message strings.</TD>
+</TR>
+</TABLE></CENTER>
+
+<H3><A NAME="cups_option_t">CUPS Options</A></H3>
+
+<P>The CUPS option structure (<CODE>cups_option_t</CODE>)
+contains the option name and string value:
+
+<CENTER><TABLE WIDTH="90%" BORDER="1">
+<TR>
+       <TH>Member</TH>
+       <TH>Type</TH>
+       <TH>Description</TH>
+</TR>
+<TR>
+       <TD>name</TD>
+       <TD>char *</TD>
+       <TD>The name of the option.</TD>
+</TR>
+<TR>
+       <TD>value</TD>
+       <TD>char *</TD>
+       <TD>The string value of the option.</TD>
+</TR>
+</TABLE></CENTER>
+
+<H2>Networking Structures</H2>
+
+<H3><A NAME="http_t">HTTP State</A></H3>
+
+<P>The HTTP state structure (<CODE>http_t</CODE>) contains the
+current state of a HTTP request or response:
+
+<CENTER><TABLE WIDTH="90%" BORDER="1">
+<TR>
+       <TH>Member</TH>
+       <TH>Type</TH>
+       <TH>Description</TH>
+</TR>
+<TR>
+       <TD>fd</TD>
+       <TD>int</TD>
+       <TD>The socket for the HTTP connection.</TD>
+</TR>
+<TR>
+       <TD>blocking</TD>
+       <TD>int</TD>
+       <TD>1 if the HTTP functions should block, 0 if not.</TD>
+</TR>
+<TR>
+       <TD>error</TD>
+       <TD>int</TD>
+       <TD>The last OS error that occurred on the socket.</TD>
+</TR>
+<TR>
+       <TD>activity</TD>
+       <TD>time_t</TD>
+       <TD>The last time the HTTP connection was used.</TD>
+</TR>
+<TR>
+       <TD>state</TD>
+       <TD>http_state_t</TD>
+       <TD>The current HTTP request/response state.</TD>
+</TR>
+<TR>
+       <TD>status</TD>
+       <TD>int</TD>
+       <TD>The last HTTP status seen.</TD>
+</TR>
+<TR>
+       <TD>version</TD>
+       <TD>http_version_t</TD>
+       <TD>The HTTP protocol version in use.</TD>
+</TR>
+<TR>
+       <TD>keep_alive</TD>
+       <TD>http_keep_alive_t</TD>
+       <TD>Whether or not to use Keep-Alive</TD>
+</TR>
+<TR>
+       <TD>hostaddr</TD>
+       <TD>struct sockaddr_in</TD>
+       <TD>The IPv4 address of the HTTP server.</TD>
+</TR>
+<TR>
+       <TD>hostname</TD>
+       <TD>char []</TD>
+       <TD>The hostname of the HTTP server.</TD>
+</TR>
+<TR>
+       <TD>fields</TD>
+       <TD>char [][]</TD>
+       <TD>The string values of all HTTP request/response
+       fields.</TD>
+</TR>
+<TR>
+       <TD>data</TD>
+       <TD>char *</TD>
+       <TD>Current byte in data buffer.</TD>
+</TR>
+<TR>
+       <TD>data_encoding</TD>
+       <TD>http_encoding_t</TD>
+       <TD>The transfer encoding for the request/response.</TD>
+</TR>
+<TR>
+       <TD>data_remaining</TD>
+       <TD>int</TD>
+       <TD>The number of bytes remaining in the current request,
+       response, or chunk.</TD>
+</TR>
+<TR>
+       <TD>used</TD>
+       <TD>int</TD>
+       <TD>The number of bytes that are used in the buffer.</TD>
+</TR>
+<TR>
+       <TD>buffer</TD>
+       <TD>char []</TD>
+       <TD>The read/write buffer.</TD>
+</TR>
+<TR>
+       <TD>auth_type</TD>
+       <TD>int</TD>
+       <TD>The type of authentication in use.</TD>
+</TR>
+<TR>
+       <TD>md5_state</TD>
+       <TD>md5_state_t</TD>
+       <TD>The current MD5 digest state.</TD>
+</TR>
+<TR>
+       <TD>nonce</TD>
+       <TD>char []</TD>
+       <TD>The nonce value for Digest authentication.</TD>
+</TR>
+<TR>
+       <TD>nonce_count</TD>
+       <TD>int</TD>
+       <TD>The nonce count value.</TD>
+</TR>
+<TR>
+       <TD>tls</TD>
+       <TD>void *</TD>
+       <TD>A pointer to private encryption data.</TD>
+</TR>
+<TR>
+       <TD>encryption</TD>
+       <TD>http_encryption_t</TD>
+       <TD>The current encryption mode.</TD>
+</TR>
+</TABLE></CENTER>
+
+<H3><A NAME="ipp_t">IPP State</A></H3>
+
+<P>The IPP state structure (<CODE>ipp_t</CODE>) contains the
+current state of a IPP request or response:
+
+<CENTER><TABLE WIDTH="90%" BORDER="1">
+<TR>
+       <TH>Member</TH>
+       <TH>Type</TH>
+       <TH>Description</TH>
+</TR>
+<TR>
+       <TD></TD>
+       <TD></TD>
+       <TD></TD>
+</TR>
+</TABLE></CENTER>
+
+<H3><A NAME="cups_option_t">CUPS Options</A></H3>
+
+<P>The CUPS option structure (<CODE>cups_option_t</CODE>)
+contains the option name and string value:
+
+<CENTER><TABLE WIDTH="90%" BORDER="1">
+<TR>
+       <TH>Member</TH>
+       <TH>Type</TH>
+       <TH>Description</TH>
+</TR>
+<TR>
+       <TD></TD>
+       <TD></TD>
+       <TD></TD>
+</TR>
+</TABLE></CENTER>
+
 
 <H2>Raster Structures</H2>
 
-<H3>Raster Page Header</H3>
+<H3><A NAME="cups_raster_header_t">Raster Page Header</A></H3>
 
-<P>The raster page header (<A
-NAME="cups_raster_header_t"><CODE>cups_raster_header_t</CODE></A>) consists
-of the PostScript page device dictionary for the page:
+<P>The raster page header (<CODE>cups_raster_header_t</CODE>)
+consists of the PostScript page device dictionary for the page:
 
 <CENTER><TABLE WIDTH="90%" BORDER="1">
 <TR>
@@ -2748,7 +3081,7 @@ of the PostScript page device dictionary for the page:
 </TR>
 </TABLE></CENTER>
 
-<H1 ALIGN="RIGHT"><A HREF="FUNCTIONS">D - Functions</A></H1>
+<H1 ALIGN="RIGHT"><A NAME="FUNCTIONS">D - Functions</A></H1>
 
 <P>This appendix provides a reference for all of the CUPS API functions.