Add a timegm implementation from Heimdal via Samba.

Fixes build on (at least Solaris 10).
This commit is contained in:
Darren Tucker 2022-08-11 22:48:23 +10:00
parent d0c4fa5859
commit 87b0d9c1b7
5 changed files with 89 additions and 0 deletions

View File

@ -231,6 +231,7 @@ OpenSSH contains no GPL code.
Eric P. Allman Eric P. Allman
The Regents of the University of California The Regents of the University of California
Constantin S. Svintsoff Constantin S. Svintsoff
Kungliga Tekniska Högskolan
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions

View File

@ -1967,6 +1967,7 @@ AC_CHECK_FUNCS([ \
swap32 \ swap32 \
sysconf \ sysconf \
tcgetpgrp \ tcgetpgrp \
timegm \
timingsafe_bcmp \ timingsafe_bcmp \
truncate \ truncate \
unsetenv \ unsetenv \

View File

@ -85,6 +85,7 @@ COMPAT= bsd-asprintf.o \
bsd-signal.o \ bsd-signal.o \
bsd-snprintf.o \ bsd-snprintf.o \
bsd-statvfs.o \ bsd-statvfs.o \
bsd-timegm.o \
bsd-waitpid.o \ bsd-waitpid.o \
fake-rfc2553.o \ fake-rfc2553.o \
getrrsetbyname-ldns.o \ getrrsetbyname-ldns.o \

View File

@ -0,0 +1,82 @@
/*
* Copyright (c) 1997 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/*
adapted for Samba4 by Andrew Tridgell
*/
#include "includes.h"
#include <time.h>
#ifndef HAVE_TIMEGM
static int is_leap(unsigned y)
{
y += 1900;
return (y % 4) == 0 && ((y % 100) != 0 || (y % 400) == 0);
}
time_t timegm(struct tm *tm)
{
static const unsigned ndays[2][12] ={
{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
{31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}};
time_t res = 0;
unsigned i;
if (tm->tm_mon > 12 ||
tm->tm_mon < 0 ||
tm->tm_mday > 31 ||
tm->tm_min > 60 ||
tm->tm_sec > 60 ||
tm->tm_hour > 24) {
/* invalid tm structure */
return 0;
}
for (i = 70; i < tm->tm_year; ++i)
res += is_leap(i) ? 366 : 365;
for (i = 0; i < tm->tm_mon; ++i)
res += ndays[is_leap(tm->tm_year)][i];
res += tm->tm_mday - 1;
res *= 24;
res += tm->tm_hour;
res *= 60;
res += tm->tm_min;
res *= 60;
res += tm->tm_sec;
return res;
}
#endif /* HAVE_TIMEGM */

View File

@ -343,6 +343,10 @@ void freezero(void *, size_t);
struct tm *localtime_r(const time_t *, struct tm *); struct tm *localtime_r(const time_t *, struct tm *);
#endif #endif
#ifndef HAVE_TIMEGM
time_t timegm(struct tm *);
#endif
char *xcrypt(const char *password, const char *salt); char *xcrypt(const char *password, const char *salt);
char *shadow_pw(struct passwd *pw); char *shadow_pw(struct passwd *pw);