merge with 1.8.1 + partial --version and --help

diff --git a/login-utils/su.c b/login-utils/su.c
index ff2bfe5fce6b9cade0afa3b228b060a7050b992f..c94db90f085e6b6e8a9f5eb29fbd88858e818a22 100644 (file)
--- a/login-utils/su.c
+++ b/login-utils/su.c
@@ -78,7 +78,7 @@
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
 static void log_su ();
-#else
+#else /* !HAVE_SYSLOG_H */
 #ifdef SYSLOG_SUCCESS
 #undef SYSLOG_SUCCESS
 #endif
@@ -88,7 +88,7 @@ static void log_su ();
 #ifdef SYSLOG_NON_ROOT
 #undef SYSLOG_NON_ROOT
 #endif
-#endif
+#endif /* !HAVE_SYSLOG_H */
 
 #ifdef _POSIX_VERSION
 #include <limits.h>