summaryrefslogtreecommitdiff
path: root/source3/lib/system.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-09-25 15:19:00 +0000
committerGerald Carter <jerry@samba.org>2002-09-25 15:19:00 +0000
commita834a73e341059be154426390304a42e4a011f72 (patch)
tree7f53b0f7819238e0ee0396daccf5d924cb9b8d29 /source3/lib/system.c
parent115a39775cb923d026dde58633b6ba6aef3a1943 (diff)
downloadsamba-a834a73e341059be154426390304a42e4a011f72.tar.gz
samba-a834a73e341059be154426390304a42e4a011f72.tar.bz2
samba-a834a73e341059be154426390304a42e4a011f72.zip
sync'ing up for 3.0alpha20 release
(This used to be commit 65e7b5273bb58802bf0c389b77f7fcae0a1f6139)
Diffstat (limited to 'source3/lib/system.c')
-rw-r--r--source3/lib/system.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/source3/lib/system.c b/source3/lib/system.c
index edda54a78d..873b8737d5 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -1233,26 +1233,23 @@ int sys_dup2(int oldfd, int newfd)
Wrapper for Admin Logs.
****************************************************************************/
-void sys_adminlog(int priority, const char *format_str, ...)
+void sys_adminlog(int priority, char *format_str, ...)
{
va_list ap;
int ret;
- char **msgbuf = NULL;
-
- if (!lp_admin_log())
- return;
+ char *msgbuf = NULL;
va_start( ap, format_str );
- ret = vasprintf( msgbuf, format_str, ap );
+ ret = vasprintf( &msgbuf, format_str, ap );
va_end( ap );
if (ret == -1)
return;
#if defined(HAVE_SYSLOG)
- syslog( priority, "%s", *msgbuf );
+ syslog( priority, "%s", msgbuf );
#else
- DEBUG(0,("%s", *msgbuf ));
+ DEBUG(0,("%s", msgbuf ));
#endif
- SAFE_FREE(*msgbuf);
+ SAFE_FREE(msgbuf);
}