projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
489820a
)
NNTP and NNTPS port configurations in both the text and web clients.
author
Art Cancro
<ajc@uncensored.citadel.org>
Fri, 4 Jul 2014 19:20:47 +0000
(15:20 -0400)
committer
Art Cancro
<ajc@uncensored.citadel.org>
Fri, 4 Jul 2014 19:20:47 +0000
(15:20 -0400)
citadel/citadel.h
patch
|
blob
|
history
citadel/control.c
patch
|
blob
|
history
textclient/src/include/citadel_ipc.h
patch
|
blob
|
history
textclient/src/tuiconfig.c
patch
|
blob
|
history
webcit/siteconfig.c
patch
|
blob
|
history
webcit/static/t/aide/siteconfig/tab_setting.html
patch
|
blob
|
history
diff --git
a/citadel/citadel.h
b/citadel/citadel.h
index 8d4b45d7f382a5d2d04987af291cabe91827887f..9198d4a28a9012718b09c2899eea691d00245307 100644
(file)
--- a/
citadel/citadel.h
+++ b/
citadel/citadel.h
@@
-61,11
+61,9
@@
extern "C" {
/* Various length constants */
/* Various length constants */
-#define ROOMNAMELEN 128 /* The size of a roomname string */
-
-#define USERNAME_SIZE 64 /* The size of a username string */
-#define MAX_EDITORS 5 /* # of external editors supported */
- /* MUST be at least 1 */
+#define ROOMNAMELEN 128 /* The size of a roomname string */
+#define USERNAME_SIZE 64 /* The size of a username string */
+#define MAX_EDITORS 5 /* number of external editors supported ; must be at least 1 */
/*
* Message expiration policy stuff
/*
* Message expiration policy stuff
@@
-103,7
+101,7
@@
struct march {
* User records.
*/
typedef struct ctdluser ctdluser;
* User records.
*/
typedef struct ctdluser ctdluser;
-struct ctdluser { /* User record */
+struct ctdluser { /* User record
*/
int version; /* Cit vers. which created this rec */
uid_t uid; /* Associate with a unix account? */
char password[32]; /* password */
int version; /* Cit vers. which created this rec */
uid_t uid; /* Associate with a unix account? */
char password[32]; /* password */
@@
-188,7
+186,7
@@
struct floor {
#define REREGISTER 1 /* existing user reregistering */
/* number of items which may be handled by the CONF command */
#define REREGISTER 1 /* existing user reregistering */
/* number of items which may be handled by the CONF command */
-#define NUM_CONFIGS 7
0
+#define NUM_CONFIGS 7
1
#define TRACE syslog(LOG_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
#define TRACE syslog(LOG_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
diff --git
a/citadel/control.c
b/citadel/control.c
index 0aba124044914bd9b1a2619d21933924ef5999f0..2a608eee014a24a78887f6a0c9e62c593dc57208 100644
(file)
--- a/
citadel/control.c
+++ b/
citadel/control.c
@@
-663,7
+663,7
@@
void cmd_conf(char *argbuf)
config.c_nntp_port = atoi(buf);
break;
case 71:
config.c_nntp_port = atoi(buf);
break;
case 71:
- config.c_nntp_port = atoi(buf);
+ config.c_nntp
s
_port = atoi(buf);
break;
}
++a;
break;
}
++a;
diff --git
a/textclient/src/include/citadel_ipc.h
b/textclient/src/include/citadel_ipc.h
index 1236743b24e606ca61d9dc6de089c091197c64e3..ac4450b13e8e50915d14fab0fdc76e0e4d14c84f 100644
(file)
--- a/
textclient/src/include/citadel_ipc.h
+++ b/
textclient/src/include/citadel_ipc.h
@@
-63,7
+63,7
@@
void calc_dirs_n_files(int relh, int home, const char *relhome, char *ctdldir,
#define READ_HEADER 2
#define READ_MSGBODY 3
#define READ_HEADER 2
#define READ_MSGBODY 3
-#define NUM_CONFIGS
70
+#define NUM_CONFIGS
72
diff --git
a/textclient/src/tuiconfig.c
b/textclient/src/tuiconfig.c
index 89db7316334b98f3b3337e1ed872aad28415883b..2748035c79a5d749a8fb826e0c40e4003f3cf0e6 100644
(file)
--- a/
textclient/src/tuiconfig.c
+++ b/
textclient/src/tuiconfig.c
@@
-1,7
+1,7
@@
/*
* Configuration screens that are part of the text mode client.
*
/*
* Configuration screens that are part of the text mode client.
*
- * Copyright (c) 1987-201
2
by the citadel.org team
+ * Copyright (c) 1987-201
4
by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
@@
-117,17
+117,11
@@
void do_system_configuration(CtdlIPC *ipc)
/* Security parameters */
/* Security parameters */
- snprintf(sc[7], sizeof sc[7], "%d", (boolprompt(
- "Require registration for new users",
- atoi(&sc[7][0]))));
- snprintf(sc[29], sizeof sc[29], "%d", (boolprompt(
- "Disable self-service user account creation",
- atoi(&sc[29][0]))));
+ snprintf(sc[7], sizeof sc[7], "%d", (boolprompt("Require registration for new users", atoi(&sc[7][0]))));
+ snprintf(sc[29], sizeof sc[29], "%d", (boolprompt("Disable self-service user account creation", atoi(&sc[29][0]))));
strprompt("Initial access level for new users", &sc[6][0], 1);
strprompt("Access level required to create rooms", &sc[19][0], 1);
strprompt("Initial access level for new users", &sc[6][0], 1);
strprompt("Access level required to create rooms", &sc[19][0], 1);
- snprintf(sc[67], sizeof sc[67], "%d", (boolprompt(
- "Allow anonymous guest logins",
- atoi(&sc[67][0]))));
+ snprintf(sc[67], sizeof sc[67], "%d", (boolprompt("Allow anonymous guest logins", atoi(&sc[67][0]))));
snprintf(sc[4], sizeof sc[4], "%d", (boolprompt(
"Automatically give room admin privs to a user who creates a private room",
atoi(&sc[4][0]))));
snprintf(sc[4], sizeof sc[4], "%d", (boolprompt(
"Automatically give room admin privs to a user who creates a private room",
atoi(&sc[4][0]))));
@@
-185,6
+179,8
@@
void do_system_configuration(CtdlIPC *ipc)
strprompt("SMTP MTA server port (-1 to disable)", &sc[24][0], 5);
strprompt("SMTP MSA server port (-1 to disable)", &sc[38][0], 5);
strprompt("SMTPS server port (-1 to disable)", &sc[41][0], 5);
strprompt("SMTP MTA server port (-1 to disable)", &sc[24][0], 5);
strprompt("SMTP MSA server port (-1 to disable)", &sc[38][0], 5);
strprompt("SMTPS server port (-1 to disable)", &sc[41][0], 5);
+ strprompt("NNTP server port (-1 to disable)", &sc[70][0], 5);
+ strprompt("NNTPS server port (-1 to disable)", &sc[71][0], 5);
strprompt("Postfix TCP Dictionary Port server port (-1 to disable)", &sc[50][0], 5);
strprompt("ManageSieve server port (-1 to disable)", &sc[51][0], 5);
strprompt("Postfix TCP Dictionary Port server port (-1 to disable)", &sc[50][0], 5);
strprompt("ManageSieve server port (-1 to disable)", &sc[51][0], 5);
@@
-197,8
+193,7
@@
void do_system_configuration(CtdlIPC *ipc)
*/
a = atoi(sc[25]);
a = (a ? 0 : 1);
*/
a = atoi(sc[25]);
a = (a ? 0 : 1);
- a = boolprompt("Correct forged From: lines during authenticated SMTP",
- a);
+ a = boolprompt("Correct forged From: lines during authenticated SMTP", a);
a = (a ? 0 : 1);
snprintf(sc[25], sizeof sc[25], "%d", a);
a = (a ? 0 : 1);
snprintf(sc[25], sizeof sc[25], "%d", a);
@@
-228,10
+223,8
@@
void do_system_configuration(CtdlIPC *ipc)
a = (a ? 1 : 0); /* Set only to 1 or 0 */
a = boolprompt("Do you want to configure LDAP authentication?", a);
if (a) {
a = (a ? 1 : 0); /* Set only to 1 or 0 */
a = boolprompt("Do you want to configure LDAP authentication?", a);
if (a) {
- strprompt("Host name of LDAP server",
- &sc[32][0], 127);
- strprompt("Port number of LDAP service",
- &sc[33][0], 5);
+ strprompt("Host name of LDAP server", &sc[32][0], 127);
+ strprompt("Port number of LDAP service", &sc[33][0], 5);
strprompt("Base DN", &sc[34][0], 255);
strprompt("Bind DN (or blank for anonymous bind)", &sc[35][0], 255);
strprompt("Password for bind DN (or blank for anonymous bind)", &sc[36][0], 255);
strprompt("Base DN", &sc[34][0], 255);
strprompt("Bind DN (or blank for anonymous bind)", &sc[35][0], 255);
strprompt("Password for bind DN (or blank for anonymous bind)", &sc[36][0], 255);
diff --git
a/webcit/siteconfig.c
b/webcit/siteconfig.c
index ecfc0cc6575dd062b69e97ee2a13833fab039736..253e1a5763c57292979cbaad45e071ac9635aa38 100644
(file)
--- a/
webcit/siteconfig.c
+++ b/
webcit/siteconfig.c
@@
-1,7
+1,7
@@
/*
* Administrative screen for site-wide configuration
*
/*
* Administrative screen for site-wide configuration
*
- * Copyright (c) 1996-201
2
by the citadel.org team
+ * Copyright (c) 1996-201
4
by the citadel.org team
*
* This program is open source software. You can redistribute it and/or
* modify it under the terms of the GNU General Public License, version 3.
*
* This program is open source software. You can redistribute it and/or
* modify it under the terms of the GNU General Public License, version 3.
@@
-210,7
+210,11
@@
CfgMapping ServerConfig[] = {
{CFG_STR, 0, 0, "", HKEY("c_pop3_fetch")},
{CFG_STR, 0, 0, "", HKEY("c_pop3_fastest")},
{CFG_YES, 0, 0, "", HKEY("c_spam_flag_only")},
{CFG_STR, 0, 0, "", HKEY("c_pop3_fetch")},
{CFG_STR, 0, 0, "", HKEY("c_pop3_fastest")},
{CFG_YES, 0, 0, "", HKEY("c_spam_flag_only")},
- {CFG_YES, 0, 0, "", HKEY("c_guest_logins")}
+ {CFG_YES, 0, 0, "", HKEY("c_guest_logins")},
+ {CFG_STR, 0, 0, "", HKEY("c_port_number")},
+ {CFG_STR, 0, 0, "", HKEY("c_ctdluid")},
+ {CFG_STR, 0, 0, "", HKEY("c_nntp_port")},
+ {CFG_STR, 0, 0, "", HKEY("c_nntps_port")}
};
};
diff --git
a/webcit/static/t/aide/siteconfig/tab_setting.html
b/webcit/static/t/aide/siteconfig/tab_setting.html
index 651fcc4b39e9f4b1bccffbaef8b0060a208a69df..9a4c6a6902354ee2ec249db1f5e192cbe96de96e 100644
(file)
--- a/
webcit/static/t/aide/siteconfig/tab_setting.html
+++ b/
webcit/static/t/aide/siteconfig/tab_setting.html
@@
-13,6
+13,12
@@
<tr><td><?_("XMPP (Jabber) server to server port (-1 to disable)")></td><td>
<input type="hidden" name="c_xmpp_s2s_port" value='<?SERV:CFG("c_xmpp_s2s_port")>'></td></tr>
<tr><td><?_("XMPP (Jabber) server to server port (-1 to disable)")></td><td>
<input type="hidden" name="c_xmpp_s2s_port" value='<?SERV:CFG("c_xmpp_s2s_port")>'></td></tr>
+<tr><td><?_("NNTP server port (-1 to disable)")></td><td>
+<input type="text" name="c_nntp_port" maxlength="5" value='<?SERV:CFG("c_nntp_port")>'></td></tr>
+
+<tr><td><?_("NNTPS server port (-1 to disable)")></td><td>
+<input type="text" name="c_nntps_port" maxlength="5" value='<?SERV:CFG("c_nntps_port")>'></td></tr>
+
<tr><td colspan=2><div class="conftitle"><?_("Advanced server fine-tuning controls")></div></td></tr>
<tr><td><?_("Maximum message length")></td><td>
<tr><td colspan=2><div class="conftitle"><?_("Advanced server fine-tuning controls")></div></td></tr>
<tr><td><?_("Maximum message length")></td><td>