Deleted Added
sdiff udiff text old ( 87866 ) new ( 88282 )
full compact
subr.c (87866) subr.c (88282)
1/*
2 * Copyright (c) 2000, Boris Popov
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
1/*
2 * Copyright (c) 2000, Boris Popov
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 * $Id: subr.c,v 1.11 2001/04/16 04:33:01 bp Exp $
32 * $Id: subr.c,v 1.12 2001/08/22 03:31:37 bp Exp $
33 */
34
35#include <sys/param.h>
36#include <sys/types.h>
37#include <sys/errno.h>
38#include <sys/sysctl.h>
39#include <sys/syscall.h>
40#include <unistd.h>

--- 4 unchanged lines hidden (view full) ---

45#include <stdarg.h>
46#include <err.h>
47
48#include <netsmb/netbios.h>
49#include <netsmb/smb_lib.h>
50#include <netsmb/nb_lib.h>
51#include <cflib.h>
52
33 */
34
35#include <sys/param.h>
36#include <sys/types.h>
37#include <sys/errno.h>
38#include <sys/sysctl.h>
39#include <sys/syscall.h>
40#include <unistd.h>

--- 4 unchanged lines hidden (view full) ---

45#include <stdarg.h>
46#include <err.h>
47
48#include <netsmb/netbios.h>
49#include <netsmb/smb_lib.h>
50#include <netsmb/nb_lib.h>
51#include <cflib.h>
52
53#ifdef APPLE
54#include <sysexits.h>
55#include <sys/wait.h>
56#include <mach/mach.h>
57#include <mach/mach_error.h>
58
59uid_t real_uid, eff_uid;
60#endif
61
53extern char *__progname;
54
55static int smblib_initialized;
56
57struct rcfile *smb_rc;
58
59int
60smb_lib_init(void)

--- 108 unchanged lines hidden (view full) ---

