summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-12-18 15:35:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:35 -0500
commit9291e634c0ca97c642fba389e06f2ff31d70b3e0 (patch)
tree169d4044cc92803506d0fee99b280095c0a87545
parent619671a71892710b520d09b24c24e02347036e45 (diff)
downloadsamba-9291e634c0ca97c642fba389e06f2ff31d70b3e0.tar.gz
samba-9291e634c0ca97c642fba389e06f2ff31d70b3e0.tar.bz2
samba-9291e634c0ca97c642fba389e06f2ff31d70b3e0.zip
r20241: Slightly improve readability of the pam_vsyslog replacement function.
Guenther (This used to be commit 222320373f8a251fc2cf3ff8c3fec93a7a48f9df)
-rw-r--r--source3/nsswitch/pam_winbind.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c
index 5bd4ec3934..7010936b9b 100644
--- a/source3/nsswitch/pam_winbind.c
+++ b/source3/nsswitch/pam_winbind.c
@@ -35,14 +35,14 @@ static int _pam_get_data(const pam_handle_t *pamh,
/* some syslogging */
+#ifdef HAVE_PAM_VSYSLOG
static void _pam_log_int(const pam_handle_t *pamh, int err, const char *format, va_list args)
{
-
-#ifdef HAVE_PAM_VSYSLOG
pam_vsyslog(pamh, err, format, args);
+}
#else
- {
-
+static void _pam_log_int(const pam_handle_t *pamh, int err, const char *format, va_list args)
+{
char *format2 = NULL;
const char *service;
@@ -58,9 +58,8 @@ static void _pam_log_int(const pam_handle_t *pamh, int err, const char *format,
sprintf(format2, "%s(%s): %s", MODULE_NAME, service, format);
vsyslog(err, format2, args);
SAFE_FREE(format2);
- }
-#endif
}
+#endif /* HAVE_PAM_VSYSLOG */
static void _pam_log(const pam_handle_t *pamh, int ctrl, int err, const char *format, ...)
{