diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-02-19 13:30:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:18:04 -0500 |
| commit | 8dbeb4dbebb3e8cdcb83df195a91e77ac86f240a (patch) | |
| tree | 63527df099275d4f0894d59c7675c875daa12820 | |
| parent | 4218d574d718255f5f180d8d13bde450ffa5b548 (diff) | |
| download | samba-8dbeb4dbebb3e8cdcb83df195a91e77ac86f240a.tar.gz samba-8dbeb4dbebb3e8cdcb83df195a91e77ac86f240a.tar.bz2 samba-8dbeb4dbebb3e8cdcb83df195a91e77ac86f240a.zip | |
r21446: Karolins "printjob username"
(This used to be commit 19ee6779255a269830fa8ee51468a4738dadf942)
| -rw-r--r-- | source3/param/loadparm.c | 5 | ||||
| -rw-r--r-- | source3/printing/printing.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 7abbd0ca4e..8d7e3f06bb 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -349,6 +349,7 @@ typedef struct { char *szQueuepausecommand; char *szQueueresumecommand; char *szPrintername; + char *szPrintjobUsername; char *szDontdescend; char **szHostsallow; char **szHostsdeny; @@ -488,6 +489,7 @@ static service sDefault = { NULL, /* szQueuepausecommand */ NULL, /* szQueueresumecommand */ NULL, /* szPrintername */ + NULL, /* szPrintjobUsername */ NULL, /* szDontdescend */ NULL, /* szHostsallow */ NULL, /* szHostsdeny */ @@ -1065,6 +1067,7 @@ static struct parm_struct parm_table[] = { {"use client driver", P_BOOL, P_LOCAL, &sDefault.bUseClientDriver, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT}, {"default devmode", P_BOOL, P_LOCAL, &sDefault.bDefaultDevmode, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT}, {"force printername", P_BOOL, P_LOCAL, &sDefault.bForcePrintername, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT}, + {"printjob username", P_STRING, P_LOCAL, &sDefault.szPrintjobUsername, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT}, {N_("Filename Handling"), P_SEP, P_SEPARATOR}, {"mangling method", P_STRING, P_GLOBAL, &Globals.szManglingMethod, NULL, NULL, FLAG_ADVANCED}, @@ -1409,6 +1412,7 @@ static void init_globals(BOOL first_time_only) string_set((char **)parm_table[i].ptr, ""); string_set(&sDefault.fstype, FSTYPE_STRING); + string_set(&sDefault.szPrintjobUsername, "%U"); init_printer_values(&sDefault); @@ -1995,6 +1999,7 @@ FN_LOCAL_STRING(lp_lpresumecommand, szLpresumecommand) FN_LOCAL_STRING(lp_queuepausecommand, szQueuepausecommand) FN_LOCAL_STRING(lp_queueresumecommand, szQueueresumecommand) static FN_LOCAL_STRING(_lp_printername, szPrintername) +FN_LOCAL_CONST_STRING(lp_printjob_username, szPrintjobUsername) FN_LOCAL_LIST(lp_hostsallow, szHostsallow) FN_LOCAL_LIST(lp_hostsdeny, szHostsdeny) FN_LOCAL_STRING(lp_magicscript, szMagicScript) diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 588641358f..39efe19604 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -2396,7 +2396,11 @@ uint32 print_job_start(struct current_user *user, int snum, char *jobname, NT_DE fstrcpy(pjob.jobname, jobname); if ((vuser = get_valid_user_struct(user->vuid)) != NULL) { - fstrcpy(pjob.user, vuser->user.smb_name); + fstrcpy(pjob.user, lp_printjob_username(snum)); + standard_sub_basic(vuser->user.smb_name, vuser->user.domain, + pjob.user, sizeof(pjob.user)-1); + /* ensure NULL termination */ + pjob.user[sizeof(pjob.user)-1] = '\0'; } else { fstrcpy(pjob.user, uidtoname(user->ut.uid)); } |