* compatibility with Berkeley DB < 3.3

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index c03f9cdfe6f2f1f9b5dc83e81e82e3f988a3a99c..f9161690ea413a373a3940de56e1eeb731617fb8 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -66,6 +66,12 @@ char *unique_session_numbers;
 int ScheduledShutdown = 0;
 int do_defrag = 0;
 
+/* These are commented out.  Why do we need them?  They're defined in time.h
+ * anyway, and declaring them again here makes FreeBSD barf on it.
+extern long int timezone;
+extern int daylight;
+ */
+
 /*
  * Various things that need to be initialized at startup
  */
@@ -203,7 +209,7 @@ void RemoveContext (struct CitContext *con)
 
        rec_log(CL_TERMINATE, con->curr_user);
        unlink(con->temp);
-       lprintf(3, "citserver[%3d]: ended.\n", con->cs_pid);
+       lprintf(3, "[%3d] Session ended.\n", con->cs_pid);
        
 
        syslog(LOG_NOTICE,"session %d: ended", con->cs_pid);
@@ -352,8 +358,9 @@ void cmd_time(void)
    time_t tv;
    
    tv = time(NULL);
+   localtime(&tv);
    
-   cprintf("%d %ld\n", OK, (long)tv);
+   cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, timezone, daylight);
 }
 
 /*
@@ -456,11 +463,11 @@ void cmd_iden(char *argbuf)
        if (do_lookup) {
                lprintf(9, "Looking up hostname '%s'\n", from_host);
                if ((addr.s_addr = inet_addr(from_host)) != -1) {
-                       locate_host(CC->cs_host, &addr);
+                       locate_host(CC->cs_host, sizeof CC->cs_host, &addr);
                }
                else {
                        safestrncpy(CC->cs_host, from_host, sizeof CC->cs_host);
-                       CC->cs_host[24] = 0;
+                       CC->cs_host[sizeof CC->cs_host - 1] = 0;
                }
        }
 
@@ -479,7 +486,7 @@ void cmd_iden(char *argbuf)
                (rev_level % 100),
                desc,
                CC->cs_host);
-       cprintf("%d Ok\n",OK);
+       cprintf("%d Ok\n",CIT_OK);
 }
 
 
@@ -500,7 +507,7 @@ void cmd_mesg(char *mname)
        dirs[1]=mallok(64);
        strcpy(dirs[0],"messages");
        strcpy(dirs[1],"help");
-       mesg_locate(targ,buf,2,dirs);
+       mesg_locate(targ,sizeof targ,buf,2,(const char **)dirs);
        phree(dirs[0]);
        phree(dirs[1]);
 
@@ -551,7 +558,7 @@ void cmd_emsg(char *mname)
        dirs[1]=mallok(64);
        strcpy(dirs[0],"messages");
        strcpy(dirs[1],"help");
-       mesg_locate(targ,buf,2,dirs);
+       mesg_locate(targ,sizeof targ,buf,2,(const char**)dirs);
        phree(dirs[0]);
        phree(dirs[1]);
 
@@ -675,7 +682,7 @@ void cmd_term(char *cmdbuf)
 
        if (found_it) {
                if (allowed) {
-                       cprintf("%d Session terminated.\n", OK);
+                       cprintf("%d Session terminated.\n", CIT_OK);
                }
                else {
                        cprintf("%d You are not allowed to do that.\n",
@@ -695,7 +702,7 @@ void cmd_term(char *cmdbuf)
  * get the paginator prompt
  */
 void cmd_more(void) {
-       cprintf("%d %s\n",OK,config.c_moreprompt);
+       cprintf("%d %s\n",CIT_OK,config.c_moreprompt);
        }
 
 /*
@@ -703,7 +710,7 @@ void cmd_more(void) {
  */
 void cmd_echo(char *etext)
 {
-       cprintf("%d %s\n",OK,etext);
+       cprintf("%d %s\n",CIT_OK,etext);
        }
 
 
@@ -720,7 +727,7 @@ void cmd_ipgm(char *argbuf)
                CC->internal_pgm = 1;
                strcpy(CC->curr_user, "<internal program>");
                CC->cs_flags = CC->cs_flags|CS_STEALTH;
