$Log$
+ Revision 626.9 2004/10/12 02:17:49 ajc
+ * Cleaned up some things that generated compiler warnings
+ * crypto keys directory is now relative to the server's working directory,
+ not to the compiled-in BBSDIR
+ * Re-ordered the security checks in CtdlAccessCheck()
+
Revision 626.8 2004/10/06 21:23:21 error
* Fixup a few more compiler warnings from icc
Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
* Initial CVS import
-
}
/* Get started */
+ a = 0;
ssl_ctx = NULL;
dh = NULL;
SSL_load_error_strings();
return(-1);
}
+ if ((required_level >= ac_logged_in) && (CC->logged_in == 0)) {
+ cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
+ return(-1);
+ }
+
if (CC->user.axlevel >= 6) return(0);
if (required_level >= ac_aide) {
cprintf("%d This command requires Aide access.\n",
return(-1);
}
- if (CC->logged_in) return(0);
- if (required_level >= ac_logged_in) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return(-1);
- }
-
/* shhh ... succeed quietly */
return(0);
}
/*
* Pathnames for cryptographic goodness
*/
-#define CTDL_CRYPTO_DIR BBSDIR "/keys"
+#define CTDL_CRYPTO_DIR "./keys"
#define CTDL_KEY_PATH CTDL_CRYPTO_DIR "/citadel.key"
#define CTDL_CSR_PATH CTDL_CRYPTO_DIR "/citadel.csr"
#define CTDL_CER_PATH CTDL_CRYPTO_DIR "/citadel.cer"
struct CitContext *ptr;
struct CitContext *bind_me = NULL;
fd_set readfds;
- int retval;
+ int retval = 0;
struct CitContext *con= NULL; /* Temporary context pointer */
struct ServiceFunctionHook *serviceptr;
int ssock; /* Descriptor for client socket */