Load cups into easysw/current.

[thirdparty/cups.git] / doc / help / ref-cupsd-conf.html

diff --git a/doc/help/ref-cupsd-conf.html b/doc/help/ref-cupsd-conf.html
index ff8058cd552ff3730b5be7c640535e9104669e7f..8e07d06200eb3b810414111742de3434eb89e7da 100644 (file)
--- a/doc/help/ref-cupsd-conf.html
+++ b/doc/help/ref-cupsd-conf.html
@@ -236,6 +236,7 @@ HREF="#Require"><CODE>Require</CODE></A> directive instead.</P>
   AuthType Basic
   AuthType Digest
   AuthType BasicDigest
+  AuthType Negotiate
 &lt;/Location&gt;
 </PRE>
 
@@ -260,12 +261,15 @@ authentication to perform:</P>
        should be performed using the
        <VAR>/etc/cups/passwd.md5</VAR> file</LI>
 
+       <LI><CODE>Negotiate</CODE> - Kerberos authentication
+       should be performed</LI>
+
 </UL>
 
-<P>When using <CODE>Basic</CODE>, <CODE>Digest</CODE>, or
-<CODE>BasicDigest</CODE> authentication, clients connecting
-through the <CODE>localhost</CODE> interface can also
-authenticate using certificates.</P>
+<P>When using <CODE>Basic</CODE>, <CODE>Digest</CODE>,
+<CODE>BasicDigest</CODE>, or <CODE>Negotiate</CODE> authentication,
+clients connecting through the <CODE>localhost</CODE> interface can
+also authenticate using certificates.</P>
 
 <P>The <CODE>AuthType</CODE> directive must appear inside a <A
 HREF="#Location"><CODE>Location</CODE></A> or <A
@@ -856,6 +860,7 @@ for data files.</P>
 DefaultAuthType Basic
 DefaultAuthType BasicDigest
 DefaultAuthType Digest
+DefaultAuthType Negotiate
 </PRE>
 
 <H3>Description</H3>
@@ -1184,6 +1189,20 @@ system-specific but is usually <CODE>lp</CODE> or
 <CODE>nobody</CODE>.</P>
 
 
+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.3</SPAN><A NAME="GSSServiceName">GSSServiceName</A></H2>
+
+<H3>Examples</H3>
+
+<PRE CLASS="command">
+GSSServiceName IPP
+GSSServiceName HTTP
+</PRE>
+
+<H3>Description</H3>
+
+<P>The <CODE>GSSServiceName</CODE> directive specifies the Kerberos service name that is used when passing authorization tickets. The default name is <CODE>IPP</CODE>.</P>
+
+
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.10</SPAN><A NAME="HideImplicitMembers">HideImplicitMembers</A></H2>
 
 <H3>Examples</H3>