Fixed bugs related to last three commits

Conflicts:

	webcit/auth.c
	webcit/openid.c
	webcit/sysdep.c
	webcit/tcp_sockets.c

diff --git a/citadel/textclient/citadel.c b/citadel/textclient/citadel.c
index 94ca65341bd8b62e59fecc0d1556e0815b597762..ef2685edadd7d0a15f7b7128cb36a73300821cfd 100644 (file)
--- a/citadel/textclient/citadel.c
+++ b/citadel/textclient/citadel.c
@@ -127,21 +127,6 @@ CtdlIPC *ipc_for_signal_handlers;  /* KLUDGE cover your eyes */
 int enable_syslog = 0;
 
 
-/*
- * syslog()  ...   Write logging information; 
- *                  simple here to have the same 
- *                  symbols in the client.
- */
-
-void syslog(enum LogLevel loglevel, const char *format, ...) {   
-       va_list arg_ptr;
-
-       va_start(arg_ptr, format);
-       vfprintf(stderr, format, arg_ptr);   
-       va_end(arg_ptr);   
-       fflush(stderr);
-}   
-
 /*
  * here is our 'clean up gracefully and exit' routine
  */

diff --git a/webcit/auth.c b/webcit/auth.c
index 80f7ddbb0a8e63d3920d8e1b72625e79804d15ad..d35df874c311067ebcede5a455b92e8a516d8289 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -322,7 +322,7 @@ void do_openid_login(void)
                serv_puts(buf);
                serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
-                       lprintf(CTDL_DEBUG, "OpenID server contacted; redirecting to %s\n", &buf[4]);
+                       syslog(LOG_DEBUG, "OpenID server contacted; redirecting to %s\n", &buf[4]);
                        http_redirect(&buf[4]);
                        return;
                }

diff --git a/webcit/openid.c b/webcit/openid.c
index efe4280ca29f0f93562bd82b97b0923799162716..ff358e347f7e2c3dc0c7609efbb00cb23b530513 100644 (file)
--- a/webcit/openid.c
+++ b/webcit/openid.c
@@ -64,7 +64,7 @@ void openid_attach(void) {
 
        if (havebstr("attach_button")) {
 
-               lprintf(CTDL_DEBUG, "Attempting to attach %s\n", bstr("openid_url"));
+               syslog(LOG_DEBUG, "Attempting to attach %s\n", bstr("openid_url"));
 
                snprintf(buf, sizeof buf,
                        "OIDS %s|%s/finalize_openid_login|%s",
@@ -76,12 +76,12 @@ void openid_attach(void) {
                serv_puts(buf);
                serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
-                       lprintf(CTDL_DEBUG, "OpenID server contacted; redirecting to %s\n", &buf[4]);
+                       syslog(LOG_DEBUG, "OpenID server contacted; redirecting to %s\n", &buf[4]);
                        http_redirect(&buf[4]);
                        return;
                }
                else {
-                       lprintf(CTDL_DEBUG, "OpenID attach failed: %s\n", &buf[4]);
+                       syslog(LOG_DEBUG, "OpenID attach failed: %s\n", &buf[4]);
                }
        }
 

diff --git a/webcit/sysdep.c b/webcit/sysdep.c
index 0657b81108121af1d1881ab2e9578e32eb029e46..47487177eb229a369e57f9b1d2a2b396c6d74ee5 100644 (file)
--- a/webcit/sysdep.c
+++ b/webcit/sysdep.c
@@ -1,7 +1,7 @@
 /*
  * WebCit "system dependent" code.
  *
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-2011 by the citadel.org team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -524,18 +524,18 @@ void drop_root(uid_t UID)
 #endif // HAVE_GETPWUID_R
 
                if (pwp == NULL)
-                       lprintf(CTDL_CRIT, "WARNING: getpwuid(%ld): %s\n"
+                       syslog(LOG_CRIT, "WARNING: getpwuid(%ld): %s\n"
                                "Group IDs will be incorrect.\n", UID,
                                strerror(errno));
                else {
                        initgroups(pw.pw_name, pw.pw_gid);
                        if (setgid(pw.pw_gid))
-                               lprintf(CTDL_CRIT, "setgid(%ld): %s\n", (long)pw.pw_gid,
+                               syslog(LOG_CRIT, "setgid(%ld): %s\n", (long)pw.pw_gid,
                                        strerror(errno));
                }
-               lprintf(CTDL_INFO, "Changing uid to %ld\n", (long)UID);
+               syslog(LOG_INFO, "Changing uid to %ld\n", (long)UID);
                if (setuid(UID) != 0) {
-                       lprintf(CTDL_CRIT, "setuid() failed: %s\n", strerror(errno));
+                       syslog(LOG_CRIT, "setuid() failed: %s\n", strerror(errno));
                }
 #if defined (HAVE_SYS_PRCTL_H) && defined (PR_SET_DUMPABLE)
                prctl(PR_SET_DUMPABLE, 1);

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 696dfc3ae76dd73357765e98aca5cbbc9dfadaee..b9849f3391309f9791fb0c43bbece5fbdd7af6e7 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -738,7 +738,7 @@ long end_burst(void)
                if (CompressBuffer(WCC->WBuf) > 0)
                        hprintf("Content-encoding: gzip\r\n");
                else {
-                       lprintf(CTDL_ALERT, "Compression failed: %d [%s] sending uncompressed\n", errno, strerror(errno));
+                       syslog(LOG_ALERT, "Compression failed: %d [%s] sending uncompressed\n", errno, strerror(errno));
                        wc_backtrace();
                }
        }