Remove unsupported options

[nbd.git] / nbd-server.c

diff --git a/nbd-server.c b/nbd-server.c
index 8774d51..736a178 100644 (file)
--- a/nbd-server.c
+++ b/nbd-server.c
@@ -344,7 +344,6 @@ void usage() {
               "\t-c|--copy-on-write\tcopy on write\n"
               "\t-C|--config-file\tspecify an alternate configuration file\n"
               "\t-l|--authorize-file\tfile with list of hosts that are allowed to\n\t\t\t\tconnect.\n"
-              "\t-a|--idle-time\t\tmaximum idle seconds; server terminates when\n\t\t\t\tidle time exceeded\n"
               "\t-p|--pid-file\t\tspecify a filename to write our PID to\n"
               "\t-o|--output-config\toutput a config file section for what you\n\t\t\t\tspecified on the command line, with the\n\t\t\t\tspecified section name\n\n"
               "\tif port is set to 0, stdin is used (for running from inetd)\n"
@@ -413,7 +412,7 @@ SERVER* cmdline(int argc, char *argv[]) {
        serve=g_new0(SERVER, 1);
        serve->authname = g_strdup(default_authname);
        serve->virtstyle=VIRT_IPLIT;
-       while((c=getopt_long(argc, argv, "-a:C:cl:mo:rp:", long_options, &i))>=0) {
+       while((c=getopt_long(argc, argv, "-C:cl:mo:rp:", long_options, &i))>=0) {
                switch (c) {
                case 1:
                        /* non-option argument */
@@ -1626,26 +1625,25 @@ void serve_err(SERVER* serve, const char* msg) {
 void dousers(void) {
        struct passwd *pw;
        struct group *gr;
+       gchar* str;
        if(rungroup) {
                gr=getgrnam(rungroup);
                if(!gr) {
-                       g_message("Invalid group name: %s", rungroup);
-                       exit(EXIT_FAILURE);
+                       str = g_strdup_printf("Invalid group name: %s", rungroup);
+                       err(str);
                }
                if(setgid(gr->gr_gid)<0) {
-                       g_message("Could not set GID: %s", strerror(errno));
-                       exit(EXIT_FAILURE);
+                       err("Could not set GID: %m"); 
                }
        }
        if(runuser) {
                pw=getpwnam(runuser);
                if(!pw) {
-                       g_message("Invalid user name: %s", runuser);
-                       exit(EXIT_FAILURE);
+                       str = g_strdup_printf("Invalid user name: %s", runuser);
+                       err(str);
                }
                if(setuid(pw->pw_uid)<0) {
-                       g_message("Could not set UID: %s", strerror(errno));
-                       exit(EXIT_FAILURE);
+                       err("Could not set UID: %m");
                }
        }
 }