isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove use of AC_HEADER_TIME, only obsolete platforms actually

Browse Source 
need this.  Also stop removing sys/time.h unless the source file
uses struct timeval.
This commit is contained in:
Todd C. Miller
2018-01-17 09:52:15 -07:00
parent b161ebe62d
commit a885b952fb
23 changed files with 80 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config.h.in
View File

@@ -1079,9 +1079,6 @@
/* Define to global, ppid or tty to set the default timestamp record type. */ /* Define to global, ppid or tty to set the default timestamp record type. */
#undef TIMESTAMP_TYPE #undef TIMESTAMP_TYPE
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME
/* The number of tries a user gets to enter their password. */ /* The number of tries a user gets to enter their password. */
#undef TRIES_FOR_PASSWORD #undef TRIES_FOR_PASSWORD

35
configure vendored
View File

@@ -17421,41 +17421,6 @@ fi
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
if ${ac_cv_header_time+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/time.h>
#include <time.h>
int
main ()
{
if ((struct tm *) 0)
return 0;
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_time=yes
else
ac_cv_header_time=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
$as_echo "$ac_cv_header_time" >&6; }
if test $ac_cv_header_time = yes; then
$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
if ${ac_cv_header_stdbool_h+:} false; then : if ${ac_cv_header_stdbool_h+:} false; then :

1
configure.ac
View File

@@ -2316,7 +2316,6 @@ dnl
dnl Header file checks dnl Header file checks
dnl dnl
AC_HEADER_DIRENT AC_HEADER_DIRENT
AC_HEADER_TIME
AC_HEADER_STDBOOL AC_HEADER_STDBOOL
AC_HEADER_MAJOR AC_HEADER_MAJOR
AC_CHECK_HEADERS_ONCE([netgroup.h paths.h spawn.h utmpx.h wordexp.h sys/sockio.h sys/bsdtypes.h sys/select.h sys/stropts.h sys/sysmacros.h]) AC_CHECK_HEADERS_ONCE([netgroup.h paths.h spawn.h utmpx.h wordexp.h sys/sockio.h sys/bsdtypes.h sys/select.h sys/stropts.h sys/sysmacros.h])

6
lib/util/gettime.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2015 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2014-2018 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -21,9 +21,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#ifdef TIME_WITH_SYS_TIME #include <time.h>
# include <time.h>
#endif
#include <errno.h> #include <errno.h>
#if defined(__MACH__) && !defined(HAVE_CLOCK_GETTIME) #if defined(__MACH__) && !defined(HAVE_CLOCK_GETTIME)

6
lib/util/mktemp.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001, 2003, 2004, 2008-2011, 2013, 2015, 2017 * Copyright (c) 2001, 2003, 2004, 2008-2011, 2013, 2015, 2017, 2018
* Todd C. Miller <Todd.Miller@sudo.ws> * Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@@ -38,9 +38,7 @@
#endif /* HAVE_STRINGS_H */ #endif /* HAVE_STRINGS_H */
#include <ctype.h> #include <ctype.h>
#include <unistd.h> #include <unistd.h>
#ifdef TIME_WITH_SYS_TIME #include <time.h>
# include <time.h>
#endif
#include "sudo_compat.h" #include "sudo_compat.h"
#include "pathnames.h" #include "pathnames.h"

6
lib/util/nanosleep.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009-2011, 2013, 2017 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2009-2011, 2013, 2017-2018 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -23,9 +23,7 @@
#ifdef HAVE_SYS_SELECT_H #ifdef HAVE_SYS_SELECT_H
#include <sys/select.h> #include <sys/select.h>
#endif /* HAVE_SYS_SELECT_H */ #endif /* HAVE_SYS_SELECT_H */
#if TIME_WITH_SYS_TIME #include <time.h>
# include <time.h>
#endif
#include <errno.h> #include <errno.h>
#include "sudo_compat.h" #include "sudo_compat.h"

6
lib/util/utimens.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2015, 2018 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -23,9 +23,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#ifdef TIME_WITH_SYS_TIME #include <time.h>
# include <time.h>
#endif
#if !defined(HAVE_UTIMES) || defined(HAVE_FUTIME) #if !defined(HAVE_UTIMES) || defined(HAVE_FUTIME)
# include <utime.h> # include <utime.h>
#endif #endif

6
plugins/sudoers/boottime.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009-2015 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2009-2015, 2018 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -34,9 +34,7 @@
#endif /* HAVE_STRINGS_H */ #endif /* HAVE_STRINGS_H */
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#ifdef TIME_WITH_SYS_TIME #include <time.h>
# include <time.h>
#endif
#ifndef __linux__ #ifndef __linux__
# if defined(HAVE_SYSCTL) && defined(KERN_BOOTTIME) # if defined(HAVE_SYSCTL) && defined(KERN_BOOTTIME)
# include <sys/sysctl.h> # include <sys/sysctl.h>

7
plugins/sudoers/check.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1993-1996,1998-2005, 2007-2016 * Copyright (c) 1993-1996,1998-2005, 2007-2018
* Todd C. Miller <Todd.Miller@sudo.ws> * Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@@ -22,7 +22,6 @@
#include <config.h> #include <config.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
@@ -32,9 +31,7 @@
# include <strings.h> # include <strings.h>
#endif /* HAVE_STRINGS_H */ #endif /* HAVE_STRINGS_H */
#include <unistd.h> #include <unistd.h>
#ifdef TIME_WITH_SYS_TIME #include <time.h>
# include <time.h>
#endif
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <pwd.h> #include <pwd.h>

90
plugins/sudoers/getdate.c
View File

@@ -27,7 +27,6 @@
#include <config.h> #include <config.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
@@ -41,9 +40,7 @@
#elif defined(HAVE_INTTYPES_H) #elif defined(HAVE_INTTYPES_H)
# include <inttypes.h> # include <inttypes.h>
#endif #endif
#ifdef TIME_WITH_SYS_TIME #include <time.h>
# include <time.h>
#endif
#include <limits.h> #include <limits.h>
#include <ctype.h> #include <ctype.h>
@@ -110,7 +107,7 @@ static int yyerror(const char *s);
static int yylex(void); static int yylex(void);
int yyparse(void); int yyparse(void);
#line 103 "getdate.y" #line 100 "getdate.y"
#ifndef YYSTYPE_DEFINED #ifndef YYSTYPE_DEFINED
#define YYSTYPE_DEFINED #define YYSTYPE_DEFINED
typedef union { typedef union {
@@ -118,7 +115,7 @@ typedef union {
enum _MERIDIAN Meridian; enum _MERIDIAN Meridian;
} YYSTYPE; } YYSTYPE;
#endif /* YYSTYPE_DEFINED */ #endif /* YYSTYPE_DEFINED */
#line 121 "getdate.c" #line 118 "getdate.c"
#define tAGO 257 #define tAGO 257
#define tDAY 258 #define tDAY 258
#define tDAYZONE 259 #define tDAYZONE 259
@@ -386,7 +383,8 @@ short *yyss;
short *yysslim; short *yysslim;
YYSTYPE *yyvs; YYSTYPE *yyvs;
unsigned int yystacksize; unsigned int yystacksize;
#line 322 "getdate.y" int yyparse(void);
#line 319 "getdate.y"
/* Month and day table. */ /* Month and day table. */
static TABLE const MonthDayTable[] = { static TABLE const MonthDayTable[] = {
@@ -1008,7 +1006,7 @@ main(int argc, char *argv[])
/* NOTREACHED */ /* NOTREACHED */
} }
#endif /* TEST */ #endif /* TEST */
#line 959 "getdate.c" #line 957 "getdate.c"
/* allocate initial stack or double stack size, up to YYMAXDEPTH */ /* allocate initial stack or double stack size, up to YYMAXDEPTH */
#if defined(__cplusplus) || defined(__STDC__) #if defined(__cplusplus) || defined(__STDC__)
static int yygrowstack(void) static int yygrowstack(void)
@@ -1217,37 +1215,37 @@ yyreduce:
switch (yyn) switch (yyn)
{ {
case 3: case 3:
#line 121 "getdate.y" #line 118 "getdate.y"
{ {
yyHaveTime++; yyHaveTime++;
} }
break; break;
case 4: case 4:
#line 124 "getdate.y" #line 121 "getdate.y"
{ {
yyHaveZone++; yyHaveZone++;
} }
break; break;
case 5: case 5:
#line 127 "getdate.y" #line 124 "getdate.y"
{ {
yyHaveDate++; yyHaveDate++;
} }
break; break;
case 6: case 6:
#line 130 "getdate.y" #line 127 "getdate.y"
{ {
yyHaveDay++; yyHaveDay++;
} }
break; break;
case 7: case 7:
#line 133 "getdate.y" #line 130 "getdate.y"
{ {
yyHaveRel++; yyHaveRel++;
} }
break; break;
case 9: case 9:
#line 139 "getdate.y" #line 136 "getdate.y"
{ {
yyHour = yyvsp[-1].Number; yyHour = yyvsp[-1].Number;
yyMinutes = 0; yyMinutes = 0;
@@ -1256,7 +1254,7 @@ case 9:
} }
break; break;
case 10: case 10:
#line 145 "getdate.y" #line 142 "getdate.y"
{ {
yyHour = yyvsp[-3].Number; yyHour = yyvsp[-3].Number;
yyMinutes = yyvsp[-1].Number; yyMinutes = yyvsp[-1].Number;
@@ -1265,7 +1263,7 @@ case 10:
} }
break; break;
case 11: case 11:
#line 151 "getdate.y" #line 148 "getdate.y"
{ {
yyHour = yyvsp[-3].Number; yyHour = yyvsp[-3].Number;
yyMinutes = yyvsp[-1].Number; yyMinutes = yyvsp[-1].Number;
@@ -1275,7 +1273,7 @@ case 11:
} }
break; break;
case 12: case 12:
#line 158 "getdate.y" #line 155 "getdate.y"
{ {
yyHour = yyvsp[-5].Number; yyHour = yyvsp[-5].Number;
yyMinutes = yyvsp[-3].Number; yyMinutes = yyvsp[-3].Number;
@@ -1284,7 +1282,7 @@ case 12:
} }
break; break;
case 13: case 13:
#line 164 "getdate.y" #line 161 "getdate.y"
{ {
yyHour = yyvsp[-5].Number; yyHour = yyvsp[-5].Number;
yyMinutes = yyvsp[-3].Number; yyMinutes = yyvsp[-3].Number;
@@ -1295,56 +1293,56 @@ case 13:
} }
break; break;
case 14: case 14:
#line 174 "getdate.y" #line 171 "getdate.y"
{ {
yyTimezone = yyvsp[0].Number; yyTimezone = yyvsp[0].Number;
yyDSTmode = DSToff; yyDSTmode = DSToff;
} }
break; break;
case 15: case 15:
#line 178 "getdate.y" #line 175 "getdate.y"
{ {
yyTimezone = yyvsp[0].Number; yyTimezone = yyvsp[0].Number;
yyDSTmode = DSTon; yyDSTmode = DSTon;
} }
break; break;
case 16: case 16:
#line 183 "getdate.y" #line 180 "getdate.y"
{ {
yyTimezone = yyvsp[-1].Number; yyTimezone = yyvsp[-1].Number;
yyDSTmode = DSTon; yyDSTmode = DSTon;
} }
break; break;
case 17: case 17:
#line 189 "getdate.y" #line 186 "getdate.y"
{ {
yyDayOrdinal = 1; yyDayOrdinal = 1;
yyDayNumber = yyvsp[0].Number; yyDayNumber = yyvsp[0].Number;
} }
break; break;
case 18: case 18:
#line 193 "getdate.y" #line 190 "getdate.y"
{ {
yyDayOrdinal = 1; yyDayOrdinal = 1;
yyDayNumber = yyvsp[-1].Number; yyDayNumber = yyvsp[-1].Number;
} }
break; break;
case 19: case 19:
#line 197 "getdate.y" #line 194 "getdate.y"
{ {
yyDayOrdinal = yyvsp[-1].Number; yyDayOrdinal = yyvsp[-1].Number;
yyDayNumber = yyvsp[0].Number; yyDayNumber = yyvsp[0].Number;
} }
break; break;
case 20: case 20:
#line 203 "getdate.y" #line 200 "getdate.y"
{ {
yyMonth = yyvsp[-2].Number; yyMonth = yyvsp[-2].Number;
yyDay = yyvsp[0].Number; yyDay = yyvsp[0].Number;
} }
break; break;
case 21: case 21:
#line 207 "getdate.y" #line 204 "getdate.y"
{ {
if (yyvsp[-4].Number >= 100) { if (yyvsp[-4].Number >= 100) {
yyYear = yyvsp[-4].Number; yyYear = yyvsp[-4].Number;
@@ -1358,7 +1356,7 @@ case 21:
} }
break; break;
case 22: case 22:
#line 218 "getdate.y" #line 215 "getdate.y"
{ {
/* ISO 8601 format. yyyy-mm-dd. */ /* ISO 8601 format. yyyy-mm-dd. */
yyYear = yyvsp[-2].Number; yyYear = yyvsp[-2].Number;
@@ -1367,7 +1365,7 @@ case 22:
} }
break; break;
case 23: case 23:
#line 224 "getdate.y" #line 221 "getdate.y"
{ {
/* e.g. 17-JUN-1992. */ /* e.g. 17-JUN-1992. */
yyDay = yyvsp[-2].Number; yyDay = yyvsp[-2].Number;
@@ -1376,14 +1374,14 @@ case 23:
} }
break; break;
case 24: case 24:
#line 230 "getdate.y" #line 227 "getdate.y"
{ {
yyMonth = yyvsp[-1].Number; yyMonth = yyvsp[-1].Number;
yyDay = yyvsp[0].Number; yyDay = yyvsp[0].Number;
} }
break; break;
case 25: case 25:
#line 234 "getdate.y" #line 231 "getdate.y"
{ {
yyMonth = yyvsp[-3].Number; yyMonth = yyvsp[-3].Number;
yyDay = yyvsp[-2].Number; yyDay = yyvsp[-2].Number;
@@ -1391,14 +1389,14 @@ case 25:
} }
break; break;
case 26: case 26:
#line 239 "getdate.y" #line 236 "getdate.y"
{ {
yyMonth = yyvsp[0].Number; yyMonth = yyvsp[0].Number;
yyDay = yyvsp[-1].Number; yyDay = yyvsp[-1].Number;
} }
break; break;
case 27: case 27:
#line 243 "getdate.y" #line 240 "getdate.y"
{ {
yyMonth = yyvsp[-1].Number; yyMonth = yyvsp[-1].Number;
yyDay = yyvsp[-2].Number; yyDay = yyvsp[-2].Number;
@@ -1406,68 +1404,68 @@ case 27:
} }
break; break;
case 28: case 28:
#line 250 "getdate.y" #line 247 "getdate.y"
{ {
yyRelSeconds = -yyRelSeconds; yyRelSeconds = -yyRelSeconds;
yyRelMonth = -yyRelMonth; yyRelMonth = -yyRelMonth;
} }
break; break;
case 30: case 30:
#line 257 "getdate.y" #line 254 "getdate.y"
{ {
yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L; yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L;
} }
break; break;
case 31: case 31:
#line 260 "getdate.y" #line 257 "getdate.y"
{ {
yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L; yyRelSeconds += yyvsp[-1].Number * yyvsp[0].Number * 60L;
} }
break; break;
case 32: case 32:
#line 263 "getdate.y" #line 260 "getdate.y"
{ {
yyRelSeconds += yyvsp[0].Number * 60L; yyRelSeconds += yyvsp[0].Number * 60L;
} }
break; break;
case 33: case 33:
#line 266 "getdate.y" #line 263 "getdate.y"
{ {
yyRelSeconds += yyvsp[-1].Number; yyRelSeconds += yyvsp[-1].Number;
} }
break; break;
case 34: case 34:
#line 269 "getdate.y" #line 266 "getdate.y"
{ {
yyRelSeconds += yyvsp[-1].Number; yyRelSeconds += yyvsp[-1].Number;
} }
break; break;
case 35: case 35:
#line 272 "getdate.y" #line 269 "getdate.y"
{ {
yyRelSeconds++; yyRelSeconds++;
} }
break; break;
case 36: case 36:
#line 275 "getdate.y" #line 272 "getdate.y"
{ {
yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number; yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
} }
break; break;
case 37: case 37:
#line 278 "getdate.y" #line 275 "getdate.y"
{ {
yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number; yyRelMonth += yyvsp[-1].Number * yyvsp[0].Number;
} }
break; break;
case 38: case 38:
#line 281 "getdate.y" #line 278 "getdate.y"
{ {
yyRelMonth += yyvsp[0].Number; yyRelMonth += yyvsp[0].Number;
} }
break; break;
case 39: case 39:
#line 286 "getdate.y" #line 283 "getdate.y"
{ {
if (yyHaveTime && yyHaveDate && !yyHaveRel) if (yyHaveTime && yyHaveDate && !yyHaveRel)
yyYear = yyvsp[0].Number; yyYear = yyvsp[0].Number;
@@ -1495,18 +1493,18 @@ case 39:
} }
break; break;
case 40: case 40:
#line 313 "getdate.y" #line 310 "getdate.y"
{ {
yyval.Meridian = MER24; yyval.Meridian = MER24;
} }
break; break;
case 41: case 41:
#line 316 "getdate.y" #line 313 "getdate.y"
{ {
yyval.Meridian = yyvsp[0].Meridian; yyval.Meridian = yyvsp[0].Meridian;
} }
break; break;
#line 1457 "getdate.c" #line 1455 "getdate.c"
} }
yyssp -= yym; yyssp -= yym;
yystate = *yyssp; yystate = *yyssp;

5
plugins/sudoers/getdate.y
View File

@@ -15,7 +15,6 @@
#include <config.h> #include <config.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
@@ -29,9 +28,7 @@
#elif defined(HAVE_INTTYPES_H) #elif defined(HAVE_INTTYPES_H)
# include <inttypes.h> # include <inttypes.h>
#endif #endif
#ifdef TIME_WITH_SYS_TIME #include <time.h>
# include <time.h>
#endif
#include <limits.h> #include <limits.h>
#include <ctype.h> #include <ctype.h>

7
plugins/sudoers/group_plugin.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2010-2015 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2010-2018 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -18,7 +18,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
@@ -28,9 +27,7 @@
# include <strings.h> # include <strings.h>
#endif /* HAVE_STRINGS_H */ #endif /* HAVE_STRINGS_H */
#include <unistd.h> #include <unistd.h>
#ifdef TIME_WITH_SYS_TIME #include <time.h>
# include <time.h>
#endif
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <pwd.h> #include <pwd.h>

6
plugins/sudoers/iolog.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009-2017 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2009-2018 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -28,9 +28,7 @@
# include <strings.h> # include <strings.h>
#endif /* HAVE_STRINGS_H */ #endif /* HAVE_STRINGS_H */
#include <unistd.h> #include <unistd.h>
#ifdef TIME_WITH_SYS_TIME #include <time.h>
# include <time.h>
#endif
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <signal.h> #include <signal.h>

6
plugins/sudoers/ldap.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003-2017 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2003-2018 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* This code is derived from software contributed by Aaron Spangler. * This code is derived from software contributed by Aaron Spangler.
* *
@@ -31,9 +31,7 @@
# include <strings.h> # include <strings.h>
#endif /* HAVE_STRINGS_H */ #endif /* HAVE_STRINGS_H */
#include <unistd.h> #include <unistd.h>
#ifdef TIME_WITH_SYS_TIME #include <time.h>
# include <time.h>
#endif
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>

7
plugins/sudoers/sssd.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003-2016 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2003-2018 Todd C. Miller <Todd.Miller@sudo.ws>
* Copyright (c) 2011 Daniel Kopecek <dkopecek@redhat.com> * Copyright (c) 2011 Daniel Kopecek <dkopecek@redhat.com>
* *
* This code is derived from software contributed by Aaron Spangler. * This code is derived from software contributed by Aaron Spangler.
@@ -22,7 +22,6 @@
#ifdef HAVE_SSSD #ifdef HAVE_SSSD
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -33,9 +32,7 @@
# include <strings.h> # include <strings.h>
#endif /* HAVE_STRINGS_H */ #endif /* HAVE_STRINGS_H */
#include <unistd.h> #include <unistd.h>
#ifdef TIME_WITH_SYS_TIME #include <time.h>
# include <time.h>
#endif
#include <ctype.h> #include <ctype.h>
#include <pwd.h> #include <pwd.h>
#include <grp.h> #include <grp.h>

6
plugins/sudoers/sudoreplay.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009-2017 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2009-2018 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -36,9 +36,7 @@
# include <strings.h> # include <strings.h>
#endif /* HAVE_STRINGS_H */ #endif /* HAVE_STRINGS_H */
#include <unistd.h> #include <unistd.h>
#ifdef TIME_WITH_SYS_TIME #include <time.h>
# include <time.h>
#endif
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>

7
plugins/sudoers/timestamp.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2017 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2014-2018 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -17,7 +17,6 @@
#include <config.h> #include <config.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <stdio.h> #include <stdio.h>
@@ -34,9 +33,7 @@
# include <strings.h> # include <strings.h>
#endif /* HAVE_STRINGS_H */ #endif /* HAVE_STRINGS_H */
#include <unistd.h> #include <unistd.h>
#ifdef TIME_WITH_SYS_TIME #include <time.h>
# include <time.h>
#endif
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <pwd.h> #include <pwd.h>

7
plugins/sudoers/visudo.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 1998-2005, 2007-2017 * Copyright (c) 1996, 1998-2005, 2007-2018
* Todd C. Miller <Todd.Miller@sudo.ws> * Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@@ -32,7 +32,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/time.h>
#include <sys/uio.h> #include <sys/uio.h>
#ifndef __TANDEM #ifndef __TANDEM
# include <sys/file.h> # include <sys/file.h>
@@ -54,11 +53,9 @@
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <time.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#ifdef TIME_WITH_SYS_TIME
# include <time.h>
#endif
#include "sudoers.h" #include "sudoers.h"
#include "interfaces.h" #include "interfaces.h"

3
src/net_ifs.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 1998-2005, 2007-2015 * Copyright (c) 1996, 1998-2005, 2007-2015, 2018
* Todd C. Miller <Todd.Miller@sudo.ws> * Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@@ -32,7 +32,6 @@ struct rtentry;
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/time.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#if defined(HAVE_SYS_SOCKIO_H) && !defined(SIOCGIFCONF) #if defined(HAVE_SYS_SOCKIO_H) && !defined(SIOCGIFCONF)
# include <sys/sockio.h> # include <sys/sockio.h>

7
src/sesh.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2010-2016 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2008, 2010-2018 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -20,7 +20,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <limits.h> #include <limits.h>
@@ -28,15 +27,13 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <signal.h> #include <signal.h>
#include <time.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_STDBOOL_H #ifdef HAVE_STDBOOL_H
# include <stdbool.h> # include <stdbool.h>
#else #else
# include "compat/stdbool.h" # include "compat/stdbool.h"
#endif /* HAVE_STDBOOL_H */ #endif /* HAVE_STDBOOL_H */
#ifdef TIME_WITH_SYS_TIME
# include <time.h>
#endif
#include "sudo_gettext.h" /* must be included before sudo_compat.h */ #include "sudo_gettext.h" /* must be included before sudo_compat.h */

7
src/sudo.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009-2017 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2009-2018 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -24,7 +24,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/time.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -42,9 +41,7 @@
#include <signal.h> #include <signal.h>
#include <grp.h> #include <grp.h>
#include <pwd.h> #include <pwd.h>
#ifdef TIME_WITH_SYS_TIME #include <time.h>
# include <time.h>
#endif
#ifdef HAVE_SELINUX #ifdef HAVE_SELINUX
# include <selinux/selinux.h> /* for is_selinux_enabled() */ # include <selinux/selinux.h> /* for is_selinux_enabled() */
#endif #endif

7
src/sudo_edit.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004-2008, 2010-2017 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2004-2008, 2010-2018 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -18,7 +18,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <stdio.h> #include <stdio.h>
@@ -29,6 +28,7 @@
#ifdef HAVE_STRINGS_H #ifdef HAVE_STRINGS_H
# include <strings.h> # include <strings.h>
#endif /* HAVE_STRINGS_H */ #endif /* HAVE_STRINGS_H */
#include <time.h>
#include <unistd.h> #include <unistd.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
@@ -37,9 +37,6 @@
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef TIME_WITH_SYS_TIME
# include <time.h>
#endif
#include "sudo.h" #include "sudo.h"
#include "sudo_exec.h" #include "sudo_exec.h"

6
src/utmp.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011-2016 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2011-2018 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -28,9 +28,7 @@
# include <strings.h> # include <strings.h>
#endif /* HAVE_STRINGS_H */ #endif /* HAVE_STRINGS_H */
#include <unistd.h> #include <unistd.h>
#ifdef TIME_WITH_SYS_TIME #include <time.h>
# include <time.h>
#endif
#ifdef HAVE_UTMPX_H #ifdef HAVE_UTMPX_H
# include <utmpx.h> # include <utmpx.h>
#else #else