Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / include / citadel_dirs.h

diff --git a/citadel/include/citadel_dirs.h b/citadel/include/citadel_dirs.h
index 05ce0fc37795716b39da88125023900a1265a19d..3a0b6d86e38573f630970387cd37c7c2d6417281 100644 (file)
--- a/citadel/include/citadel_dirs.h
+++ b/citadel/include/citadel_dirs.h
@@ -37,12 +37,13 @@ extern char ctdl_utilbin_dir[PATH_MAX];
 
 /* some of the frequently used files */
 extern char file_citadel_control[PATH_MAX];
-extern char file_citadel_rc[PATH_MAX];
 extern char file_citadel_config[PATH_MAX];
+extern char file_citadel_urlshorteners[PATH_MAX];
 extern char file_lmtp_socket[PATH_MAX];
 extern char file_lmtp_unfiltered_socket[PATH_MAX];
 extern char file_arcq[PATH_MAX];
 extern char file_citadel_socket[PATH_MAX];
+extern char file_citadel_admin_socket[PATH_MAX];
 extern char file_mail_aliases[PATH_MAX];
 extern char file_pid_file[PATH_MAX];
 extern char file_pid_paniclog[PATH_MAX];
@@ -62,7 +63,7 @@ extern void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ct
 
 extern void create_run_directories(long UID, long GUID);
 
-extern void assoc_file_name(char *buf, 
+extern size_t assoc_file_name(char *buf, 
                            size_t n,
                            struct ctdlroom *qrbuf, 
                            const char *prefix);