169
170void *
171smb_dumptree(void)
172{
173 size_t len;
174 void *p;
175 int error;
176
62extern char *__progname;
63
64static int smblib_initialized;
65
66struct rcfile *smb_rc;
67
68int
69smb_lib_init(void)

--- 108 unchanged lines hidden (view full) ---

178
179void *
180smb_dumptree(void)
181{
182 size_t len;
183 void *p;
184 int error;
185
186#ifdef APPLE
187 seteuid(eff_uid); /* restore setuid root briefly */
188#endif
177 error = sysctlbyname("net.smb.treedump", NULL, &len, NULL, 0);
189 error = sysctlbyname("net.smb.treedump", NULL, &len, NULL, 0);
190#ifdef APPLE
191 seteuid(real_uid); /* and back to real user */
192#endif
178 if (error)
179 return NULL;
180 p = malloc(len);
181 if (p == NULL)
182 return NULL;
193 if (error)
194 return NULL;
195 p = malloc(len);
196 if (p == NULL)
197 return NULL;
198#ifdef APPLE
199 seteuid(eff_uid); /* restore setuid root briefly */
200#endif
183 error = sysctlbyname("net.smb.treedump", p, &len, NULL, 0);
201 error = sysctlbyname("net.smb.treedump", p, &len, NULL, 0);
202#ifdef APPLE
203 seteuid(real_uid); /* and back to real user */
204#endif
184 if (error) {
185 free(p);
186 return NULL;
187 }
188 return p;
189}
190
205 if (error) {
206 free(p);
207 return NULL;
208 }
209 return p;
210}
211
191void
212char *
192smb_simplecrypt(char *dst, const char *src)
193{
194 int ch, pos;
213smb_simplecrypt(char *dst, const char *src)
214{
215 int ch, pos;
216 char *dp;
195
217
218 if (dst == NULL) {
219 dst = malloc(4 + 2 * strlen(src));
220 if (dst == NULL)
221 return NULL;
222 }
223 dp = dst;
196 *dst++ = '$';
197 *dst++ = '$';
198 *dst++ = '1';
199 pos = 27;
200 while (*src) {
201 ch = *src++;
202 if (isascii(ch))
203 ch = (isupper(ch) ? ('A' + (ch - 'A' + 13) % 26) :
204 islower(ch) ? ('a' + (ch - 'a' + 13) % 26) : ch);
205 ch ^= pos;
206 pos += 13;
207 sprintf(dst, "%02x", ch);
208 dst += 2;
209 }
210 *dst = 0;
224 *dst++ = '$';
225 *dst++ = '$';
226 *dst++ = '1';
227 pos = 27;
228 while (*src) {
229 ch = *src++;
230 if (isascii(ch))
231 ch = (isupper(ch) ? ('A' + (ch - 'A' + 13) % 26) :
232 islower(ch) ? ('a' + (ch - 'a' + 13) % 26) : ch);
233 ch ^= pos;
234 pos += 13;
235 sprintf(dst, "%02x", ch);
236 dst += 2;
237 }
238 *dst = 0;
239 return dp;
211}
212
213int
214smb_simpledecrypt(char *dst, const char *src)
215{
216 char *ep, hexval[3];
217 int len, ch, pos;
218

--- 17 unchanged lines hidden (view full) ---

236 if (isascii(ch))
237 ch = (isupper(ch) ? ('A' + (ch - 'A' + 13) % 26) :
238 islower(ch) ? ('a' + (ch - 'a' + 13) % 26) : ch);
239 *dst++ = ch;
240 }
241 *dst = 0;
242 return 0;
243}
240}
241
242int
243smb_simpledecrypt(char *dst, const char *src)
244{
245 char *ep, hexval[3];
246 int len, ch, pos;
247

--- 17 unchanged lines hidden (view full) ---

265 if (isascii(ch))
266 ch = (isupper(ch) ? ('A' + (ch - 'A' + 13) % 26) :
267 islower(ch) ? ('a' + (ch - 'a' + 13) % 26) : ch);
268 *dst++ = ch;
269 }
270 *dst = 0;
271 return 0;
272}
273
274
275#ifdef APPLE
276static int
277safe_execv(char *args[])
278{
279 int pid;
280 union wait status;
281
282 pid = fork();
283 if (pid == 0) {
284 (void)execv(args[0], args);
285 errx(EX_OSERR, "%s: execv %s failed, %s\n", __progname,
286 args[0], strerror(errno));
287 }
288 if (pid == -1) {
289 fprintf(stderr, "%s: fork failed, %s\n", __progname,
290 strerror(errno));
291 return (1);
292 }
293 if (wait4(pid, (int *)&status, 0, NULL) != pid) {
294 fprintf(stderr, "%s: BUG executing %s command\n", __progname,
295 args[0]);
296 return (1);
297 } else if (!WIFEXITED(status)) {
298 fprintf(stderr, "%s: %s command aborted by signal %d\n",
299 __progname, args[0], WTERMSIG(status));
300 return (1);
301 } else if (WEXITSTATUS(status)) {
302 fprintf(stderr, "%s: %s command failed, exit status %d: %s\n",
303 __progname, args[0], WEXITSTATUS(status),
304 strerror(WEXITSTATUS(status)));
305 return (1);
306 }
307 return (0);
308}
309
310
311void
312dropsuid()
313{
314 /* drop setuid root privs asap */
315 eff_uid = geteuid();
316 real_uid = getuid();
317 seteuid(real_uid);
318 return;
319}
320
321
322static int
323kextisloaded(char * kextname)
324{
325 mach_port_t kernel_port;
326 kmod_info_t *k, *loaded_modules = 0;
327 int err, loaded_count = 0;
328
329 /* on error return not loaded - to make loadsmbvfs fail */
330
331 err = task_for_pid(mach_task_self(), 0, &kernel_port);
332 if (err) {
333 fprintf(stderr, "%s: %s: %s\n", __progname,
334 "unable to get kernel task port",
335 mach_error_string(err));
336 return (0);
337 }
338 err = kmod_get_info(kernel_port, (void *)&loaded_modules,
339 &loaded_count); /* never freed */
340 if (err) {
341 fprintf(stderr, "%s: %s: %s\n", __progname,
342 "kmod_get_info() failed",
343 mach_error_string(err));
344 return (0);
345 }
346 for (k = loaded_modules; k; k = k->next ? k+1 : 0)
347 if (!strcmp(k->name, kextname))
348 return (1);
349 return (0);
350}
351
352
353#define KEXTLOAD_COMMAND "/sbin/kextload"
354#define FS_KEXT_DIR "/System/Library/Extensions/smbfs.kext"
355#define FULL_KEXTNAME "com.apple.filesystems.smbfs"
356
357
358int
359loadsmbvfs()
360{
361 const char *kextargs[] = {KEXTLOAD_COMMAND, FS_KEXT_DIR, NULL};
362 int error = 0;
363
364 /*
365 * temporarily revert to root (required for kextload)
366 */
367 seteuid(eff_uid);
368 if (!kextisloaded(FULL_KEXTNAME)) {
369 error = safe_execv(kextargs);
370 if (!error)
371 error = !kextisloaded(FULL_KEXTNAME);
372 }
373 seteuid(real_uid); /* and back to real user */
374 return (error);
375}
376#endif /* APPLE */