1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
|
*** common.h Sat Feb 27 08:48:17 1993
--- common.h Thu Oct 6 14:35:00 1994
***************
*** 60,65 ****
--- 60,69 ----
**=====================================================================
*/
+ #ifdef HAVE_PARAM_H
+ #include <sys/param.h>
+ #endif
+
/*
**---------------------------------------------------------------------
** Define the following symbol to enable the use of a
***************
*** 268,281 ****
#define SUNOS_403C
#endif
! #ifdef OSVER_BSD386
#define BSD_STYLE_PRINT
#define BSD_STYLE_PR_LIST
#define BSD_STYLE_QUEUE
#define BSD_STYLE_CANCEL
#define BSD_STYLE_STATUS
#define BSD_STYLE_MONITOR
! #define BSD386
#endif
#ifdef OSVER_ULTRIX
--- 272,285 ----
#define SUNOS_403C
#endif
! #if (defined(BSD) && (BSD >= 199103))
#define BSD_STYLE_PRINT
#define BSD_STYLE_PR_LIST
#define BSD_STYLE_QUEUE
#define BSD_STYLE_CANCEL
#define BSD_STYLE_STATUS
#define BSD_STYLE_MONITOR
! #define GETUSERSHELL
#endif
#ifdef OSVER_ULTRIX
*** pcnfsd_misc.c Sat Feb 27 08:48:14 1993
--- pcnfsd_misc.c Thu Oct 6 14:32:17 1994
***************
*** 480,486 ****
#else SVR4
#include <utmp.h>
! #define WTMP_PATH "/usr/adm/wtmp"
void
wlogin(name)
--- 480,488 ----
#else SVR4
#include <utmp.h>
! #ifndef _PATH_WTMP
! #define _PATH_WTMP "/usr/adm/wtmp"
! #endif
void
wlogin(name)
***************
*** 499,505 ****
(void) strncpy(ut.ut_name,name,sizeof ut.ut_name);
ut.ut_time = time( (time_t *) 0);
(void) strncpy(ut.ut_host, getcallername(), sizeof ut.ut_host);
! if ((fd = open(WTMP_PATH, O_WRONLY|O_APPEND, 0)) >= 0) {
(void)write(fd, (char *)&ut, sizeof(ut));
(void)close(fd);
}
--- 501,507 ----
(void) strncpy(ut.ut_name,name,sizeof ut.ut_name);
ut.ut_time = time( (time_t *) 0);
(void) strncpy(ut.ut_host, getcallername(), sizeof ut.ut_host);
! if ((fd = open(_PATH_WTMP, O_WRONLY|O_APPEND, 0)) >= 0) {
(void)write(fd, (char *)&ut, sizeof(ut));
(void)close(fd);
}
*** pcnfsd_print.c Fri Jan 29 23:52:04 1993
--- pcnfsd_print.c Thu Apr 27 12:43:01 1995
***************
*** 395,407 ****
*/
if(!xcmd) {
#ifdef BSD_STYLE_PRINT
! #ifdef BSD386
sprintf(cmdbuf, "/usr/bin/lpr -P%s -C%s -J%s %s",
pr, system, user, new_pathname);
#else
sprintf(cmdbuf, "/usr/ucb/lpr -P%s -C%s -J%s %s",
pr, system, user, new_pathname);
! #endif BSD386
#endif BSD_STYLE_PRINT
#ifdef SVR4_STYLE_PRINT
sprintf(cmdbuf, "/usr/bin/lp -c -d%s %s",
--- 395,407 ----
*/
if(!xcmd) {
#ifdef BSD_STYLE_PRINT
! #if (defined(BSD) && (BSD >= 199103))
sprintf(cmdbuf, "/usr/bin/lpr -P%s -C%s -J%s %s",
pr, system, user, new_pathname);
#else
sprintf(cmdbuf, "/usr/ucb/lpr -P%s -C%s -J%s %s",
pr, system, user, new_pathname);
! #endif
#endif BSD_STYLE_PRINT
#ifdef SVR4_STYLE_PRINT
sprintf(cmdbuf, "/usr/bin/lp -c -d%s %s",
***************
*** 686,696 ****
char *cp;
int saw_system;
! #ifdef BSD386
p = popen("/usr/sbin/lpc status", "r");
#else
p = popen("/usr/etc/lpc status", "r");
! #endif BSD386
if(p == NULL) {
printers = list_virtual_printers();
return(1);
--- 686,696 ----
char *cp;
int saw_system;
! #if (defined(BSD) && (BSD >= 199103))
p = popen("/usr/sbin/lpc status", "r");
#else
p = popen("/usr/etc/lpc status", "r");
! #endif
if(p == NULL) {
printers = list_virtual_printers();
return(1);
***************
*** 975,981 ****
--- 975,985 ----
if(pn == NULL || suspicious(pn) || !valid_pr(pn))
return(PI_RES_NO_SUCH_PRINTER);
+ #if (defined(BSD) && (BSD >= 199103))
+ sprintf(buff, "/usr/bin/lpq -P%s", pn);
+ #else
sprintf(buff, "/usr/ucb/lpq -P%s", pn);
+ #endif
p = su_popen(user, buff, MAXTIME_FOR_QUEUE);
if(p == NULL) {
***************
*** 1234,1244 ****
sprintf(pname, "%s:", pn);
n = strlen(pname);
! #ifdef BSD386
sprintf(cmd, "/usr/sbin/lpc status %s", pn);
#else
sprintf(cmd, "/usr/etc/lpc status %s", pn);
! #endif BSD386
p = popen(cmd, "r");
if(p == NULL) {
msg_out("rpc.pcnfsd: unable to popen() lpc status");
--- 1238,1248 ----
sprintf(pname, "%s:", pn);
n = strlen(pname);
! #if (defined(BSD) && (BSD >= 199103))
sprintf(cmd, "/usr/sbin/lpc status %s", pn);
#else
sprintf(cmd, "/usr/etc/lpc status %s", pn);
! #endif
p = popen(cmd, "r");
if(p == NULL) {
msg_out("rpc.pcnfsd: unable to popen() lpc status");
***************
*** 1404,1414 ****
if(suspicious(id))
return(PC_RES_NO_SUCH_JOB);
! #ifdef BSD386
sprintf(cmdbuf, "/usr/bin/lprm -P%s %s", pr, id);
#else
sprintf(cmdbuf, "/usr/ucb/lprm -P%s %s", pr, id);
! #endif BSD386
if ((fd = su_popen(user, cmdbuf, MAXTIME_FOR_CANCEL)) == NULL) {
msg_out("rpc.pcnfsd: su_popen failed");
return(PC_RES_FAIL);
--- 1408,1418 ----
if(suspicious(id))
return(PC_RES_NO_SUCH_JOB);
! #if (defined(BSD) && (BSD >= 199103))
sprintf(cmdbuf, "/usr/bin/lprm -P%s %s", pr, id);
#else
sprintf(cmdbuf, "/usr/ucb/lprm -P%s %s", pr, id);
! #endif
if ((fd = su_popen(user, cmdbuf, MAXTIME_FOR_CANCEL)) == NULL) {
msg_out("rpc.pcnfsd: su_popen failed");
return(PC_RES_FAIL);
***************
*** 1487,1497 ****
char default_cmd[] = "lp $FILE";
#endif SVR4_STYLE_PRINT
#ifdef BSD_STYLE_PRINT
! #ifdef BSD386
char default_cmd[] = "/usr/bin/lpr $FILE";
#else
char default_cmd[] = "/usr/ucb/lpr $FILE";
! #endif BSD386
#endif BSD_STYLE_PRINT
void
--- 1491,1501 ----
char default_cmd[] = "lp $FILE";
#endif SVR4_STYLE_PRINT
#ifdef BSD_STYLE_PRINT
! #if (defined(BSD) && (BSD >= 199103))
char default_cmd[] = "/usr/bin/lpr $FILE";
#else
char default_cmd[] = "/usr/ucb/lpr $FILE";
! #endif
#endif BSD_STYLE_PRINT
void
|
