summaryrefslogtreecommitdiffstats
path: root/2006-001-patch_1.5.txt
blob: cc47dec3fb498e8b06ddc2873fc87d7af8567854 (plain)
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
268
Index: appl/gssftp/ftpd/ftpd.c
===================================================================
*** appl/gssftp/ftpd/ftpd.c	(revision 18440)
--- appl/gssftp/ftpd/ftpd.c	(working copy)
***************
*** 1367,1373 ****
  			goto bad;
  		sleep(tries);
  	}
! 	(void) krb5_seteuid((uid_t)pw->pw_uid);
  #ifdef IP_TOS
  #ifdef IPTOS_THROUGHPUT
  	on = IPTOS_THROUGHPUT;
--- 1367,1375 ----
  			goto bad;
  		sleep(tries);
  	}
! 	if (krb5_seteuid((uid_t)pw->pw_uid)) {
! 		fatal("seteuid user");
! 	}
  #ifdef IP_TOS
  #ifdef IPTOS_THROUGHPUT
  	on = IPTOS_THROUGHPUT;
***************
*** 1377,1383 ****
  #endif
  	return (fdopen(s, fmode));
  bad:
! 	(void) krb5_seteuid((uid_t)pw->pw_uid);
  	(void) close(s);
  	return (NULL);
  }
--- 1379,1387 ----
  #endif
  	return (fdopen(s, fmode));
  bad:
! 	if (krb5_seteuid((uid_t)pw->pw_uid)) {
! 		fatal("seteuid user");
! 	}
  	(void) close(s);
  	return (NULL);
  }
***************
*** 2186,2192 ****
  		(void) krb5_seteuid((uid_t)pw->pw_uid);
  		goto pasv_error;
  	}
! 	(void) krb5_seteuid((uid_t)pw->pw_uid);
  	len = sizeof(pasv_addr);
  	if (getsockname(pdata, (struct sockaddr *) &pasv_addr, &len) < 0)
  		goto pasv_error;
--- 2190,2198 ----
  		(void) krb5_seteuid((uid_t)pw->pw_uid);
  		goto pasv_error;
  	}
! 	if (krb5_seteuid((uid_t)pw->pw_uid)) {
! 		fatal("seteuid user");
! 	}
  	len = sizeof(pasv_addr);
  	if (getsockname(pdata, (struct sockaddr *) &pasv_addr, &len) < 0)
  		goto pasv_error;
Index: appl/bsd/v4rcp.c
===================================================================
*** appl/bsd/v4rcp.c	(revision 18440)
--- appl/bsd/v4rcp.c	(working copy)
***************
*** 436,442 ****
  			kstream_set_buffer_mode (krem, 0);
  #endif /* KERBEROS && !NOENCRYPTION */
  			(void) response();
! 			(void) setuid(userid);
  			source(--argc, ++argv);
  			exit(errs);
  
--- 436,445 ----
  			kstream_set_buffer_mode (krem, 0);
  #endif /* KERBEROS && !NOENCRYPTION */
  			(void) response();
! 			if (setuid(userid)) {
! 			    error("rcp: can't setuid(user)\n");
! 			    exit(1);
! 			}
  			source(--argc, ++argv);
  			exit(errs);
  
***************
*** 452,458 ****
  				krem = kstream_create_from_fd (rem, 0, 0);
  			kstream_set_buffer_mode (krem, 0);
  #endif /* KERBEROS && !NOENCRYPTION */
! 			(void) setuid(userid);
  			sink(--argc, ++argv);
  			exit(errs);
  
--- 455,464 ----
  				krem = kstream_create_from_fd (rem, 0, 0);
  			kstream_set_buffer_mode (krem, 0);
  #endif /* KERBEROS && !NOENCRYPTION */
! 			if (setuid(userid)) {
! 			    error("rcp: can't setuid(user)\n");
! 			    exit(1);
! 			}
  			sink(--argc, ++argv);
  			exit(errs);
  
