rename get_progname to bsd_get_progname to prevent conflicts with

get_progname from heimdal's libroken

diff --git a/openssh/openbsd-compat/bsd-misc.h b/openssh/openbsd-compat/bsd-misc.h
index 3a855266a6b305c290ce3f7c535ab94f27fd8b09..3e336dd8fb0df7a8242fcc81067130adf7d81020 100644 (file)
--- a/openssh/openbsd-compat/bsd-misc.h
+++ b/openssh/openbsd-compat/bsd-misc.h
@@ -29,6 +29,7 @@
 
 #include "config.h"
 
+#define get_progname bsd_get_progname
 char *get_progname(char *argv0);
 
 #ifndef HAVE_SETSID
@@ -72,5 +73,13 @@ struct timeval {
 int utimes(char *filename, struct timeval *tvp);
 #endif /* HAVE_UTIMES */
 
+#ifndef HAVE_TRUNCATE
+int truncate (const char *path, off_t length);
+#endif /* HAVE_TRUNCATE */
+
+#if !defined(HAVE_SETGROUPS) && defined(SETGROUPS_NOOP)
+int setgroups(size_t size, const gid_t *list);
+#endif
+
 
 #endif /* _BSD_MISC_H */