* support autoconf 2.53

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 6244d1423487744e130d972438b011a7f23fa191..d543bba2079d8bc58b633f732eace3f8bd9afd59 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -66,9 +66,6 @@ char *unique_session_numbers;
 int ScheduledShutdown = 0;
 int do_defrag = 0;
 
-extern long int timezone;
-extern int daylight;
-
 /*
  * Various things that need to be initialized at startup
  */
@@ -353,11 +350,17 @@ char CtdlCheckExpress(void) {
 void cmd_time(void)
 {
    time_t tv;
+   struct tm *tmp;
    
    tv = time(NULL);
-   localtime(&tv);
+   tmp = localtime(&tv);
    
-   cprintf("%d %ld|%ld|%d\n", OK, (long)tv, timezone, daylight);
+   /* timezone and daylight global variables are not portable. */
+#ifdef HAVE_STRUCT_TM_TM_GMTOFF
+   cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, tmp->tm_gmtoff, tmp->tm_isdst);
+#else
+   cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, timezone, tmp->tm_isdst);
+#endif
 }
 
 /*
@@ -460,7 +463,7 @@ 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);
@@ -483,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);
 }
 
 
@@ -504,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]);
 
@@ -555,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]);
 
@@ -679,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",
@@ -699,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);
        }
 
 /*
@@ -707,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);
        }
 
 
@@ -724,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);
@@ -740,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;
        }
 
@@ -757,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);
 }
 
 
@@ -772,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);
 }
 
 
@@ -829,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, "");
@@ -861,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);
                }
 }
 
@@ -904,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;
                }
 
@@ -918,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)) {