Index: appl/bsd/krcp.c
===================================================================
*** appl/bsd/krcp.c	(revision 18440)
--- appl/bsd/krcp.c	(working copy)
***************
*** 620,626 ****
  				   
  		euid = geteuid();
  		if (euid == 0) {
! 		    (void) setuid(0);
  		    if(krb5_seteuid(userid)) {
  			perror("rcp seteuid user"); errs++; exit(errs);
  		    }
--- 620,628 ----
  				   
  		euid = geteuid();
  		if (euid == 0) {
! 		    if (setuid(0)) {
! 			perror("rcp setuid 0"); errs++; exit(errs);
! 		    }
  		    if(krb5_seteuid(userid)) {
  			perror("rcp seteuid user"); errs++; exit(errs);
  		    }
***************
*** 638,648 ****
  		  continue;
  		rcmd_stream_init_normal();
  #ifdef HAVE_SETREUID
! 		(void) setreuid(0, userid);
  		sink(1, argv+argc-1);
! 		(void) setreuid(userid, 0);
  #else
! 		(void) setuid(0);
  		if(seteuid(userid)) {
  		  perror("rcp seteuid user"); errs++; exit(errs);
  		}
--- 640,656 ----
  		  continue;
  		rcmd_stream_init_normal();
  #ifdef HAVE_SETREUID
! 		if (setreuid(0, userid)) {
! 		    perror("rcp setreuid 0,user"); errs++; exit(errs);
! 		}
  		sink(1, argv+argc-1);
! 		if (setreuid(userid, 0)) {
! 		    perror("rcp setreuid user,0"); errs++; exit(errs);
! 		}
  #else
! 		if (setuid(0)) {
! 		  perror("rcp setuid 0"); errs++; exit(errs);
! 		}
  		if(seteuid(userid)) {
  		  perror("rcp seteuid user"); errs++; exit(errs);
  		}
Index: appl/bsd/login.c
===================================================================
*** appl/bsd/login.c	(revision 18440)
--- appl/bsd/login.c	(working copy)
***************
*** 1648,1654 ****
  	}
  #endif	/* HAVE_SETLUID */
  #ifdef _IBMR2
!     setuidx(ID_LOGIN, pwd->pw_uid);
  #endif
  
      /* This call MUST succeed */
--- 1648,1657 ----
  	}
  #endif	/* HAVE_SETLUID */
  #ifdef _IBMR2
!     if (setuidx(ID_LOGIN, pwd->pw_uid) < 0) {
! 	perror("setuidx");
! 	sleepexit(1);
!     };
  #endif
  
      /* This call MUST succeed */
Index: appl/bsd/krshd.c
===================================================================
*** appl/bsd/krshd.c	(revision 18440)
--- appl/bsd/krshd.c	(working copy)
***************
*** 1403,1411 ****
       * If we're on a system which keeps track of login uids, then
       * set the login uid. 
       */
!     setluid((uid_t) pwd->pw_uid);
  #endif	/* HAVE_SETLUID */
!     (void) setuid((uid_t)pwd->pw_uid);
      /* if TZ is set in the parent, drag it in */
      {
        char **findtz = environ;
--- 1403,1417 ----
       * If we're on a system which keeps track of login uids, then
       * set the login uid. 
       */
!     if (setluid((uid_t) pwd->pw_uid) < 0) {
! 	perror("setluid");
! 	_exit(1);
!     }
  #endif	/* HAVE_SETLUID */
!     if (setuid((uid_t)pwd->pw_uid) < 0) {
! 	perror("setuid");
! 	_exit(1);
!     }
      /* if TZ is set in the parent, drag it in */
      {
        char **findtz = environ;
Index: clients/ksu/main.c
===================================================================
*** clients/ksu/main.c	(revision 18440)
--- clients/ksu/main.c	(working copy)
***************
*** 893,900 ****
      struct stat  st_temp;
  
      krb5_seteuid(0);
!     krb5_seteuid(target_uid);
!     
      cc_name = krb5_cc_get_name(context, cc);
      if ( ! stat(cc_name, &st_temp)){
  	if ((retval = krb5_cc_destroy(context, cc))){
--- 893,904 ----
      struct stat  st_temp;
  
      krb5_seteuid(0);
!     if (krb5_seteuid(target_uid) < 0) {
! 	com_err(prog_name, errno,
! 		"while changing to target uid for destroying ccache");
! 	exit(1);
!     }
! 
      cc_name = krb5_cc_get_name(context, cc);
      if ( ! stat(cc_name, &st_temp)){
  	if ((retval = krb5_cc_destroy(context, cc))){
Index: lib/krb4/kuserok.c
===================================================================
*** lib/krb4/kuserok.c	(revision 18440)
--- lib/krb4/kuserok.c	(working copy)
***************
*** 159,167 ****
  	 */
          if(getuid() == 0) {
  	  uid_t old_euid = geteuid();
! 	  seteuid(pwd->pw_uid);
  	  fp = fopen(pbuf, "r");
! 	  seteuid(old_euid);	  
  	  if ((fp) == NULL) {
  	    return(NOTOK);
  	  }
--- 159,169 ----
  	 */
          if(getuid() == 0) {
  	  uid_t old_euid = geteuid();
! 	  if (seteuid(pwd->pw_uid) < 0)
! 	      return NOTOK;
  	  fp = fopen(pbuf, "r");
! 	  if (seteuid(old_euid) < 0)
! 	      return NOTOK;
  	  if ((fp) == NULL) {
  	    return(NOTOK);
  	  }