-               cprintf("%d Authenticated as an internal program.\n",OK);
+               cprintf("%d Authenticated as an internal program.\n",CIT_OK);
                }
        else {
                cprintf("%d Authentication failed.\n",ERROR);
@@ -736,7 +743,7 @@ void cmd_down(void) {
 
        if (CtdlAccessCheck(ac_aide)) return;
 
-       cprintf("%d Shutting down server.  Goodbye.\n", OK);
+       cprintf("%d Shutting down server.  Goodbye.\n", CIT_OK);
        time_to_die = 1;
        }
 
@@ -753,7 +760,7 @@ void cmd_scdn(char *argbuf)
        if ((new_state == 0) || (new_state == 1)) {
                ScheduledShutdown = new_state;
                }
-       cprintf("%d %d\n", OK, ScheduledShutdown);
+       cprintf("%d %d\n", CIT_OK, ScheduledShutdown);
 }
 
 
@@ -768,7 +775,7 @@ void cmd_asyn(char *argbuf)
        if ((new_state == 0) || (new_state == 1)) {
                CC->is_async = new_state;
        }
-       cprintf("%d %d\n", OK, CC->is_async);
+       cprintf("%d %d\n", CIT_OK, CC->is_async);
 }
 
 
@@ -825,7 +832,7 @@ void begin_session(struct CitContext *con)
        if (!CC->is_local_socket) {
                if (!getpeername(con->client_socket,
                   (struct sockaddr *) &sin, &len))
-                       locate_host(con->cs_host, &sin.sin_addr);
+                       locate_host(con->cs_host, sizeof con->cs_host, &sin.sin_addr);
        }
        else {
                strcpy(con->cs_host, "");
@@ -839,7 +846,7 @@ void begin_session(struct CitContext *con)
        if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions))
                con->nologin = 1;
 
-       lprintf(3, "citserver[%3d]: started.\n", con->cs_pid);
+       lprintf(3, "Session started.\n");
 
        /* Run any session startup routines registered by loadable modules */
        PerformSessionHooks(EVT_START);
@@ -857,7 +864,7 @@ void citproto_begin_session() {
                }
        else {
                cprintf("%d %s Citadel/UX server ready.\n",
-                       OK, config.c_nodename);
+                       CIT_OK, config.c_nodename);
                }
 }
 
@@ -877,7 +884,7 @@ void do_command_loop(void) {
                CC->kill_me = 1;
                return;
        }
-       lprintf(5, "citserver[%3d]: %s\n", CC->cs_pid, cmdbuf);
+       lprintf(5, "Citadel: %s\n", cmdbuf);
 
        /*
         * Let other clients see the last command we executed, and
@@ -900,11 +907,11 @@ void do_command_loop(void) {
        }
                   
        if (!strncasecmp(cmdbuf,"NOOP",4)) {
-               cprintf("%d%cok\n",OK,CtdlCheckExpress());
+               cprintf("%d%cok\n",CIT_OK,CtdlCheckExpress());
                }
 
        else if (!strncasecmp(cmdbuf,"QUIT",4)) {
-               cprintf("%d Goodbye.\n",OK);
+               cprintf("%d Goodbye.\n",CIT_OK);
                CC->kill_me = 1;
                }
 
@@ -914,7 +921,7 @@ void do_command_loop(void) {
 
        else if (!strncasecmp(cmdbuf,"LOUT",4)) {
                if (CC->logged_in) logout(CC);
-               cprintf("%d logged out.\n",OK);
+               cprintf("%d logged out.\n",CIT_OK);
                }
 
        else if (!strncasecmp(cmdbuf,"USER",4)) {
@@ -929,6 +936,10 @@ void do_command_loop(void) {
                cmd_newu(&cmdbuf[5]);
                }
 
+       else if (!strncasecmp(cmdbuf,"CREU",4)) {
+               cmd_creu(&cmdbuf[5]);
+               }
+
        else if (!strncasecmp(cmdbuf,"SETP",4)) {
                cmd_setp(&cmdbuf[5]);
                }
@@ -1181,10 +1192,6 @@ void do_command_loop(void) {
                cmd_scdn(&cmdbuf[5]);
                }
 
-       else if (!strncasecmp(cmdbuf, "NSET", 4)) {
-               cmd_nset(&cmdbuf[5]);
-               }
-
        else if (!strncasecmp(cmdbuf, "UIMG", 4)) {
                cmd_uimg(&cmdbuf[5]);
                }