diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-01-19 16:53:50 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-01-19 16:53:50 +0000 |
| commit | dcb445bcf3e9ec2efd56550263052aca70beb08e (patch) | |
| tree | 9a0d2260f2bbfdc8a6aa561c138baca1a58f8228 /scheduler/conf.h | |
| parent | 9c80ffa289171a48b10cbda2098289ed0c7b96cc (diff) | |
| download | cups-dcb445bcf3e9ec2efd56550263052aca70beb08e.tar.gz | |
Merge changes from CUPS 1.6svn-r10188, including changes for <rdar://problem/10127258> CUPS 1.6: New printer/printing APIs
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3618 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/conf.h')
| -rw-r--r-- | scheduler/conf.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/scheduler/conf.h b/scheduler/conf.h index 4a0b5961e..41232d907 100644 --- a/scheduler/conf.h +++ b/scheduler/conf.h @@ -242,7 +242,7 @@ VAR int SSLOptions VALUE(CUPSD_SSL_NONE); #endif /* HAVE_SSL */ #ifdef HAVE_LAUNCHD -VAR int LaunchdTimeout VALUE(DEFAULT_KEEPALIVE); +VAR int LaunchdTimeout VALUE(10); /* Time after which an idle cupsd will exit */ #endif /* HAVE_LAUNCHD */ @@ -251,6 +251,14 @@ VAR char *SystemGroupAuthKey VALUE(NULL); /* System group auth key */ #endif /* HAVE_AUTHORIZATION_H */ +#ifdef HAVE_GSSAPI +VAR char *GSSServiceName VALUE(NULL); + /* GSS service name */ +int HaveServerCreds VALUE(0); + /* Do we have server credentials? */ +gss_cred_id_t ServerCreds; /* Server's GSS credentials */ +#endif /* HAVE_GSSAPI */ + /* * Prototypes... @@ -263,6 +271,7 @@ extern int cupsdCheckPermissions(const char *filename, int user, int group, int is_dir, int create_dir); extern int cupsdCheckProgram(const char *filename, cupsd_printer_t *p); +extern int cupsdDefaultAuthType(void); extern void cupsdFreeAliases(cups_array_t *aliases); extern char *cupsdGetDateTime(struct timeval *t, cupsd_time_t format); extern void cupsdLogFCMessage(void *context, _cups_fc_result_t result, |