Set version to 2.1

[netatalk.git] / etc / papd / printer.h

diff --git a/etc/papd/printer.h b/etc/papd/printer.h
index 72ce5b6c919454613ef20965e4a3bb9f921ac789..7c562734913d74c998aac470046a89181ced2f52 100644 (file)
--- a/etc/papd/printer.h
+++ b/etc/papd/printer.h
@@ -1,4 +1,6 @@
 /*
+ * $Id: printer.h,v 1.6 2005-04-28 20:49:49 bfernhomberg Exp $
+ *
  * Copyright (c) 1990,1995 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  */
@@ -7,11 +9,14 @@ struct printer {
     char               *p_name;
     char               *p_type;
     char               *p_zone;
+    char               *p_u_name;
 #ifdef notdef
     char               *p_fonts;
     char               *p_psetdir;
-#endif notdef
+#endif /* notdef */
     char               *p_ppdfile;
+    char               p_status[255];
+    char               *p_authprintdir;
     int                        p_flags;
     struct at_addr      p_addr;
     union {
@@ -23,7 +28,7 @@ struct printer {
            char                *pr_role;
            double              pr_balance;
            int                 pr_srvid;
-#endif ABS_PRINT
+#endif /* ABS_PRINT */
            int                 pr_pagecost;
            char                *pr_pagecost_msg;
            char                *pr_lock;
@@ -31,6 +36,9 @@ struct printer {
        char            *pu_cmd;
     } p_un;
     ATP                        p_atp;
+#ifdef HAVE_CUPS
+    char               *p_cupsoptions;
+#endif
     struct printer     *p_next;
 };
 #define p_cmd          p_un.pu_cmd
@@ -41,7 +49,7 @@ struct printer {
 #define p_role         p_un.pu_pr.pr_role
 #define p_balance      p_un.pu_pr.pr_balance
 #define p_srvid                p_un.pu_pr.pr_srvid
-#endif ABS_PRINT
+#endif /* ABS_PRINT */
 #define p_pagecost     p_un.pu_pr.pr_pagecost
 #define p_pagecost_msg p_un.pu_pr.pr_pagecost_msg
 #define p_lock         p_un.pu_pr.pr_lock
@@ -50,6 +58,13 @@ struct printer {
 #define P_SPOOLED      (1<<1)
 #define P_REGISTERED   (1<<2)
 #define P_ACCOUNT      (1<<3)
-#define P_AUTH         (1<<4)
+#define P_KRB          (1<<4)
+#define P_AUTH         (1<<5)
+#define P_AUTH_PSSP    (1<<6)
+#define P_AUTH_CAP     (1<<7)
+#define P_CUPS         (1<<8)
+#define P_CUPS_PPD     (1<<9)
+#define P_CUPS_AUTOADDED (1<<10)
+#define P_FOOMATIC_HACK (1<<11)
 
 extern struct printer  *printer;