diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-11-06 05:13:04 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-11-06 05:13:04 +0000 |
| commit | 10d09e334a4892cd5ed4e2a2a0f5bbe3c8c171ed (patch) | |
| tree | cb980415b72e93a966ea00d60a18ace75533dcfd /scheduler/classes.c | |
| parent | 6c48a6cafc078a698d97c82c1dd69ac9f850c0ce (diff) | |
Merge changes from CUPS 1.5svn-r9352.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2848 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/classes.c')
| -rw-r--r-- | scheduler/classes.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/scheduler/classes.c b/scheduler/classes.c index 72b5dbff0..92122c068 100644 --- a/scheduler/classes.c +++ b/scheduler/classes.c @@ -1,7 +1,7 @@ /* * "$Id: classes.c 7724 2008-07-14 06:06:06Z mike $" * - * Printer class routines for the Common UNIX Printing System (CUPS). + * Printer class routines for the CUPS scheduler. * * Copyright 2007-2010 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. @@ -584,7 +584,7 @@ cupsdLoadAllClasses(void) if (value) { p->deny_users = 0; - cupsdAddPrinterUser(p, value); + cupsdAddString(&(p->users), value); } else cupsdLogMessage(CUPSD_LOG_ERROR, @@ -595,7 +595,7 @@ cupsdLoadAllClasses(void) if (value) { p->deny_users = 1; - cupsdAddPrinterUser(p, value); + cupsdAddString(&(p->users), value); } else cupsdLogMessage(CUPSD_LOG_ERROR, @@ -685,7 +685,8 @@ cupsdSaveAllClasses(void) cups_file_t *fp; /* classes.conf file */ char temp[1024], /* Temporary string */ backup[1024], /* printers.conf.O file */ - value[2048]; /* Value string */ + value[2048], /* Value string */ + *name; /* Current user name */ cupsd_printer_t *pclass; /* Current printer class */ int i; /* Looping var */ time_t curtime; /* Current time */ @@ -825,9 +826,10 @@ cupsdSaveAllClasses(void) cupsFilePrintf(fp, "PageLimit %d\n", pclass->page_limit); cupsFilePrintf(fp, "KLimit %d\n", pclass->k_limit); - for (i = 0; i < pclass->num_users; i ++) - cupsFilePutConf(fp, pclass->deny_users ? "DenyUser" : "AllowUser", - pclass->users[i]); + for (name = (char *)cupsArrayFirst(pclass->users); + name; + name = (char *)cupsArrayNext(pclass->users)) + cupsFilePutConf(fp, pclass->deny_users ? "DenyUser" : "AllowUser", name); if (pclass->op_policy) cupsFilePutConf(fp, "OpPolicy", pclass->op_policy); |