Skip to content

Commit 977ba4e

Browse files
committed
Finish dropping old flag
1 parent ba7c451 commit 977ba4e

1 file changed

Lines changed: 0 additions & 16 deletions

File tree

src/C/init-kcron-keytab.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,7 @@
6969

7070
static inline int mkdir_if_missing(const char *dir, uid_t owner, gid_t group, mode_t mode) __attribute__((access(read_only, 1))) __attribute__((warn_unused_result));
7171
static inline int mkdir_if_missing(const char *dir, uid_t owner, gid_t group, mode_t mode) {
72-
#if USE_CAPABILITIES == 1
7372
const cap_value_t caps[] = {CAP_CHOWN, CAP_DAC_OVERRIDE};
74-
#else
75-
const cap_value_t caps[] = {-1};
76-
#endif
7773
const int num_caps = sizeof(caps) / sizeof(cap_value_t);
7874

7975
struct stat st = {0};
@@ -166,11 +162,7 @@ static inline int mkdir_if_missing(const char *dir, uid_t owner, gid_t group, mo
166162
static inline int chown_chmod_keytab(int filedescriptor, const char *keytab) __attribute__((access(read_only, 2))) __attribute__((warn_unused_result));
167163
static inline int chown_chmod_keytab(int filedescriptor, const char *keytab) {
168164

169-
#if USE_CAPABILITIES == 1
170165
const cap_value_t keytab_caps[] = {CAP_CHOWN, CAP_DAC_OVERRIDE};
171-
#else
172-
const cap_value_t keytab_caps[] = {-1};
173-
#endif
174166
const int num_caps = sizeof(keytab_caps) / sizeof(cap_value_t);
175167

176168
const uid_t uid = getuid();
@@ -283,11 +275,7 @@ static int create_keytab_file(const char *keytab_dirname, const char *keytab_fil
283275
DIR *keytab_dir = NULL;
284276
int filedescriptor = -1;
285277

286-
#if USE_CAPABILITIES == 1
287278
const cap_value_t caps[] = {CAP_DAC_OVERRIDE};
288-
#else
289-
const cap_value_t caps[] = {-1};
290-
#endif
291279
const int num_caps = sizeof(caps) / sizeof(cap_value_t);
292280

293281
/* Validate non-null input pointers */
@@ -404,11 +392,7 @@ void constructor(void) {
404392
int main(void) {
405393
struct stat st = {0};
406394

407-
#if USE_CAPABILITIES == 1
408395
const cap_value_t caps[] = {CAP_DAC_OVERRIDE};
409-
#else
410-
const cap_value_t caps[] = {-1};
411-
#endif
412396
const int num_caps = sizeof(caps) / sizeof(cap_value_t);
413397

414398
const uid_t uid = getuid();

0 commit comments

Comments
 (0)