]>
Commit | Line | Data |
---|---|---|
8d0c18a3 JR |
1 | --- amanda-3.2.0/amandad-src/amandad.c~ 2010-10-06 18:36:28.000000000 +0200 |
2 | +++ amanda-3.2.0/amandad-src/amandad.c 2010-11-29 14:23:20.580165324 +0100 | |
3 | @@ -440,6 +440,11 @@ | |
4 | exit_on_qlength = 1; | |
5 | } | |
6 | ||
7 | + /* krb5 require the euid to be 0 */ | |
8 | + if (strcasecmp(auth, "krb5") == 0) { | |
9 | + seteuid((uid_t)0); | |
10 | + } | |
11 | + | |
12 | #ifndef SINGLE_USERID | |
13 | if (geteuid() == 0) { | |
14 | if (strcasecmp(auth, "krb5") != 0) { | |
15 | @@ -474,11 +479,6 @@ | |
16 | dbprintf(_("WARNING: argv[0] not defined: check inetd.conf\n")); | |
17 | } | |
18 | ||
19 | - /* krb5 require the euid to be 0 */ | |
20 | - if (strcasecmp(auth, "krb5") == 0) { | |
21 | - seteuid((uid_t)0); | |
22 | - } | |
23 | - | |
24 | /* | |
25 | * Schedule to call protocol_accept() when new security handles | |
26 | * are created on stdin. | |
27 | --- amanda-3.2.0/common-src/krb5-security.c~ 2010-11-29 14:24:29.826165323 +0100 | |
28 | +++ amanda-3.2.0/common-src/krb5-security.c 2010-11-29 14:45:41.683165324 +0100 | |
29 | @@ -46,7 +46,7 @@ | |
30 | #include "et/com_err.h" | |
31 | #endif | |
32 | ||
33 | -#define BROKEN_MEMORY_CCACHE | |
34 | +#undef BROKEN_MEMORY_CCACHE | |
35 | ||
36 | #ifdef BROKEN_MEMORY_CCACHE | |
37 | /* | |
38 | @@ -712,7 +712,7 @@ | |
39 | beenhere = 1; | |
40 | ||
41 | #ifndef BROKEN_MEMORY_CCACHE | |
42 | - putenv(stralloc("KRB5_ENV_CCNAME=MEMORY:amanda_ccache")); | |
43 | + putenv(stralloc(KRB5_ENV_CCNAME"=MEMORY:amanda_ccache")); | |
44 | #else | |
45 | /* | |
46 | * MEMORY ccaches seem buggy and cause a lot of internal heap | |
47 | @@ -727,7 +727,7 @@ | |
48 | char *ccache; | |
49 | ccache = malloc(128); | |
50 | g_snprintf(ccache, SIZEOF(ccache), | |
51 | - "KRB5_ENV_CCNAME=FILE:/tmp/amanda_ccache.%ld.%ld", | |
52 | + KRB5_ENV_CCNAME"=FILE:/tmp/amanda_ccache.%ld.%ld", | |
53 | (long)geteuid(), (long)getpid()); | |
54 | putenv(ccache); | |
55 | } |