~ubuntu-branches/ubuntu/vivid/samba/vivid

« back to all changes in this revision

Viewing changes to source3/printing/print_generic.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-12-21 13:18:04 UTC
  • mfrom: (0.39.21 sid)
  • Revision ID: package-import@ubuntu.com-20111221131804-xtlr39wx6njehxxr
Tags: 2:3.6.1-3ubuntu1
* Merge from Debian testing.  Remaining changes:
  + debian/patches/VERSION.patch:
    - set SAMBA_VERSION_SUFFIX to Ubuntu.
  + debian/patches/error-trans.fix-276472:
    - Add the translation of Unix Error code -ENOTSUP to NT Error Code
    - NT_STATUS_NOT_SUPPORTED to prevent the Permission denied error.
  + debian/smb.conf:
    - add "(Samba, Ubuntu)" to server string.
    - comment out the default [homes] share, and add a comment about
      "valid users = %S" to show users how to restrict access to
      \\server\username to only username.
    - Set 'usershare allow guests', so that usershare admins are 
      allowed to create public shares in addition to authenticated
      ones.
    - add map to guest = Bad user, maps bad username to guest access.
  + debian/samba-common.config:
    - Do not change priority to high if dhclient3 is installed.
    - Use priority medium instead of high for the workgroup question.
  + debian/control:
    - Don't build against or suggest ctdb.
    - Add dependency on samba-common-bin to samba.
  + Add ufw integration:
    - Created debian/samba.ufw.profile
    - debian/rules, debian/samba.dirs, debian/samba.files: install
      profile
    - debian/control: have samba suggest ufw
  + Add apport hook:
    - Created debian/source_samba.py.
    - debian/rules, debian/samba.dirs, debian/samba-common-bin.files: install
  + Switch to upstart:
    - Add debian/samba.{nmbd,smbd}.upstart.
  + debian/samba.logrotate, debian/samba-common.dhcp, debian/samba.if-up:
    - Make them upstart compatible
  + debian/samba.postinst: 
    - Avoid scary pdbedit warnings on first import.
  + debian/samba-common.postinst: Add more informative error message for
    the case where smb.conf was manually deleted
  + debian/patches/fix-debuglevel-name-conflict.patch: don't use 'debug_level'
    as a global variable name in an NSS module 
  + Dropped:
    - debian/patches/error-trans.fix-276472
    - debian/patches/fix-debuglevel-name-conflict.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
117
117
        
118
118
        /* need to pause the spooled entry */
119
119
        slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob);
120
 
        return print_run_command(snum, PRINTERNAME(snum), True,
 
120
        return print_run_command(snum, lp_printername(snum), True,
121
121
                                 lp_lppausecommand(snum), NULL,
122
122
                                 "%j", jobstr,
123
123
                                 NULL);
132
132
 
133
133
        /* need to pause the spooled entry */
134
134
        slprintf(jobstr, sizeof(jobstr)-1, "%d", pjob->sysjob);
135
 
        return print_run_command(snum, PRINTERNAME(snum), True,
 
135
        return print_run_command(snum, lp_printername(snum), True,
136
136
                                 lp_lpresumecommand(snum), NULL,
137
137
                                 "%j", jobstr,
138
138
                                 NULL);
194
194
        slprintf(job_size, sizeof(job_size)-1, "%lu", (unsigned long)pjob->size);
195
195
 
196
196
        /* send it to the system spooler */
197
 
        ret = print_run_command(snum, PRINTERNAME(snum), True,
 
197
        ret = print_run_command(snum, lp_printername(snum), True,
198
198
                        lp_printcommand(snum), NULL,
199
199
                        "%s", p,
200
200
                        "%J", jobname,
274
274
****************************************************************************/
275
275
static int generic_queue_pause(int snum)
276
276
{
277
 
        return print_run_command(snum, PRINTERNAME(snum), True, lp_queuepausecommand(snum), NULL, NULL);
 
277
        return print_run_command(snum, lp_printername(snum), True,
 
278
                                 lp_queuepausecommand(snum), NULL, NULL);
278
279
}
279
280
 
280
281
/****************************************************************************
282
283
****************************************************************************/
283
284
static int generic_queue_resume(int snum)
284
285
{
285
 
        return print_run_command(snum, PRINTERNAME(snum), True, lp_queueresumecommand(snum), NULL, NULL);
 
286
        return print_run_command(snum, lp_printername(snum), True,
 
287
                                 lp_queueresumecommand(snum), NULL, NULL);
286
288
}
287
289
 
288
290
/****************************************************************************