Merge changes from CUPS 1.4svn-r8606.

[thirdparty/cups.git] / cups / globals.h

diff --git a/cups/globals.h b/cups/globals.h
index 89139367f903422e0810e5920b107968cab8c7f0..fecbeb3d7021fa0708e9bc962c22f2d9dc6bba1f 100644 (file)
--- a/cups/globals.h
+++ b/cups/globals.h
@@ -120,7 +120,8 @@ typedef struct _cups_globals_s              /**** CUPS global state data ****/
   char                 user[65],       /* User name */
                        server[256],    /* Server address */
                        servername[256];/* Server hostname */
-  cups_password_cb_t   password_cb;    /* Password callback */
+  cups_password_cb2_t  password_cb;    /* Password callback */
+  void                 *password_data; /* Password user data */
 
   /* util.c */
   http_t               *http;          /* Current server connection */