[SCM] Samba Shared Repository - branch v3-6-test updated

[Volker Lendecke]

The branch, v3-6-test has been updated
       via  201f9d6 s3: Fix pam_smbpass logging on FreeBSD
      from  fbd65b6 libreplace: fix endless strerror_r has been redefined warnings on AIX (cherry picked from commit 9b73bb0099d6b33d9e951895be3c877628b6c7dd)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 201f9d6b0f892cc45a38064472986f7923d35aa2
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Sep 21 21:16:31 2010 +0200

    s3: Fix pam_smbpass logging on FreeBSD

-----------------------------------------------------------------------

Summary of changes:
 source3/pam_smbpass/support.c |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/pam_smbpass/support.c b/source3/pam_smbpass/support.c
index 715a0f4..4215c72 100644
--- a/source3/pam_smbpass/support.c
+++ b/source3/pam_smbpass/support.c
@@ -93,22 +93,20 @@ void _log_err( pam_handle_t *pamh, int err, const char *format, ... )
 void _log_err( pam_handle_t *pamh, int err, const char *format, ... )
 {
 	va_list args;
-	const char tag[] = "(pam_smbpass) ";
 	char *mod_format;
 
-	mod_format = SMB_MALLOC_ARRAY(char, sizeof(tag) + strlen(format));
-	/* try really, really hard to log something, since this may have
-	   been a message about a malloc() failure... */
-	if (mod_format == NULL) {
+	if (asprintf(&mod_format, "(pam_smbpass) %s", format) == -1) {
+		/*
+		 * try really, really hard to log something, since
+		 * this may have been a message about a malloc()
+		 * failure...
+		 */
 		va_start(args, format);
 		vsyslog(err | LOG_AUTH, format, args);
 		va_end(args);
 		return;
 	}
 
-	strncpy(mod_format, tag, strlen(tag)+1);
-	strlcat(mod_format, format, strlen(format)+1);
-
 	va_start(args, format);
 	vsyslog(err | LOG_AUTH, mod_format, args);
 	va_end(args);


-- 
Samba Shared Repository