GCC 3 is upon us.

Sponsored by:	DARPA, NAI Labs


git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@147 185d5e19-27fe-0310-9dcf-9bff6b9f3609

bin/su/su.c

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/bin/su/su.c#5 $
+ * $P4: //depot/projects/openpam/bin/su/su.c#6 $
  */
 
 #include <sys/param.h>
@@ -40,6 +40,7 @@
 #include <err.h>
 #include <pwd.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <syslog.h>
 #include <unistd.h>
 

include/security/openpam.h

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/include/security/openpam.h#19 $
+ * $P4: //depot/projects/openpam/include/security/openpam.h#20 $
  */
 
 #ifndef _SECURITY_OPENPAM_H_INCLUDED
@@ -137,9 +137,12 @@ _openpam_log(int _level,
 	const char *_fmt,
 	...);
 
-#if defined(__STDC__) && (__STDC_VERSION__ >= 199901L)
-#define openpam_log(lvl, fmt, ...) \
-	_openpam_log((lvl), __func__, fmt, __VA_ARGS__)
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#define openpam_log(lvl, ...) \
+	_openpam_log((lvl), __func__, __VA_ARGS__)
+#elif defined(__GNUC__) && (__GNUC__ >= 3)
+#define openpam_log(lvl, ...) \
+	_openpam_log((lvl), __func__, __VA_ARGS__)
 #elif defined(__GNUC__) && (__GNUC__ >= 2) && (__GNUC_MINOR__ >= 95)
 #define openpam_log(lvl, fmt...) \
 	_openpam_log((lvl), __func__, ##fmt)

lib/pam_get_authtok.c

@@ -31,12 +31,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#17 $
+ * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#18 $
  */
 
 #include <sys/param.h>
 
 #include <stdlib.h>
+#include <string.h>
 
 #include <security/pam_appl.h>
 #include <security/openpam.h>