From 2563e3f2729b90b62cc0a53137a516d2f009dc53 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 16 Jan 2010 11:53:07 +1100
Subject:  - (dtucker) [openbsd-compat/openbsd-compat.h] Prototypes for
 user_from_uid    and group_from_gid.

---
 openbsd-compat/openbsd-compat.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'openbsd-compat/openbsd-compat.h')

diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 50c6d990b..a38068d71 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -1,4 +1,4 @@
-/* $Id: openbsd-compat.h,v 1.46 2008/06/08 17:32:29 dtucker Exp $ */
+/* $Id: openbsd-compat.h,v 1.47 2010/01/16 00:53:07 dtucker Exp $ */
 
 /*
  * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
@@ -200,6 +200,14 @@ int vasprintf(char **, const char *, va_list);
 int vsnprintf(char *, size_t, const char *, va_list);
 #endif
 
+#ifndef HAVE_USER_FROM_UID
+char *user_from_uid(uid_t);
+#endif
+
+#ifndef HAVE_GROUP_FROM_GUID
+char *group_from_gid(gid_t);
+#endif
+
 void *xmmap(size_t size);
 char *xcrypt(const char *password, const char *salt);
 char *shadow_pw(struct passwd *pw);
-- 
cgit v1.2.3


From 69371b511b998f2637fdf4bf708e15462162bc0d Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 16 Jan 2010 13:30:30 +1100
Subject:  - (dtucker) [openbsd-compat/openbsd-compat.h] Fix prototypes,
 spotted by    Tim.

---
 ChangeLog                       | 2 ++
 openbsd-compat/openbsd-compat.h | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'openbsd-compat/openbsd-compat.h')

diff --git a/ChangeLog b/ChangeLog
index ebe777032..55e8bb1d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    so we correctly detect whether or not we have a native user_from_uid.
  - (dtucker) [openbsd-compat/openbsd-compat.h] Prototypes for user_from_uid
    and group_from_gid.
+ - (dtucker) [openbsd-compat/openbsd-compat.h] Fix prototypes, spotted by
+   Tim.
 
 20100115
  - (dtucker) OpenBSD CVS Sync
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index a38068d71..020032bc4 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -1,4 +1,4 @@
-/* $Id: openbsd-compat.h,v 1.47 2010/01/16 00:53:07 dtucker Exp $ */
+/* $Id: openbsd-compat.h,v 1.48 2010/01/16 02:30:30 dtucker Exp $ */
 
 /*
  * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
@@ -201,11 +201,11 @@ int vsnprintf(char *, size_t, const char *, va_list);
 #endif
 
 #ifndef HAVE_USER_FROM_UID
-char *user_from_uid(uid_t);
+char *user_from_uid(uid_t, int);
 #endif
 
 #ifndef HAVE_GROUP_FROM_GUID
-char *group_from_gid(gid_t);
+char *group_from_gid(gid_t, int);
 #endif
 
 void *xmmap(size_t size);
-- 
cgit v1.2.3


From 4e218554222592a99991fe6320eae6277f3109a6 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 16 Jan 2010 23:58:37 +1100
Subject:  - (dtucker) [openbsd-compat/openbsd-compat.h] Typo.

---
 ChangeLog                       | 1 +
 openbsd-compat/openbsd-compat.h | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'openbsd-compat/openbsd-compat.h')

diff --git a/ChangeLog b/ChangeLog
index 29e555ab1..e41bf6a97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
      unused
  - (dtucker) [openbsd-compat/pwcache.c] Shrink ifdef area to prevent unused
    variable warnings.
+ - (dtucker) [openbsd-compat/openbsd-compat.h] Typo.
 
 20100115
  - (dtucker) OpenBSD CVS Sync
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 020032bc4..cad2408d6 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -1,4 +1,4 @@
-/* $Id: openbsd-compat.h,v 1.48 2010/01/16 02:30:30 dtucker Exp $ */
+/* $Id: openbsd-compat.h,v 1.49 2010/01/16 12:58:37 dtucker Exp $ */
 
 /*
  * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
@@ -204,7 +204,7 @@ int vsnprintf(char *, size_t, const char *, va_list);
 char *user_from_uid(uid_t, int);
 #endif
 
-#ifndef HAVE_GROUP_FROM_GUID
+#ifndef HAVE_GROUP_FROM_GID
 char *group_from_gid(gid_t, int);
 #endif
 
-- 
cgit v1.2.3