Author: gd Date: 2006-12-18 15:35:52 +0000 (Mon, 18 Dec 2006) New Revision: 20241
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20241 Log: Slightly improve readability of the pam_vsyslog replacement function. Guenther Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c branches/SAMBA_3_0_24/source/nsswitch/pam_winbind.c Changeset: Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c 2006-12-18 15:33:57 UTC (rev 20240) +++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c 2006-12-18 15:35:52 UTC (rev 20241) @@ -35,14 +35,14 @@ /* 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 @@ 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, ...) { Modified: branches/SAMBA_3_0_24/source/nsswitch/pam_winbind.c =================================================================== --- branches/SAMBA_3_0_24/source/nsswitch/pam_winbind.c 2006-12-18 15:33:57 UTC (rev 20240) +++ branches/SAMBA_3_0_24/source/nsswitch/pam_winbind.c 2006-12-18 15:35:52 UTC (rev 20241) @@ -35,14 +35,14 @@ /* 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 @@ 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, ...) {
