diff options
| author | Jean-François Micouleau <jfm@samba.org> | 1999-04-27 10:43:32 +0000 |
|---|---|---|
| committer | Jean-François Micouleau <jfm@samba.org> | 1999-04-27 10:43:32 +0000 |
| commit | be552ca3504ebd98da37e70bac1f10b248cf860b (patch) | |
| tree | 7d9ebfa1b2637941e75133b2dc815ff4a192fcfb /source3/param/loadparm.c | |
| parent | de0c233a7ae5eab1e0f5a2c07eca3269b0bd9cdc (diff) | |
| download | samba-be552ca3504ebd98da37e70bac1f10b248cf860b.tar.gz samba-be552ca3504ebd98da37e70bac1f10b248cf860b.tar.bz2 samba-be552ca3504ebd98da37e70bac1f10b248cf860b.zip | |
rpc_parse/parse_misc.c : defined a new BUFFER5 struct
include/ntdomain.h : added rpc_spoolss.h include statement
include/proto.h
include/rpc_dce.h : added definition of RPC_ALTER_CONTEXT request &
reply
param/loadparm.c : 2 new options for NT printing support and some
changes to initial values in the LPRNG case.
rpc_parse/parse_prs.c : added prs_uint16s()
rpc_parse/parse_rpc.c : added SYNT_SPOOLSS_V1 and code for the
alter-context support.
rpc_server/srv_pipe.c : alter-context support
smbd/nttrans.c
smbd/server.c
include/rpc_misc.h
Makefile.in
include/smb.h
Jean Francois
(This used to be commit 4c515804b70254248e378a3f90f47e4c32639d29)
Diffstat (limited to 'source3/param/loadparm.c')
| -rw-r--r-- | source3/param/loadparm.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index b55a4f3d21..142ab4af32 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -153,6 +153,8 @@ typedef struct char *szLdapPasswdFile; #endif /* WITH_LDAP */ char *szPanicAction; + char *szNtForms; + char *szNtDriverFile; int max_log_size; int mangled_stack; int max_xmit; @@ -676,6 +678,8 @@ static struct parm_struct parm_table[] = {"printer", P_STRING, P_LOCAL, &sDefault.szPrintername, NULL, NULL, 0}, {"printer driver", P_STRING, P_LOCAL, &sDefault.szPrinterDriver, NULL, NULL, 0}, {"printer driver location", P_STRING, P_LOCAL, &sDefault.szPrinterDriverLocation, NULL, NULL, FLAG_GLOBAL}, + {"nt forms file", P_STRING, P_GLOBAL, &Globals.szNtForms, NULL, NULL, FLAG_GLOBAL}, + {"nt printer driver",P_STRING, P_GLOBAL, &Globals.szNtDriverFile, NULL, NULL, FLAG_GLOBAL}, {"Filename Handling", P_SEP, P_SEPARATOR}, {"strip dot", P_BOOL, P_GLOBAL, &Globals.bStripDot, NULL, NULL, 0}, @@ -860,6 +864,8 @@ static void init_globals(void) string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM); string_set(&Globals.szPrintcapname, PRINTCAP_NAME); string_set(&Globals.szDriverFile, DRIVERFILE); + string_set(&Globals.szNtForms, FORMSFILE); + string_set(&Globals.szNtDriverFile, NTDRIVERSDIR); string_set(&Globals.szLockDir, LOCKDIR); string_set(&Globals.szRootdir, "/"); string_set(&Globals.szSmbrun, SMBRUN); @@ -1028,12 +1034,21 @@ static void init_locals(void) { case PRINT_BSD: case PRINT_AIX: - case PRINT_LPRNG: case PRINT_PLP: string_initial(&sDefault.szLpqcommand,"lpq -P%p"); string_initial(&sDefault.szLprmcommand,"lprm -P%p %j"); string_initial(&sDefault.szPrintcommand,"lpr -r -P%p %s"); break; + + case PRINT_LPRNG: + string_initial(&sDefault.szLpqcommand,"lpq -P%p"); + string_initial(&sDefault.szLprmcommand,"lprm -P%p %j"); + string_initial(&sDefault.szPrintcommand,"lpr -r -P%p %s"); + string_initial(&sDefault.szQueuepausecommand, "lpc stop %p"); + string_initial(&sDefault.szQueueresumecommand, "lpc start %p"); + string_initial(&sDefault.szLppausecommand,"lpc hold %p %j"); + string_initial(&sDefault.szLpresumecommand,"lpc release %p %j"); + break; case PRINT_SYSV: case PRINT_HPUX: @@ -1186,6 +1201,8 @@ static FN_GLOBAL_STRING(lp_announce_version,&Globals.szAnnounceVersion) FN_GLOBAL_STRING(lp_netbios_aliases,&Globals.szNetbiosAliases) FN_GLOBAL_STRING(lp_driverfile,&Globals.szDriverFile) FN_GLOBAL_STRING(lp_panic_action,&Globals.szPanicAction) +FN_GLOBAL_STRING(lp_nt_forms,&Globals.szNtForms) +FN_GLOBAL_STRING(lp_nt_drivers_file,&Globals.szNtDriverFile) #ifdef WITH_LDAP FN_GLOBAL_STRING(lp_ldap_server,&Globals.szLdapServer); |