diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
commit | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch) | |
tree | f0d13e1687800f36a3c4322b94ac5230ad17bdbf /openbsd-compat/openbsd-compat.h | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) |
merge 5.4p1
Diffstat (limited to 'openbsd-compat/openbsd-compat.h')
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 50c6d990b..cad2408d6 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openbsd-compat.h,v 1.46 2008/06/08 17:32:29 dtucker Exp $ */ | 1 | /* $Id: openbsd-compat.h,v 1.49 2010/01/16 12:58:37 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -200,6 +200,14 @@ int vasprintf(char **, const char *, va_list); | |||
200 | int vsnprintf(char *, size_t, const char *, va_list); | 200 | int vsnprintf(char *, size_t, const char *, va_list); |
201 | #endif | 201 | #endif |
202 | 202 | ||
203 | #ifndef HAVE_USER_FROM_UID | ||
204 | char *user_from_uid(uid_t, int); | ||
205 | #endif | ||
206 | |||
207 | #ifndef HAVE_GROUP_FROM_GID | ||
208 | char *group_from_gid(gid_t, int); | ||
209 | #endif | ||
210 | |||
203 | void *xmmap(size_t size); | 211 | void *xmmap(size_t size); |
204 | char *xcrypt(const char *password, const char *salt); | 212 | char *xcrypt(const char *password, const char *salt); |
205 | char *shadow_pw(struct passwd *pw); | 213 | char *shadow_pw(struct passwd *pw); |