Merge pull request #5519 from IslandCow/small

[thirdparty/cups.git] / scheduler / cert.h

diff --git a/scheduler/cert.h b/scheduler/cert.h
index bac490ae697f4e5aaf911d5835c5bb25bfbc0f61..a49663dc32c63d2a9ce965462b00fdb40cdf471c 100644 (file)
--- a/scheduler/cert.h
+++ b/scheduler/cert.h
@@ -1,17 +1,10 @@
 /*
- * "$Id: cert.h 6649 2007-07-11 21:46:42Z mike $"
+ * Authentication certificate definitions for the CUPS scheduler.
  *
- *   Authentication certificate definitions for the Common UNIX
- *   Printing System (CUPS).
+ * Copyright 2007-2012 by Apple Inc.
+ * Copyright 1997-2005 by Easy Software Products.
  *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 1997-2005 by Easy Software Products.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. 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
- *   file is missing or damaged, see the license at "http://www.cups.org/".
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
  */
 
 /*
@@ -24,9 +17,7 @@ typedef struct cupsd_cert_s
   int          pid;                    /* Process ID (0 for root certificate) */
   char         certificate[33];        /* 32 hex characters, or 128 bits */
   char         username[33];           /* Authenticated username */
-#ifdef HAVE_GSSAPI
-  krb5_ccache  ccache;                 /* Kerberos credential cache */
-#endif /* HAVE_GSSAPI */
+  int          type;                   /* AuthType for username */
 } cupsd_cert_t;
 
 
@@ -34,22 +25,18 @@ typedef struct cupsd_cert_s
  * Globals...
  */
 
-VAR cupsd_cert_t       *Certs;         /* List of certificates */
-VAR time_t             RootCertTime;   /* Root certificate update time */
+VAR cupsd_cert_t       *Certs          /* List of certificates */
+                               VALUE(NULL);
+VAR time_t             RootCertTime    /* Root certificate update time */
+                               VALUE(0);
 
 
 /*
  * Prototypes...
  */
 
-extern void            cupsdAddCert(int pid, const char *username,
-                                    void *ccache);
+extern void            cupsdAddCert(int pid, const char *username, int type);
 extern void            cupsdDeleteCert(int pid);
 extern void            cupsdDeleteAllCerts(void);
-extern const char      *cupsdFindCert(const char *certificate);
+extern cupsd_cert_t    *cupsdFindCert(const char *certificate);
 extern void            cupsdInitCerts(void);
-
-
-/*
- * End of "$Id: cert.h 6649 2007-07-11 21:46:42Z mike $".
- */