--- a/usr/src/lib/pam_modules/unix_cred/unix_cred.c	Mon Mar 23 14:34:59 2009 +0100
+++ b/usr/src/lib/pam_modules/unix_cred/unix_cred.c	Mon Mar 23 14:35:14 2009 +0100
@@ -261,17 +261,30 @@
 		struct passwd	apwd;
 		char	apwbuf[NSS_BUFLEN_PASSWD];
 
+		errno = 0;
 		if ((rhost == NULL || *rhost == '\0')) {
 			if (adt_load_ttyname(tty, &termid) != 0) {
-				syslog(LOG_AUTH | LOG_ERR,
-				    "pam_unix_cred: cannot load ttyname %m");
+				if (errno != 0)
+					syslog(LOG_AUTH | LOG_ERR,
+					    "pam_unix_cred: cannot load "
+					    "ttyname: %m.");
+				else
+					syslog(LOG_AUTH | LOG_ERR,
+					    "pam_unix_cred: cannot load "
+					    "ttyname.");
 				ret = PAM_SYSTEM_ERR;
 				goto adt_done;
 			}
 		} else {
 			if (adt_load_hostname(rhost, &termid) != 0) {
-				syslog(LOG_AUTH | LOG_ERR,
-				    "pam_unix_cred: cannot load hostname %m");
+				if (errno != 0)
+					syslog(LOG_AUTH | LOG_ERR,
+					    "pam_unix_cred: cannot load "
+					    "hostname: %m.");
+				else
+					syslog(LOG_AUTH | LOG_ERR,
+					    "pam_unix_cred: cannot load "
+					    "hostname.");
 				ret = PAM_SYSTEM_ERR;
 				goto adt_done;
 			}