Merge branch 'master' into nntp

[citadel.git] / citadel / control.c

diff --git a/citadel/control.c b/citadel/control.c
index f543e8d4382acd29c845b5adb82a3aaf8ca5b9cc..0bc49456ec9722722f507099fc9a75cec67c5e7c 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -1,7 +1,7 @@
 /*
  * This module handles states which are global to the entire server.
  *
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-2014 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.
@@ -387,6 +387,7 @@ void cmd_conf(char *argbuf)
                cprintf("%d\n", config.c_guest_logins);
                cprintf("%d\n", config.c_port_number);
                cprintf("%d\n", config.c_ctdluid);
+               cprintf("%d\n", config.c_nntp_port);
                cprintf("000\n");
        }
 
@@ -657,6 +658,9 @@ void cmd_conf(char *argbuf)
                        case 69:
                                config.c_ctdluid = atoi(buf);
                                break;
+                       case 70:
+                               config.c_nntp_port = atoi(buf);
+                               break;
                        }
                        ++a;
                }