* Enable/disable encryption in client from command line and/or citadel.rc

[citadel.git] / citadel / citadel.c

diff --git a/citadel/citadel.c b/citadel/citadel.c
index 6eb959a2f4b43dad038404a305ff418604550a52..6845b46123fc7c470013f3833f3d9a430da0a5d6 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -884,7 +884,7 @@ int main(int argc, char **argv)
        char hexstring[MD5_HEXSTRING_SIZE];
        int stored_password = 0;
        char password[SIZ];
-
+       
        /* Permissions sanity check - don't run citadel setuid/setgid */
        if (getuid() != geteuid()) {
                fprintf(stderr, "Please do not run citadel setuid!\n");
@@ -901,6 +901,8 @@ int main(int argc, char **argv)
        signal(SIGTERM, dropcarr);      /* Cleanup gracefully if terminated */
        signal(SIGCONT, catch_sigcont);         /* Catch SIGCONT so we can reset terminal */
 
+       arg_encrypt = RC_DEFAULT;
+
        /* 
         * Handle command line options as if we were called like /bin/login
         * (i.e. from in.telnetd)
@@ -910,6 +912,14 @@ int main(int argc, char **argv)
                        telnet_client_host = argv[a+1];
                        argc = shift(argc, argv, a, 2);
                }
+               if (!strcmp(argv[a], "-x")) {
+                       arg_encrypt = RC_NO;
+                       argc = shift(argc, argv, a, 1);
+               }
+               if (!strcmp(argv[a], "-X")) {
+                       arg_encrypt = RC_YES;
+                       argc = shift(argc, argv, a, 1);
+               }
                if (!strcmp(argv[a], "-p")) {
                        struct stat st;