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
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
|
This directory was created from eBones by the following procedure:
1) Get the files listed in the Makefile
2) perl -spi.bak -e 's/\$(Header[^\$]*)\$/$1/g'
3) Apply the patch listed below.
diff -rc2 ../kadmind.orig/admin_server.c ./admin_server.c
*** ../kadmind.orig/admin_server.c Thu Jan 19 18:04:04 1995
--- ./admin_server.c Thu Jan 19 21:58:51 1995
***************
*** 1,10 ****
/*
- * $Source: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/admin_server.c,v $
- * $Author: jtkohl $
- *
* Copyright 1988 by the Massachusetts Institute of Technology.
*
* For copying and distribution information, please see the file
! * <mit-copyright.h>.
*
* Top-level loop of the kerberos Administration server
--- 1,7 ----
/*
* Copyright 1988 by the Massachusetts Institute of Technology.
*
* For copying and distribution information, please see the file
! * Copyright.MIT.
*
* Top-level loop of the kerberos Administration server
***************
*** 12,20 ****
#ifndef lint
static char rcsid_admin_server_c[] =
! "$Id: admin_server.c,v 4.8 90/01/02 13:50:38 jtkohl Exp $";
#endif lint
- #include <mit-copyright.h>
/*
admin_server.c
--- 9,20 ----
#ifndef lint
+ #if 0
static char rcsid_admin_server_c[] =
! "Id: admin_server.c,v 4.8 90/01/02 13:50:38 jtkohl Exp ";
! #endif
! static const char rcsid[] =
! "$Id";
#endif lint
/*
admin_server.c
***************
*** 389,393 ****
--- 389,397 ----
register int i, j;
+ #ifdef POSIX
+ int status;
+ #else
union wait status;
+ #endif
pid = wait(&status);
***************
*** 400,406 ****
pidarray[j] = pidarray[j+1];
pidarraysize--;
! if (status.w_retcode || status.w_coredump || status.w_termsig)
log("child %d: termsig %d, coredump %d, retcode %d", pid,
! status.w_termsig, status.w_coredump, status.w_retcode);
#ifdef POSIX
return;
--- 404,410 ----
pidarray[j] = pidarray[j+1];
pidarraysize--;
! if (WEXITSTATUS(status) || WCOREDUMP(status) || WIFSIGNALED(status))
log("child %d: termsig %d, coredump %d, retcode %d", pid,
! WTERMSIG(status), WCOREDUMP(status), WEXITSTATUS(status));
#ifdef POSIX
return;
***************
*** 410,414 ****
}
log("child %d not in list: termsig %d, coredump %d, retcode %d", pid,
! status.w_termsig, status.w_coredump, status.w_retcode);
#ifdef POSIX
return;
--- 414,418 ----
}
log("child %d not in list: termsig %d, coredump %d, retcode %d", pid,
! WTERMSIG(status), WCOREDUMP(status), WEXITSTATUS(status));
#ifdef POSIX
return;
Only in .: admin_server.c~
diff -rc2 ../kadmind.orig/kadm_funcs.c ./kadm_funcs.c
*** ../kadmind.orig/kadm_funcs.c Thu Jan 19 18:04:04 1995
--- ./kadm_funcs.c Thu Jan 19 21:56:31 1995
***************
*** 1,10 ****
/*
- * $Source: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_funcs.c,v $
- * $Author: jon $
- *
* Copyright 1988 by the Massachusetts Institute of Technology.
*
* For copying and distribution information, please see the file
! * <mit-copyright.h>.
*
* Kerberos administration server-side database manipulation routines
--- 1,7 ----
/*
* Copyright 1988 by the Massachusetts Institute of Technology.
*
* For copying and distribution information, please see the file
! * Copyright.MIT
*
* Kerberos administration server-side database manipulation routines
***************
*** 12,20 ****
#ifndef lint
static char rcsid_kadm_funcs_c[] =
! "$Id: kadm_funcs.c,v 4.3 90/03/20 01:39:51 jon Exp $";
#endif lint
- #include <mit-copyright.h>
/*
kadm_funcs.c
--- 9,20 ----
#ifndef lint
+ #if 0
static char rcsid_kadm_funcs_c[] =
! "Id: kadm_funcs.c,v 4.3 90/03/20 01:39:51 jon Exp ";
! #endif
! static const char rcsid[] =
! "$Id$";
#endif lint
/*
kadm_funcs.c
Only in .: kadm_funcs.c~
diff -rc2 ../kadmind.orig/kadm_ser_wrap.c ./kadm_ser_wrap.c
*** ../kadmind.orig/kadm_ser_wrap.c Thu Jan 19 18:04:04 1995
--- ./kadm_ser_wrap.c Thu Jan 19 21:59:15 1995
***************
*** 1,10 ****
/*
- * $Source: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_ser_wrap.c,v $
- * $Author: jtkohl $
- *
* Copyright 1988 by the Massachusetts Institute of Technology.
*
* For copying and distribution information, please see the file
! * <mit-copyright.h>.
*
* Kerberos administration server-side support functions
--- 1,7 ----
/*
* Copyright 1988 by the Massachusetts Institute of Technology.
*
* For copying and distribution information, please see the file
! * Copyright.MIT.
*
* Kerberos administration server-side support functions
***************
*** 16,20 ****
#endif lint
- #include <mit-copyright.h>
/*
kadm_ser_wrap.c
--- 13,16 ----
Only in .: kadm_ser_wrap.c~
diff -rc2 ../kadmind.orig/kadm_server.c ./kadm_server.c
*** ../kadmind.orig/kadm_server.c Thu Jan 19 18:04:04 1995
--- ./kadm_server.c Thu Jan 19 21:59:31 1995
***************
*** 1,10 ****
/*
- * $Source: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_server.c,v $
- * $Author: jtkohl $
- *
* Copyright 1988 by the Massachusetts Institute of Technology.
*
* For copying and distribution information, please see the file
! * <mit-copyright.h>.
*
* Kerberos administration server-side subroutines
--- 1,7 ----
/*
* Copyright 1988 by the Massachusetts Institute of Technology.
*
* For copying and distribution information, please see the file
! * Copyright.MIT.
*
* Kerberos administration server-side subroutines
***************
*** 15,20 ****
"Header: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kadm_server.c,v 4.2 89/09/26 09:30:23 jtkohl Exp ";
#endif lint
-
- #include <mit-copyright.h>
#include <kadm.h>
--- 12,15 ----
Only in .: kadm_server.c~
diff -rc2 ../kadmind.orig/kadm_server.h ./kadm_server.h
*** ../kadmind.orig/kadm_server.h Thu Jan 19 18:04:05 1995
--- ./kadm_server.h Thu Jan 19 18:06:36 1995
***************
*** 7,11 ****
*
* For copying and distribution information, please see the file
! * <mit-copyright.h>.
*
* Definitions for Kerberos administration server & client
--- 7,11 ----
*
* For copying and distribution information, please see the file
! * Copyright.MIT.
*
* Definitions for Kerberos administration server & client
***************
*** 15,19 ****
#define KADM_SERVER_DEFS
- #include <mit-copyright.h>
/*
* kadm_server.h
--- 15,18 ----
***************
*** 25,30 ****
#include <sys/types.h>
! #include <krb.h>
! #include <des.h>
typedef struct {
--- 24,29 ----
#include <sys/types.h>
! #include <kerberosIV/krb.h>
! #include <kerberosIV/des.h>
typedef struct {
***************
*** 43,49 ****
/* the default syslog file */
! #define KADM_SYSLOG "/kerberos/admin_server.syslog"
! #define DEFAULT_ACL_DIR "/kerberos"
#define ADD_ACL_FILE "/admin_acl.add"
#define GET_ACL_FILE "/admin_acl.get"
--- 42,48 ----
/* the default syslog file */
! #define KADM_SYSLOG "/var/log/kadmind.syslog"
! #define DEFAULT_ACL_DIR "/etc/kerberosIV"
#define ADD_ACL_FILE "/admin_acl.add"
#define GET_ACL_FILE "/admin_acl.get"
|
